denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename diffie_hellman_t to key_exchange_t and change the interface etc.

Browse Source 
This makes it more generic so we can use it for QSKE methods.
This commit is contained in:
Tobias Brunner
2022-06-29 10:28:50 +02:00
parent ec95fd9b93
commit 3af7c6db87
130 changed files with 1379 additions and 1384 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/test_vectors/test_vectors.h
+23 -23
View File
@@ -352,26 +352,26 @@ TEST_VECTOR_RNG(rng_runs_1)
TEST_VECTOR_RNG(rng_runs_2)
TEST_VECTOR_RNG(rng_runs_3)
TEST_VECTOR_DH(modp768)
TEST_VECTOR_DH(modp1024)
TEST_VECTOR_DH(modp1536)
TEST_VECTOR_DH(modp2048)
TEST_VECTOR_DH(modp3072)
TEST_VECTOR_DH(modp4096)
TEST_VECTOR_DH(modp6144)
TEST_VECTOR_DH(modp8192)
TEST_VECTOR_DH(modp1024_160)
TEST_VECTOR_DH(modp2048_224)
TEST_VECTOR_DH(modp2048_256)
TEST_VECTOR_DH(ecp192)
TEST_VECTOR_DH(ecp224)
TEST_VECTOR_DH(ecp256)
TEST_VECTOR_DH(ecp384)
TEST_VECTOR_DH(ecp521)
TEST_VECTOR_DH(ecp224bp)
TEST_VECTOR_DH(ecp256bp)
TEST_VECTOR_DH(ecp384bp)
TEST_VECTOR_DH(ecp512bp)
TEST_VECTOR_DH(curve25519_1)
TEST_VECTOR_DH(curve25519_2)
TEST_VECTOR_DH(curve448_1)
TEST_VECTOR_KE(modp768)
TEST_VECTOR_KE(modp1024)
TEST_VECTOR_KE(modp1536)
TEST_VECTOR_KE(modp2048)
TEST_VECTOR_KE(modp3072)
TEST_VECTOR_KE(modp4096)
TEST_VECTOR_KE(modp6144)
TEST_VECTOR_KE(modp8192)
TEST_VECTOR_KE(modp1024_160)
TEST_VECTOR_KE(modp2048_224)
TEST_VECTOR_KE(modp2048_256)
TEST_VECTOR_KE(ecp192)
TEST_VECTOR_KE(ecp224)
TEST_VECTOR_KE(ecp256)
TEST_VECTOR_KE(ecp384)
TEST_VECTOR_KE(ecp521)
TEST_VECTOR_KE(ecp224bp)
TEST_VECTOR_KE(ecp256bp)
TEST_VECTOR_KE(ecp384bp)
TEST_VECTOR_KE(ecp512bp)
TEST_VECTOR_KE(curve25519_1)
TEST_VECTOR_KE(curve25519_2)
TEST_VECTOR_KE(curve448_1)
src/libstrongswan/plugins/test_vectors/test_vectors/curve25519.c
+4 -4
View File
@@ -19,8 +19,8 @@
/**
* From RFC 7748
*/
dh_test_vector_t curve25519_1 = {
.group = CURVE_25519, .priv_len = 32, .pub_len = 32, .shared_len = 32,
ke_test_vector_t curve25519_1 = {
.method = CURVE_25519, .priv_len = 32, .pub_len = 32, .shared_len = 32,
.priv_a = "\x77\x07\x6d\x0a\x73\x18\xa5\x7d\x3c\x16\xc1\x72\x51\xb2\x66\x45"
"\xdf\x4c\x2f\x87\xeb\xc0\x99\x2a\xb1\x77\xfb\xa5\x1d\xb9\x2c\x2a",
.priv_b = "\x5d\xab\x08\x7e\x62\x4a\x8a\x4b\x79\xe1\x7f\x8b\x83\x80\x0e\xe6"
@@ -36,8 +36,8 @@ dh_test_vector_t curve25519_1 = {
/**
* From RFC 8031
*/
dh_test_vector_t curve25519_2 = {
.group = CURVE_25519, .priv_len = 32, .pub_len = 32, .shared_len = 32,
ke_test_vector_t curve25519_2 = {
.method = CURVE_25519, .priv_len = 32, .pub_len = 32, .shared_len = 32,
.priv_a = "\x75\x1f\xb4\x30\x86\x55\xb4\x76\xb6\x78\x9b\x73\x25\xf9\xea\x8c"
"\xdd\xd1\x6a\x58\x53\x3f\xf6\xd9\xe6\x00\x09\x46\x4a\x5f\x9d\x94",
.priv_b = "\x0a\x54\x64\x52\x53\x29\x0d\x60\xdd\xad\xd0\xe0\x30\xba\xcd\x9e"
src/libstrongswan/plugins/test_vectors/test_vectors/curve448.c
+2 -2
View File
@@ -19,8 +19,8 @@
/**
* From RFC 7748
*/
dh_test_vector_t curve448_1 = {
.group = CURVE_448, .priv_len = 56, .pub_len = 56, .shared_len = 56,
ke_test_vector_t curve448_1 = {
.method = CURVE_448, .priv_len = 56, .pub_len = 56, .shared_len = 56,
.priv_a = "\x9a\x8f\x49\x25\xd1\x51\x9f\x57\x75\xcf\x46\xb0\x4b\x58\x00\xd4"
"\xee\x9e\xe8\xba\xe8\xbc\x55\x65\xd4\x98\xc2\x8d\xd9\xc9\xba\xf5"
"\x74\xa9\x41\x97\x44\x89\x73\x91\x00\x63\x82\xa6\xf1\x27\xab\x1d"
src/libstrongswan/plugins/test_vectors/test_vectors/ecp.c
+10 -10
View File
@@ -20,8 +20,8 @@
* Test vectors from RFC5114
*/
dh_test_vector_t ecp192 = {
.group = ECP_192_BIT, .priv_len = 24, .pub_len = 48, .shared_len = 24,
ke_test_vector_t ecp192 = {
.method = ECP_192_BIT, .priv_len = 24, .pub_len = 48, .shared_len = 24,
.priv_a = "\x32\x3f\xa3\x16\x9d\x8e\x9c\x65\x93\xf5\x94\x76\xbc\x14\x20\x00"
"\xab\x5b\xe0\xe2\x49\xc4\x34\x26",
.priv_b = "\x63\x1f\x95\xbb\x4a\x67\x63\x2c\x9c\x47\x6e\xee\x9a\xb6\x95\xab"
@@ -36,8 +36,8 @@ dh_test_vector_t ecp192 = {
"\xe5\xff\x4f\x83\x7f\x54\xfe\xbe",
};
dh_test_vector_t ecp224 = {
.group = ECP_224_BIT, .priv_len = 28, .pub_len = 56, .shared_len = 28,
ke_test_vector_t ecp224 = {
.method = ECP_224_BIT, .priv_len = 28, .pub_len = 56, .shared_len = 28,
.priv_a = "\xb5\x58\xeb\x6c\x28\x8d\xa7\x07\xbb\xb4\xf8\xfb\xae\x2a\xb9\xe9"
"\xcb\x62\xe3\xbc\x5c\x75\x73\xe2\x2e\x26\xd3\x7f",
.priv_b = "\xac\x3b\x1a\xdd\x3d\x97\x70\xe6\xf6\xa7\x08\xee\x9f\x3b\x8e\x0a"
@@ -54,8 +54,8 @@ dh_test_vector_t ecp224 = {
"\xd9\x6e\xcc\x3b\x6d\xc1\x71\x4a\x4e\xa9\x49\xfa",
};
dh_test_vector_t ecp256 = {
.group = ECP_256_BIT, .priv_len = 32, .pub_len = 64, .shared_len = 32,
ke_test_vector_t ecp256 = {
.method = ECP_256_BIT, .priv_len = 32, .pub_len = 64, .shared_len = 32,
.priv_a = "\x81\x42\x64\x14\x5f\x2f\x56\xf2\xe9\x6a\x8e\x33\x7a\x12\x84\x99"
"\x3f\xaf\x43\x2a\x5a\xbc\xe5\x9e\x86\x7b\x72\x91\xd5\x07\xa3\xaf",
.priv_b = "\x2c\xe1\x78\x8e\xc1\x97\xe0\x96\xdb\x95\xa2\x00\xcc\x0a\xb2\x6a"
@@ -72,8 +72,8 @@ dh_test_vector_t ecp256 = {
"\xf5\x81\x1e\x9d\xc8\xec\x8e\xea\x7f\x80\xd2\x1c\x82\x0c\x27\x88",
};
dh_test_vector_t ecp384 = {
.group = ECP_384_BIT, .priv_len = 48, .pub_len = 96, .shared_len = 48,
ke_test_vector_t ecp384 = {
.method = ECP_384_BIT, .priv_len = 48, .pub_len = 96, .shared_len = 48,
.priv_a = "\xd2\x73\x35\xea\x71\x66\x4a\xf2\x44\xdd\x14\xe9\xfd\x12\x60\x71"
"\x5d\xfd\x8a\x79\x65\x57\x1c\x48\xd7\x09\xee\x7a\x79\x62\xa1\x56"
"\xd7\x06\xa9\x0c\xbc\xb5\xdf\x29\x86\xf0\x5f\xea\xdb\x93\x76\xf1",
@@ -97,8 +97,8 @@ dh_test_vector_t ecp384 = {
"\x27\xaa\x8a\x45\x40\x88\x4c\x37\xde\x15\x9a\x58\x02\x8a\xbc\x0e",
};
dh_test_vector_t ecp521 = {
.group = ECP_521_BIT, .priv_len = 66, .pub_len = 132, .shared_len = 66,
ke_test_vector_t ecp521 = {
.method = ECP_521_BIT, .priv_len = 66, .pub_len = 132, .shared_len = 66,
.priv_a = "\x01\x13\xf8\x2d\xa8\x25\x73\x5e\x3d\x97\x27\x66\x83\xb2\xb7\x42"
"\x77\xba\xd2\x73\x35\xea\x71\x66\x4a\xf2\x43\x0c\xc4\xf3\x34\x59"
"\xb9\x66\x9e\xe7\x8b\x3f\xfb\x9b\x86\x83\x01\x5d\x34\x4d\xcb\xfe"
src/libstrongswan/plugins/test_vectors/test_vectors/ecpbp.c
+8 -8
View File
@@ -20,8 +20,8 @@
* Test vectors from RFC6923/RFC7027
*/
dh_test_vector_t ecp224bp = {
.group = ECP_224_BP, .priv_len = 28, .pub_len = 56, .shared_len = 28,
ke_test_vector_t ecp224bp = {
.method = ECP_224_BP, .priv_len = 28, .pub_len = 56, .shared_len = 28,
.priv_a = "\x7c\x4b\x7a\x2c\x8a\x4b\xad\x1f\xbb\x7d\x79\xcc\x09\x55\xdb\x7c"
"\x6a\x46\x60\xca\x64\xcc\x47\x78\x15\x9b\x49\x5e",
.priv_b = "\x63\x97\x6d\x4a\xae\x6c\xd0\xf6\xdd\x18\xde\xfe\xf5\x5d\x96\x56"
@@ -38,8 +38,8 @@ dh_test_vector_t ecp224bp = {
"\xdc\xcb\xe3\xb6\x5d\x0f\x96\x7d\xca\xb5\x74\xeb",
};
dh_test_vector_t ecp256bp = {
.group = ECP_256_BP, .priv_len = 32, .pub_len = 64, .shared_len = 32,
ke_test_vector_t ecp256bp = {
.method = ECP_256_BP, .priv_len = 32, .pub_len = 64, .shared_len = 32,
.priv_a = "\x81\xdb\x1e\xe1\x00\x15\x0f\xf2\xea\x33\x8d\x70\x82\x71\xbe\x38"
"\x30\x0c\xb5\x42\x41\xd7\x99\x50\xf7\x7b\x06\x30\x39\x80\x4f\x1d",
.priv_b = "\x55\xe4\x0b\xc4\x1e\x37\xe3\xe2\xad\x25\xc3\xc6\x65\x45\x11\xff"
@@ -56,8 +56,8 @@ dh_test_vector_t ecp256bp = {
"\xf9\x65\x56\xec\x91\xe6\xae\x79\x39\xbc\xe3\x1f\x3a\x18\xbf\x2b",
};
dh_test_vector_t ecp384bp = {
.group = ECP_384_BP, .priv_len = 48, .pub_len = 96, .shared_len = 48,
ke_test_vector_t ecp384bp = {
.method = ECP_384_BP, .priv_len = 48, .pub_len = 96, .shared_len = 48,
.priv_a = "\x1e\x20\xf5\xe0\x48\xa5\x88\x6f\x1f\x15\x7c\x74\xe9\x1b\xde\x2b"
"\x98\xc8\xb5\x2d\x58\xe5\x00\x3d\x57\x05\x3f\xc4\xb0\xbd\x65\xd6"
"\xf1\x5e\xb5\xd1\xee\x16\x10\xdf\x87\x07\x95\x14\x36\x27\xd0\x42",
@@ -81,8 +81,8 @@ dh_test_vector_t ecp384bp = {
"\xad\xf6\x40\x37\x15\xc3\x5d\x4f\xb2\xa5\x44\x4f\x57\x5d\x4f\x42",
};
dh_test_vector_t ecp512bp = {
.group = ECP_512_BP, .priv_len = 64, .pub_len = 128, .shared_len = 64,
ke_test_vector_t ecp512bp = {
.method = ECP_512_BP, .priv_len = 64, .pub_len = 128, .shared_len = 64,
.priv_a = "\x16\x30\x2f\xf0\xdb\xbb\x5a\x8d\x73\x3d\xab\x71\x41\xc1\xb4\x5a"
"\xcb\xc8\x71\x59\x39\x67\x7f\x6a\x56\x85\x0a\x38\xbd\x87\xbd\x59"
"\xb0\x9e\x80\x27\x96\x09\xff\x33\x3e\xb9\xd4\xc0\x61\x23\x1f\xb2"
src/libstrongswan/plugins/test_vectors/test_vectors/modp.c
+16 -16
View File
@@ -21,8 +21,8 @@
* these have been generated.
*/
dh_test_vector_t modp768 = {
.group = MODP_768_BIT, .priv_len = 32, .pub_len = 96, .shared_len = 96,
ke_test_vector_t modp768 = {
.method = MODP_768_BIT, .priv_len = 32, .pub_len = 96, .shared_len = 96,
.priv_a = "\x60\x91\xff\xc6\xde\x28\xc1\xcc\xc7\xc6\x5d\xa6\x11\xab\xfa\xe8"
"\x6a\x10\x74\xb2\x22\x43\xe3\x70\x6c\xb6\xde\x2f\xe2\x9d\x11\x42",
.priv_b = "\x76\xe0\x2f\xc3\xea\xbe\x6a\x0f\xce\xd6\xc3\x1e\x59\x45\xd1\x67"
@@ -47,8 +47,8 @@ dh_test_vector_t modp768 = {
"\x3d\xaa\xad\x22\xe8\x68\xb7\xe2\x50\x02\x9d\x30\x7e\xe5\x41\x48",
};
dh_test_vector_t modp1024 = {
.group = MODP_1024_BIT, .priv_len = 32, .pub_len = 128, .shared_len = 128,
ke_test_vector_t modp1024 = {
.method = MODP_1024_BIT, .priv_len = 32, .pub_len = 128, .shared_len = 128,
.priv_a = "\xe5\x3c\x20\x5d\xa0\xd8\xe4\xbf\xb4\x17\x49\x44\x32\x0f\xc6\xe4"
"\xea\x66\xfe\x44\xe3\xc9\x31\xac\x5d\xa1\x45\x0a\xea\x47\xeb\xcf",
.priv_b = "\x7f\x9a\xf7\x21\xeb\x7c\xd2\xa9\x00\xa3\x6e\x39\x9e\xbc\x5c\x65"
@@ -79,8 +79,8 @@ dh_test_vector_t modp1024 = {
"\x48\x02\xd7\x4a\x4f\x75\x3b\x29\x4a\x96\x50\x3f\x26\x05\xd3\xf1",
};
dh_test_vector_t modp1536 = {
.group = MODP_1536_BIT, .priv_len = 32, .pub_len = 192, .shared_len = 192,
ke_test_vector_t modp1536 = {
.method = MODP_1536_BIT, .priv_len = 32, .pub_len = 192, .shared_len = 192,
.priv_a = "\x22\xd9\xdc\xc7\x30\x79\x93\x6a\x85\x8c\x07\xaa\x85\xed\x07\xb3"
"\xd1\xe8\xb6\x70\xe7\xca\xaf\xa1\x92\x83\x76\x96\x07\x0f\xef\x29",
.priv_b = "\x32\x34\x74\xde\x77\x88\xe0\x03\x6b\x30\x95\x49\x56\x0b\x00\x0d"
@@ -123,8 +123,8 @@ dh_test_vector_t modp1536 = {
"\x38\x1b\x1e\x5b\x7a\xa5\xd0\x9a\xb6\x6b\x74\x99\x7c\xba\xed\x20",
};
dh_test_vector_t modp2048 = {
.group = MODP_2048_BIT, .priv_len = 48, .pub_len = 256, .shared_len = 256,
ke_test_vector_t modp2048 = {
.method = MODP_2048_BIT, .priv_len = 48, .pub_len = 256, .shared_len = 256,
.priv_a = "\xaf\x3b\xfd\x38\x62\xca\xa1\x17\x74\xce\x2b\x74\x84\x08\x07\xc1"
"\xde\x5c\xd6\xa7\x61\x9b\xb3\xa0\xc7\xaf\x39\xee\xda\xa6\xeb\x89"
"\xe2\xe9\xc1\x44\xb3\x62\x5b\x27\x31\x87\x9c\xb5\x8f\xa3\x76\x6d",
@@ -181,8 +181,8 @@ dh_test_vector_t modp2048 = {
"\xee\x9c\x12\x15\xdd\x23\x93\xde\x02\xf5\xc1\x76\x7f\x07\x0e\x28",
};
dh_test_vector_t modp3072 = {
.group = MODP_3072_BIT, .priv_len = 48, .pub_len = 384, .shared_len = 384,
ke_test_vector_t modp3072 = {
.method = MODP_3072_BIT, .priv_len = 48, .pub_len = 384, .shared_len = 384,
.priv_a = "\x51\xf8\xaa\xb6\x63\x20\x1e\xb2\x86\xba\xd2\x99\x32\xb2\xe5\x8a"
"\x92\x96\xbf\x2a\xa7\x78\x79\xcc\x8c\x64\x29\xd5\xa6\x68\xad\xf7"
"\x60\x57\xad\xc3\x77\xcc\x75\xfd\x86\x47\x96\xb8\xfa\x7b\x42\x8c",
@@ -263,8 +263,8 @@ dh_test_vector_t modp3072 = {
"\xdc\x87\x87\x5b\xe5\x88\xc0\xcd\xee\xee\xfd\x19\xcc\x4f\x1d\x40",
};
dh_test_vector_t modp4096 = {
.group = MODP_4096_BIT, .priv_len = 64, .pub_len = 512, .shared_len = 512,
ke_test_vector_t modp4096 = {
.method = MODP_4096_BIT, .priv_len = 64, .pub_len = 512, .shared_len = 512,
.priv_a = "\xab\x69\xbc\xe9\x61\xf9\x8a\xa9\xd5\x91\xe3\xfd\x9a\xbc\x46\xc8"
"\x0d\xde\x39\x02\x84\xf1\x91\x42\xe8\x81\x5a\xb0\x80\x54\x72\x2b"
"\xbd\x2e\x14\x1e\x27\x9e\xc7\xfd\x30\xaa\xfa\xca\x66\x40\x93\x73"
@@ -371,8 +371,8 @@ dh_test_vector_t modp4096 = {
"\x4f\xb9\x39\x02\x12\xb9\xb2\xa3\x5d\x4a\xfa\x17\xb3\xee\xc0\x8a",
};
dh_test_vector_t modp6144 = {
.group = MODP_6144_BIT, .priv_len = 64, .pub_len = 768, .shared_len = 768,
ke_test_vector_t modp6144 = {
.method = MODP_6144_BIT, .priv_len = 64, .pub_len = 768, .shared_len = 768,
.priv_a = "\xab\x36\xf0\x65\x7c\x4f\xba\xdc\x2a\x3b\x07\xed\xd1\xc8\xaf\xcb"
"\x42\xaf\xcd\x7f\xf9\x1c\x57\x01\x37\x25\x50\x0d\x89\x42\x9f\x34"
"\x79\x8f\x99\xf5\xde\x53\xd1\x08\x8f\xd9\xf6\x60\xa1\xa5\x2b\xe4"
@@ -527,8 +527,8 @@ dh_test_vector_t modp6144 = {
"\xb8\xd0\xeb\x41\xb6\x7c\xfb\x9d\x9d\xfd\x62\x0e\xb7\x99\xca\x17",
};
dh_test_vector_t modp8192 = {
.group = MODP_8192_BIT, .priv_len = 64, .pub_len = 1024, .shared_len = 1024,
ke_test_vector_t modp8192 = {
.method = MODP_8192_BIT, .priv_len = 64, .pub_len = 1024, .shared_len = 1024,
.priv_a = "\xa6\x48\x81\x47\x45\xfe\x1e\xd1\x98\x9b\x75\xba\x6d\xd5\x01\xe4"
"\x4e\x77\x6d\xc9\x97\xa0\xae\x27\x37\x64\x61\xb0\xee\x79\x65\x94"
"\xc2\xe6\xdb\x07\xe5\xf9\xd8\x7d\x94\x4d\x37\x01\x22\x38\xe5\x70"
src/libstrongswan/plugins/test_vectors/test_vectors/modpsub.c
+6 -6
View File
@@ -20,8 +20,8 @@
* Test vectors from RFC5114
*/
dh_test_vector_t modp1024_160 = {
.group = MODP_1024_160, .priv_len = 20, .pub_len = 128, .shared_len = 128,
ke_test_vector_t modp1024_160 = {
.method = MODP_1024_160, .priv_len = 20, .pub_len = 128, .shared_len = 128,
.priv_a = "\xB9\xA3\xB3\xAE\x8F\xEF\xC1\xA2\x93\x04\x96\x50\x70\x86\xF8\x45"
"\x5D\x48\x94\x3E",
.priv_b = "\x93\x92\xC9\xF9\xEB\x6A\x7A\x6A\x90\x22\xF7\xD8\x3E\x72\x23\xC6"
@@ -52,8 +52,8 @@ dh_test_vector_t modp1024_160 = {
"\x16\x7E\xCD\x91\x55\x41\x6F\x46\xF4\x08\xED\x31\xB6\x3C\x6E\x6D",
};
dh_test_vector_t modp2048_224 = {
.group = MODP_2048_224, .priv_len = 28, .pub_len = 256, .shared_len = 256,
ke_test_vector_t modp2048_224 = {
.method = MODP_2048_224, .priv_len = 28, .pub_len = 256, .shared_len = 256,
.priv_a = "\x22\xe6\x26\x01\xdb\xff\xd0\x67\x08\xa6\x80\xf7\x47\xf3\x61\xf7"
"\x6d\x8f\x4f\x72\x1a\x05\x48\xe4\x83\x29\x4b\x0c",
.priv_b = "\x4f\xf3\xbc\x96\xc7\xfc\x6a\x6d\x71\xd3\xb3\x63\x80\x0a\x7c\xdf"
@@ -108,8 +108,8 @@ dh_test_vector_t modp2048_224 = {
"\x7f\xcb\x51\x0b\x69\x98\xff\xd3\xaa\x6d\xe7\x3c\xf9\xf6\x38\x69",
};
dh_test_vector_t modp2048_256 = {
.group = MODP_2048_256, .priv_len = 32, .pub_len = 256, .shared_len = 256,
ke_test_vector_t modp2048_256 = {
.method = MODP_2048_256, .priv_len = 32, .pub_len = 256, .shared_len = 256,
.priv_a = "\x08\x81\x38\x2c\xdb\x87\x66\x0c\x6d\xc1\x3e\x61\x49\x38\xd5\xb9"
"\xc8\xb2\xf2\x48\x58\x1c\xc5\xe3\x1b\x35\x45\x43\x97\xfc\xe5\x0e",
.priv_b = "\x7d\x62\xa7\xe3\xef\x36\xde\x61\x7b\x13\xd1\xaf\xb8\x2c\x78\x0d"
src/libstrongswan/plugins/test_vectors/test_vectors_plugin.c
+10 -10
View File
@@ -29,7 +29,7 @@
#define TEST_VECTOR_KDF(x) extern kdf_test_vector_t x;
#define TEST_VECTOR_DRBG(x) extern drbg_test_vector_t x;
#define TEST_VECTOR_RNG(x) extern rng_test_vector_t x;
#define TEST_VECTOR_DH(x) extern dh_test_vector_t x;
#define TEST_VECTOR_KE(x) extern ke_test_vector_t x;
#include "test_vectors.h"
@@ -42,7 +42,7 @@
#undef TEST_VECTOR_KDF
#undef TEST_VECTOR_DRBG
#undef TEST_VECTOR_RNG
#undef TEST_VECTOR_DH
#undef TEST_VECTOR_KE
#define TEST_VECTOR_CRYPTER(x)
#define TEST_VECTOR_AEAD(x)
@@ -53,7 +53,7 @@
#define TEST_VECTOR_KDF(x)
#define TEST_VECTOR_DRBG(x)
#define TEST_VECTOR_RNG(x)
#define TEST_VECTOR_DH(x)
#define TEST_VECTOR_KE(x)
/* create test vector arrays */
#undef TEST_VECTOR_CRYPTER
@@ -128,13 +128,13 @@ 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[] = {
#undef TEST_VECTOR_KE
#define TEST_VECTOR_KE(x) &x,
static ke_test_vector_t *ke[] = {
#include "test_vectors.h"
};
#undef TEST_VECTOR_DH
#define TEST_VECTOR_DH(x)
#undef TEST_VECTOR_KE
#define TEST_VECTOR_KE(x)
typedef struct private_test_vectors_plugin_t private_test_vectors_plugin_t;
@@ -235,10 +235,10 @@ 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++)
for (i = 0; i < countof(ke); i++)
{
lib->crypto->add_test_vector(lib->crypto,
DIFFIE_HELLMAN_GROUP, dh[i]);
KEY_EXCHANGE_METHOD, ke[i]);
}
return &this->public.plugin;