Add a method to replace all secrets in a mem_cred_t object

diff --git a/src/libstrongswan/credentials/sets/mem_cred.c b/src/libstrongswan/credentials/sets/mem_cred.c
index d697a56ef5e65c1bdbd5cb5776049ed7c5df7a74..b8da3f620903aba790c2a42d8e11a017d21da34a 100644 (file)
--- a/src/libstrongswan/credentials/sets/mem_cred.c
+++ b/src/libstrongswan/credentials/sets/mem_cred.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Tobias Brunner
+ * Copyright (C) 2010-2013 Tobias Brunner
  * Hochschule fuer Technik Rapperwsil
  * Copyright (C) 2010 Martin Willi
  * Copyright (C) 2010 revosec AG
@@ -555,14 +555,66 @@ METHOD(credential_set_t, create_cdp_enumerator, enumerator_t*,
 
 }
 
-METHOD(mem_cred_t, clear_secrets, void,
-       private_mem_cred_t *this)
+static void reset_secrets(private_mem_cred_t *this)
 {
-       this->lock->write_lock(this->lock);
        this->keys->destroy_offset(this->keys, offsetof(private_key_t, destroy));
        this->shared->destroy_function(this->shared, (void*)shared_entry_destroy);
        this->keys = linked_list_create();
        this->shared = linked_list_create();
+}
+
+METHOD(mem_cred_t, replace_secrets, void,
+       private_mem_cred_t *this, mem_cred_t *other_set, bool clone)
+{
+       private_mem_cred_t *other = (private_mem_cred_t*)other_set;
+       enumerator_t *enumerator;
+       shared_entry_t *entry, *new_entry;
+       private_key_t *key;
+
+       this->lock->write_lock(this->lock);
+
+       reset_secrets(this);
+
+       if (clone)
+       {
+               enumerator = other->keys->create_enumerator(other->keys);
+               while (enumerator->enumerate(enumerator, &key))
+               {
+                       this->keys->insert_last(this->keys, key->get_ref(key));
+               }
+               enumerator->destroy(enumerator);
+               enumerator = other->shared->create_enumerator(other->shared);
+               while (enumerator->enumerate(enumerator, &entry))
+               {
+                       INIT(new_entry,
+                               .shared = entry->shared->get_ref(entry->shared),
+                               .owners = entry->owners->clone_offset(entry->owners,
+                                                                                       offsetof(identification_t, clone)),
+                       );
+                       this->shared->insert_last(this->shared, new_entry);
+               }
+               enumerator->destroy(enumerator);
+       }
+       else
+       {
+               while (other->keys->remove_first(other->keys, (void**)&key) == SUCCESS)
+               {
+                       this->keys->insert_last(this->keys, key);
+               }
+               while (other->shared->remove_first(other->shared,
+                                                                                 (void**)&entry) == SUCCESS)
+               {
+                       this->shared->insert_last(this->shared, entry);
+               }
+       }
+       this->lock->unlock(this->lock);
+}
+
+METHOD(mem_cred_t, clear_secrets, void,
+       private_mem_cred_t *this)
+{
+       this->lock->write_lock(this->lock);
+       reset_secrets(this);
        this->lock->unlock(this->lock);
 }
 
@@ -619,6 +671,7 @@ mem_cred_t *mem_cred_create()
                        .add_shared = _add_shared,
                        .add_shared_list = _add_shared_list,
                        .add_cdp = _add_cdp,
+                       .replace_secrets = _replace_secrets,
                        .clear = _clear_,
                        .clear_secrets = _clear_secrets,
                        .destroy = _destroy,

diff --git a/src/libstrongswan/credentials/sets/mem_cred.h b/src/libstrongswan/credentials/sets/mem_cred.h
index 20447207c64febc128370335b35388bc8dde2618..d0dd51da12971c26511e386a33d58d3a0ca6bd89 100644 (file)
--- a/src/libstrongswan/credentials/sets/mem_cred.h
+++ b/src/libstrongswan/credentials/sets/mem_cred.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Tobias Brunner
+ * Copyright (C) 2010-2013 Tobias Brunner
  * Hochschule fuer Technik Rapperswil
  * Copyright (C) 2010 Martin Willi
  * Copyright (C) 2010 revosec AG
@@ -100,6 +100,16 @@ struct mem_cred_t {
        void (*add_cdp)(mem_cred_t *this, certificate_type_t type,
                                        identification_t *id, char *uri);
 
+       /**
+        * Replace all secrets (private and shared keys) in this credential set
+        * with those of another.
+        *
+        * @param other                 credential set to get secrets from
+        * @param clone                 TRUE to clone secrets, FALSE to adopt them (they
+        *                                              get removed from the other set)
+        */
+       void (*replace_secrets)(mem_cred_t *this, mem_cred_t *other, bool clone);
+
        /**
         * Clear all credentials from the credential set.
         */