From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 16 May 2012 16:25:25 +0000 (+0200)
Subject: Add enumerator for registered nonce generators.
X-Git-Tag: 5.0.0~254
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b826b192baeffcb28b173455b3b3312d002ce73a;p=thirdparty%2Fstrongswan.git

Add enumerator for registered nonce generators.
---

diff --git a/src/libstrongswan/crypto/crypto_factory.c b/src/libstrongswan/crypto/crypto_factory.c
index a734171680..bd4e05c38d 100644
--- a/src/libstrongswan/crypto/crypto_factory.c
+++ b/src/libstrongswan/crypto/crypto_factory.c
@@ -808,7 +808,7 @@ METHOD(crypto_factory_t, create_prf_enumerator, enumerator_t*,
 }
 
 /**
- * Filter function to enumerate algorithm, not entry
+ * Filter function to enumerate group, not entry
  */
 static bool dh_filter(void *n, entry_t **entry, diffie_hellman_group_t *group,
 					  void *i2, const char **plugin_name)
@@ -825,7 +825,7 @@ METHOD(crypto_factory_t, create_dh_enumerator, enumerator_t*,
 }
 
 /**
- * Filter function to enumerate algorithm, not entry
+ * Filter function to enumerate strength, not entry
  */
 static bool rng_filter(void *n, entry_t **entry, rng_quality_t *quality,
 					   void *i2, const char **plugin_name)
@@ -840,6 +840,22 @@ METHOD(crypto_factory_t, create_rng_enumerator, enumerator_t*,
 {
 	return create_enumerator(this, this->rngs, rng_filter);
 }
+
+/**
+ * Filter function to enumerate plugin name, not entry
+ */
+static bool nonce_gen_filter(void *n, entry_t **entry, const char **plugin_name)
+{
+	*plugin_name = (*entry)->plugin_name;
+	return TRUE;
+}
+
+METHOD(crypto_factory_t, create_nonce_gen_enumerator, enumerator_t*,
+	private_crypto_factory_t *this)
+{
+	return create_enumerator(this, this->nonce_gens, nonce_gen_filter);
+}
+
 METHOD(crypto_factory_t, add_test_vector, void,
 	private_crypto_factory_t *this, transform_type_t type, void *vector)
 {
@@ -919,6 +935,7 @@ crypto_factory_t *crypto_factory_create()
 			.create_prf_enumerator = _create_prf_enumerator,
 			.create_dh_enumerator = _create_dh_enumerator,
 			.create_rng_enumerator = _create_rng_enumerator,
+			.create_nonce_gen_enumerator = _create_nonce_gen_enumerator,
 			.add_test_vector = _add_test_vector,
 			.destroy = _destroy,
 		},
diff --git a/src/libstrongswan/crypto/crypto_factory.h b/src/libstrongswan/crypto/crypto_factory.h
index c944348af2..611ca0bbbf 100644
--- a/src/libstrongswan/crypto/crypto_factory.h
+++ b/src/libstrongswan/crypto/crypto_factory.h
@@ -303,52 +303,59 @@ struct crypto_factory_t {
 	/**
 	 * Create an enumerator over all registered crypter algorithms.
 	 *
-	 * @return				enumerator over encryption_algorithm_t
+	 * @return				enumerator over encryption_algorithm_t, plugin
 	 */
 	enumerator_t* (*create_crypter_enumerator)(crypto_factory_t *this);
 
 	/**
 	 * Create an enumerator over all registered aead algorithms.
 	 *
-	 * @return				enumerator over encryption_algorithm_t
+	 * @return				enumerator over encryption_algorithm_t, plugin
 	 */
 	enumerator_t* (*create_aead_enumerator)(crypto_factory_t *this);
 
 	/**
 	 * Create an enumerator over all registered signer algorithms.
 	 *
-	 * @return				enumerator over integrity_algorithm_t
+	 * @return				enumerator over integrity_algorithm_t, plugin
 	 */
 	enumerator_t* (*create_signer_enumerator)(crypto_factory_t *this);
 
 	/**
 	 * Create an enumerator over all registered hasher algorithms.
 	 *
-	 * @return				enumerator over hash_algorithm_t
+	 * @return				enumerator over hash_algorithm_t, plugin
 	 */
 	enumerator_t* (*create_hasher_enumerator)(crypto_factory_t *this);
 
 	/**
 	 * Create an enumerator over all registered PRFs.
 	 *
-	 * @return				enumerator over pseudo_random_function_t
+	 * @return				enumerator over pseudo_random_function_t, plugin
 	 */
 	enumerator_t* (*create_prf_enumerator)(crypto_factory_t *this);
 
 	/**
 	 * Create an enumerator over all registered diffie hellman groups.
 	 *
-	 * @return				enumerator over diffie_hellman_group_t
+	 * @return				enumerator over diffie_hellman_group_t, plugin
 	 */
 	enumerator_t* (*create_dh_enumerator)(crypto_factory_t *this);
 
 	/**
 	 * Create an enumerator over all registered random generators.
 	 *
-	 * @return				enumerator over rng_quality_t
+	 * @return				enumerator over rng_quality_t, plugin
 	 */
 	enumerator_t* (*create_rng_enumerator)(crypto_factory_t *this);
 
+	/**
+	 * Create an enumerator over all registered nonce generators.
+	 *
+	 * @return				enumerator over plugin
+	 */
+	enumerator_t* (*create_nonce_gen_enumerator)(crypto_factory_t *this);
+
 	/**
 	 * Add a test vector to the crypto factory.
 	 *