Rename MODP_NONE to KE_NONE

src/libstrongswan/crypto/key_exchange.c

@@ -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

@@ -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

@@ -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

@@ -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