test-vectors: Support testing DH groups

diff --git a/src/libstrongswan/plugins/test_vectors/test_vectors_plugin.c b/src/libstrongswan/plugins/test_vectors/test_vectors_plugin.c
index cd0a12a5cbfbfda5ef77efb9e825277f49936ba1..5c1259ceaceb54fbe60c210e3da4d8b8a1bf65c4 100644 (file)
--- a/src/libstrongswan/plugins/test_vectors/test_vectors_plugin.c
+++ b/src/libstrongswan/plugins/test_vectors/test_vectors_plugin.c
@@ -25,6 +25,7 @@
 #define TEST_VECTOR_HASHER(x) hasher_test_vector_t x;
 #define TEST_VECTOR_PRF(x) prf_test_vector_t x;
 #define TEST_VECTOR_RNG(x) rng_test_vector_t x;
+#define TEST_VECTOR_DH(x) dh_test_vector_t x;
 
 #include "test_vectors.h"
 
@@ -34,6 +35,7 @@
 #undef TEST_VECTOR_HASHER
 #undef TEST_VECTOR_PRF
 #undef TEST_VECTOR_RNG
+#undef TEST_VECTOR_DH
 
 #define TEST_VECTOR_CRYPTER(x)
 #define TEST_VECTOR_AEAD(x)
@@ -41,6 +43,7 @@
 #define TEST_VECTOR_HASHER(x)
 #define TEST_VECTOR_PRF(x)
 #define TEST_VECTOR_RNG(x)
+#define TEST_VECTOR_DH(x)
 
 /* create test vector arrays */
 #undef TEST_VECTOR_CRYPTER
@@ -91,6 +94,14 @@ static rng_test_vector_t *rng[] = {
 #undef TEST_VECTOR_RNG
 #define TEST_VECTOR_RNG(x)
 
+#undef TEST_VECTOR_DH
+#define TEST_VECTOR_DH(x) &x,
+static dh_test_vector_t *dh[] = {
+#include "test_vectors.h"
+};
+#undef TEST_VECTOR_DH
+#define TEST_VECTOR_DH(x)
+
 typedef struct private_test_vectors_plugin_t private_test_vectors_plugin_t;
 
 /**
@@ -175,7 +186,11 @@ plugin_t *test_vectors_plugin_create()
                lib->crypto->add_test_vector(lib->crypto,
                                                                         RANDOM_NUMBER_GENERATOR, rng[i]);
        }
+       for (i = 0; i < countof(dh); i++)
+       {
+               lib->crypto->add_test_vector(lib->crypto,
+                                                                        DIFFIE_HELLMAN_GROUP, dh[i]);
+       }
 
        return &this->public.plugin;
 }
-