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

Rename MODP_NONE to KE_NONE

Browse Source
This commit is contained in:
Andreas Steffen
2022-06-29 10:28:50 +02:00
committed by Tobias Brunner
parent 3af7c6db87
commit b7c167f972
17 changed files with 78 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/tests/suites/test_crypto_factory.c
+11 -11
View File
@@ -182,43 +182,43 @@ static struct {
} data[4];
} ke_data[] = {
{ NULL, NULL, {
{ MODP_NONE, NULL, NULL }
{ KE_NONE, NULL, NULL }
}},
{ "plugin1", NULL, {
{ MODP_1024_BIT, ke_create_modp1024, "plugin1" },
{ MODP_NONE, NULL, NULL }
{ KE_NONE, NULL, NULL }
}},
{ "plugin1", NULL, {
{ MODP_1024_BIT, ke_create_modp1024, "plugin1" },
{ MODP_1024_BIT, ke_create_modp1024_second, "plugin2" },
{ MODP_NONE, NULL, NULL }
{ KE_NONE, NULL, NULL }
}},
{ "plugin2", NULL, {
{ MODP_1024_BIT, ke_create_modp1024_second, "plugin2" },
{ MODP_1024_BIT, ke_create_modp1024, "plugin1" },
{ MODP_NONE, NULL, NULL }
{ KE_NONE, NULL, NULL }
}},
{ "plugin1", "plugin1", {
{ MODP_1024_BIT, ke_create_modp1024, "plugin1" },
{ MODP_2048_BIT, ke_create_modp2048, "plugin1" },
{ MODP_NONE, NULL }
{ KE_NONE, NULL }
}},
{ "plugin1", "plugin1", {
{ MODP_2048_BIT, ke_create_modp2048, "plugin1" },
{ MODP_1024_BIT, ke_create_modp1024, "plugin1" },
{ MODP_NONE, NULL }
{ KE_NONE, NULL }
}},
{ "plugin1", "plugin1", {
{ MODP_2048_BIT, ke_create_modp2048, "plugin1" },
{ MODP_2048_BIT, ke_create_modp2048_second, "plugin2" },
{ MODP_1024_BIT, ke_create_modp1024, "plugin1" },
{ MODP_NONE, NULL }
{ KE_NONE, NULL }
}},
{ "plugin1", "plugin2", {
{ MODP_2048_BIT, ke_create_modp2048_second, "plugin2" },
{ MODP_2048_BIT, ke_create_modp2048, "plugin1" },
{ MODP_1024_BIT, ke_create_modp1024, "plugin1" },
{ MODP_NONE, NULL }
{ KE_NONE, NULL }
}},
};
@@ -249,7 +249,7 @@ START_TEST(test_create_ke)
factory = crypto_factory_create();
for (i = 0; ke_data[_i].data[i].ke != MODP_NONE; i++)
for (i = 0; ke_data[_i].data[i].ke != KE_NONE; i++)
{
ck_assert(factory->add_ke(factory, ke_data[_i].data[i].ke,
ke_data[_i].data[i].plugin,
@@ -283,10 +283,10 @@ START_TEST(test_create_ke)
}
}
ck_assert(!enumerator->enumerate(enumerator));
ck_assert_int_eq(ke_data[_i].data[i].ke, MODP_NONE);
ck_assert_int_eq(ke_data[_i].data[i].ke, KE_NONE);
enumerator->destroy(enumerator);
for (i = 0; ke_data[_i].data[i].ke != MODP_NONE; i++)
for (i = 0; ke_data[_i].data[i].ke != KE_NONE; i++)
{
factory->remove_ke(factory, ke_data[_i].data[i].create);
}
src/libstrongswan/tests/suites/test_proposal.c
+9 -9
View File
@@ -55,7 +55,7 @@ static struct {
{ PROTO_IKE, "null-sha256-modp3072", "IKE:NULL/HMAC_SHA2_256_128/PRF_HMAC_SHA2_256/MODP_3072" },
{ PROTO_IKE, "aes128", NULL },
{ PROTO_IKE, "aes128-sha256", NULL },
{ PROTO_IKE, "aes128-sha256-modpnone", NULL },
{ PROTO_IKE, "aes128-sha256-none", NULL },
{ PROTO_IKE, "aes128-prfsha256", NULL },
{ PROTO_IKE, "aes128-prfsha256-modp2048", NULL },
{ PROTO_IKE, "aes128-sha256-modp3072", "IKE:AES_CBC_128/HMAC_SHA2_256_128/PRF_HMAC_SHA2_256/MODP_3072" },
@@ -129,20 +129,20 @@ static struct {
{ PROTO_ESP, "aes128-sha256", "aes128-sha256-modp3072", "aes128-sha256", PROPOSAL_SKIP_KE },
{ PROTO_ESP, "aes128-sha256-modp3072", "aes128-sha256-modp3072", "aes128-sha256", PROPOSAL_SKIP_KE },
{ PROTO_ESP, "aes128-sha256-modp3072", "aes128-sha256-ecp256", "aes128-sha256", PROPOSAL_SKIP_KE },
{ PROTO_ESP, "aes128-sha256-modp3072", "aes128-sha256-modpnone", NULL },
{ PROTO_ESP, "aes128-sha256-modpnone", "aes128-sha256-modp3072", NULL },
{ PROTO_ESP, "aes128-sha256-modp3072-modpnone", "aes128-sha256", "aes128-sha256" },
{ PROTO_ESP, "aes128-sha256", "aes128-sha256-modp3072-modpnone", "aes128-sha256" },
{ PROTO_ESP, "aes128-sha256-modp3072-modpnone", "aes128-sha256-modpnone-modp3072", "aes128-sha256-modp3072" },
{ PROTO_ESP, "aes128-sha256-modpnone-modp3072", "aes128-sha256-modp3072-modpnone", "aes128-sha256" },
{ PROTO_ESP, "aes128-sha256-modp3072", "aes128-sha256-none", NULL },
{ PROTO_ESP, "aes128-sha256-none", "aes128-sha256-modp3072", NULL },
{ PROTO_ESP, "aes128-sha256-modp3072-none", "aes128-sha256", "aes128-sha256" },
{ PROTO_ESP, "aes128-sha256", "aes128-sha256-modp3072-none", "aes128-sha256" },
{ PROTO_ESP, "aes128-sha256-modp3072-none", "aes128-sha256-none-modp3072", "aes128-sha256-modp3072" },
{ PROTO_ESP, "aes128-sha256-none-modp3072", "aes128-sha256-modp3072-none", "aes128-sha256" },
{ PROTO_ESP, "aes128-sha256-esn", "aes128-sha256-esn", "aes128-sha256-esn" },
{ PROTO_ESP, "aes128-sha256-noesn", "aes128-sha256-esn", NULL },
{ PROTO_ESP, "aes128-sha256-noesn-esn", "aes128-sha256-esn", "aes128-sha256-esn" },
{ PROTO_ESP, "aes128-sha256-noesn-esn", "aes128-sha256", "aes128-sha256" },
{ PROTO_ESP, "aes128-sha256-esn-noesn", "aes128-sha256-noesn-esn", "aes128-sha256-esn" },
{ PROTO_IKE, "aes128-sha256-modp3072", "aes128-sha256-modp3072", "aes128-sha256-modp3072" },
{ PROTO_IKE, "aes128-sha256-modp3072", "aes128-sha256-modp3072-modpnone", "aes128-sha256-modp3072" },
{ PROTO_IKE, "aes128-sha256-modp3072-modpnone", "aes128-sha256-modp3072", "aes128-sha256-modp3072" },
{ PROTO_IKE, "aes128-sha256-modp3072", "aes128-sha256-modp3072-none", "aes128-sha256-modp3072" },
{ PROTO_IKE, "aes128-sha256-modp3072-none", "aes128-sha256-modp3072", "aes128-sha256-modp3072" },
};
START_TEST(test_select)