Added a MODP_CUSTOM DH group which takes g and p as constructor arguments

diff --git a/src/libstrongswan/crypto/crypto_factory.c b/src/libstrongswan/crypto/crypto_factory.c
index 60cd14865b1e5f977636e3bcdf2ded4e3e606d9c..f2f01987dfc824c79ac144af3096893dc63aaaee 100644 (file)
--- a/src/libstrongswan/crypto/crypto_factory.c
+++ b/src/libstrongswan/crypto/crypto_factory.c
@@ -308,7 +308,7 @@ METHOD(crypto_factory_t, create_rng, rng_t*,
 }
 
 METHOD(crypto_factory_t, create_dh, diffie_hellman_t*,
-       private_crypto_factory_t *this, diffie_hellman_group_t group)
+       private_crypto_factory_t *this, diffie_hellman_group_t group, ...)
 {
        enumerator_t *enumerator;
        entry_t *entry;
@@ -320,7 +320,21 @@ METHOD(crypto_factory_t, create_dh, diffie_hellman_t*,
        {
                if (entry->algo == group)
                {
-                       diffie_hellman = entry->create_dh(group);
+                       if (group == MODP_CUSTOM)
+                       {
+                               va_list args;
+                               chunk_t g, p;
+
+                               va_start(args, group);
+                               g = va_arg(args, chunk_t);
+                               p = va_arg(args, chunk_t);
+                               va_end(args);
+                               diffie_hellman = entry->create_dh(MODP_CUSTOM, g, p);
+                       }
+                       else
+                       {
+                               diffie_hellman = entry->create_dh(group);
+                       }
                        if (diffie_hellman)
                        {
                                break;

diff --git a/src/libstrongswan/crypto/crypto_factory.h b/src/libstrongswan/crypto/crypto_factory.h
index 7fe43c75d2a61e1e5649330e5b5c28482489bcbf..ff06eda7bb5f5de24c394b531765c57b8bfeca27 100644 (file)
--- a/src/libstrongswan/crypto/crypto_factory.h
+++ b/src/libstrongswan/crypto/crypto_factory.h
@@ -65,8 +65,11 @@ typedef rng_t* (*rng_constructor_t)(rng_quality_t quality);
 
 /**
  * Constructor function for diffie hellman
+ *
+ * The DH constructor accepts additional arguments for:
+ * - MODP_CUSTOM: chunk_t generator, chunk_t prime
  */
-typedef diffie_hellman_t* (*dh_constructor_t)(diffie_hellman_group_t group);
+typedef diffie_hellman_t* (*dh_constructor_t)(diffie_hellman_group_t group, ...);
 
 /**
  * Handles crypto modules and creates instances.
@@ -129,11 +132,13 @@ struct crypto_factory_t {
        /**
         * Create a diffie hellman instance.
         *
+        * Additional arguments are passed to the DH constructor.
+        *
         * @param group                 diffie hellman group
         * @return                              diffie_hellman_t instance, NULL if not supported
         */
        diffie_hellman_t* (*create_dh)(crypto_factory_t *this,
-                                                                  diffie_hellman_group_t group);
+                                                                  diffie_hellman_group_t group, ...);
 
        /**
         * Register a crypter constructor.

diff --git a/src/libstrongswan/crypto/diffie_hellman.c b/src/libstrongswan/crypto/diffie_hellman.c
index 9bd8991fc97815524edba749d326d0b8aeeae662..e3675603b7e78145b28b60fc77652e8179fc6748 100644 (file)
--- a/src/libstrongswan/crypto/diffie_hellman.c
+++ b/src/libstrongswan/crypto/diffie_hellman.c
@@ -38,9 +38,10 @@ ENUM_NEXT(diffie_hellman_group_names, MODP_1024_160, ECP_224_BIT, ECP_521_BIT,
        "MODP_2048_256",
        "ECP_192",
        "ECP_224");
-ENUM_NEXT(diffie_hellman_group_names, MODP_NULL, MODP_NULL, ECP_224_BIT,
-       "MODP_NULL");
-ENUM_END(diffie_hellman_group_names, MODP_NULL);
+ENUM_NEXT(diffie_hellman_group_names, MODP_NULL, MODP_CUSTOM, ECP_224_BIT,
+       "MODP_NULL",
+       "MODP_CUSTOM");
+ENUM_END(diffie_hellman_group_names, MODP_CUSTOM);
 
 
 /**

diff --git a/src/libstrongswan/crypto/diffie_hellman.h b/src/libstrongswan/crypto/diffie_hellman.h
index cdc9c785e1d63e050e71bef1213757a77cefab9a..b9816df1a6459e0deec20efc4d87c4d1c0ce94bf 100644 (file)
--- a/src/libstrongswan/crypto/diffie_hellman.h
+++ b/src/libstrongswan/crypto/diffie_hellman.h
@@ -57,6 +57,8 @@ enum diffie_hellman_group_t {
        ECP_224_BIT   = 26,
        /** insecure NULL diffie hellman group for testing, in PRIVATE USE */
        MODP_NULL = 1024,
+       /** MODP group with custon generator, prime */
+       MODP_CUSTOM = 1025,
 };
 
 /**