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/crypto/key_exchange.c
+5 -5
View File
@@ -18,8 +18,8 @@
#include "key_exchange.h"
ENUM_BEGIN(key_exchange_method_names, MODP_NONE, MODP_1024_BIT,
"MODP_NONE",
ENUM_BEGIN(key_exchange_method_names, KE_NONE, MODP_1024_BIT,
"KE_NONE",
"MODP_768",
"MODP_1024");
ENUM_NEXT(key_exchange_method_names, MODP_1536_BIT, MODP_1536_BIT, MODP_1024_BIT,
@@ -58,8 +58,8 @@ ENUM_NEXT(key_exchange_method_names, MODP_CUSTOM, MODP_CUSTOM, NH_128_BIT,
"MODP_CUSTOM");
ENUM_END(key_exchange_method_names, MODP_CUSTOM);
ENUM_BEGIN(key_exchange_method_names_short, MODP_NONE, MODP_1024_BIT,
"modpnone",
ENUM_BEGIN(key_exchange_method_names_short, KE_NONE, MODP_1024_BIT,
"none",
"modp768",
"modp1024");
ENUM_NEXT(key_exchange_method_names_short, MODP_1536_BIT, MODP_1536_BIT, MODP_1024_BIT,
@@ -607,7 +607,7 @@ bool key_exchange_verify_pubkey(key_exchange_method_t ke, chunk_t value)
case MODP_CUSTOM:
valid = TRUE;
break;
case MODP_NONE:
case KE_NONE:
/* fail */
break;
/* compile-warn unhandled methods, fail verification */
src/libstrongswan/crypto/key_exchange.h
+1 -1
View File
@@ -41,7 +41,7 @@ typedef struct diffie_hellman_params_t diffie_hellman_params_t;
* Curve25519 and Curve448 groups are defined in RFC 8031.
*/
enum key_exchange_method_t {
MODP_NONE = 0,
KE_NONE = 0,
MODP_768_BIT = 1,
MODP_1024_BIT = 2,
MODP_1536_BIT = 5,
src/libstrongswan/crypto/proposal/proposal.c
+2 -2
View File
@@ -271,7 +271,7 @@ METHOD(proposal_t, has_ke_method, bool,
}
enumerator->destroy(enumerator);
if (!any && ke == MODP_NONE)
if (!any && ke == KE_NONE)
{
found = TRUE;
}
@@ -692,7 +692,7 @@ static bool check_proposal(private_proposal_t *this)
DBG1(DBG_CFG, "a PRF algorithm is mandatory in IKE proposals");
return FALSE;
}
/* remove MODP_NONE from IKE proposal */
/* remove KE_NONE from IKE proposal */
e = array_create_enumerator(this->transforms);
while (e->enumerate(e, &entry))
{
src/libstrongswan/crypto/proposal/proposal_keywords_static.txt
+2 -1
View File
@@ -149,7 +149,8 @@ prfmd5, PSEUDO_RANDOM_FUNCTION, PRF_HMAC_MD5, 0
prfaesxcbc, PSEUDO_RANDOM_FUNCTION, PRF_AES128_XCBC, 0
prfcamelliaxcbc, PSEUDO_RANDOM_FUNCTION, PRF_CAMELLIA128_XCBC, 0
prfaescmac, PSEUDO_RANDOM_FUNCTION, PRF_AES128_CMAC, 0
modpnone, KEY_EXCHANGE_METHOD, MODP_NONE, 0
none, KEY_EXCHANGE_METHOD, KE_NONE, 0
modpnone, KEY_EXCHANGE_METHOD, KE_NONE, 0
modpnull, KEY_EXCHANGE_METHOD, MODP_NULL, 0
modp768, KEY_EXCHANGE_METHOD, MODP_768_BIT, 0
modp1024, KEY_EXCHANGE_METHOD, MODP_1024_BIT, 0
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)