From 5232ebb1b46d7072bd8621590e8efec7ee9f8de7 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Fri, 24 Sep 2010 14:33:39 +0200 Subject: [PATCH] Added function to clear all credentials from mem_cred_t. --- src/libstrongswan/credentials/sets/mem_cred.c | 23 ++++++++++++++++--- src/libstrongswan/credentials/sets/mem_cred.h | 5 ++++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/src/libstrongswan/credentials/sets/mem_cred.c b/src/libstrongswan/credentials/sets/mem_cred.c index f1d40dd4b7..cabbdaec7e 100644 --- a/src/libstrongswan/credentials/sets/mem_cred.c +++ b/src/libstrongswan/credentials/sets/mem_cred.c @@ -361,15 +361,31 @@ METHOD(mem_cred_t, add_shared, void, this->lock->unlock(this->lock); } -METHOD(mem_cred_t, destroy, void, +METHOD(mem_cred_t, clear, void, private_mem_cred_t *this) { + this->lock->write_lock(this->lock); this->trusted->destroy_offset(this->trusted, - offsetof(certificate_t, destroy)); + offsetof(certificate_t, destroy)); this->untrusted->destroy_offset(this->untrusted, - offsetof(certificate_t, destroy)); + offsetof(certificate_t, destroy)); this->keys->destroy_offset(this->keys, offsetof(private_key_t, destroy)); this->shared->destroy_function(this->shared, (void*)shared_entry_destroy); + this->trusted = linked_list_create(); + this->untrusted = linked_list_create(); + this->keys = linked_list_create(); + this->shared = linked_list_create(); + this->lock->unlock(this->lock); +} + +METHOD(mem_cred_t, destroy, void, + private_mem_cred_t *this) +{ + _clear(this); + this->trusted->destroy(this->trusted); + this->untrusted->destroy(this->untrusted); + this->keys->destroy(this->keys); + this->shared->destroy(this->shared); this->lock->destroy(this->lock); free(this); } @@ -393,6 +409,7 @@ mem_cred_t *mem_cred_create() .add_cert = _add_cert, .add_key = _add_key, .add_shared = _add_shared, + .clear = _clear, .destroy = _destroy, }, .trusted = linked_list_create(), diff --git a/src/libstrongswan/credentials/sets/mem_cred.h b/src/libstrongswan/credentials/sets/mem_cred.h index ccb04e6fd0..b26e43d6cf 100644 --- a/src/libstrongswan/credentials/sets/mem_cred.h +++ b/src/libstrongswan/credentials/sets/mem_cred.h @@ -58,6 +58,11 @@ struct mem_cred_t { */ void (*add_shared)(mem_cred_t *this, shared_key_t *shared, ...); + /** + * Clear all credentials from the credential set. + */ + void (*clear)(mem_cred_t *this); + /** * Destroy a mem_cred_t. */ -- 2.47.2