From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 25 Aug 2020 11:16:52 +0000 (+0200)
Subject: tls-crypto: Enumerate x25519/448 and rename constant for consistency
X-Git-Tag: 5.9.2rc1~23^2~94
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3101120c75ef14530d034614c7ae353066912bba;p=thirdparty%2Fstrongswan.git

tls-crypto: Enumerate x25519/448 and rename constant for consistency
---

diff --git a/src/libtls/tls_crypto.c b/src/libtls/tls_crypto.c
index fea04a9ebc..77fc153095 100644
--- a/src/libtls/tls_crypto.c
+++ b/src/libtls/tls_crypto.c
@@ -320,11 +320,11 @@ ENUM_BEGIN(tls_named_group_names, TLS_SECT163K1, TLS_SECP521R1,
 	"SECP384R1",
 	"SECP521R1",
 );
-ENUM_NEXT(tls_named_group_names, TLS_CURVE25519, TLS_CURVE_448, TLS_SECP521R1,
+ENUM_NEXT(tls_named_group_names, TLS_CURVE25519, TLS_CURVE448, TLS_SECP521R1,
 	"CURVE25519",
 	"CURVE448",
 );
-ENUM_NEXT(tls_named_group_names, TLS_FFDHE2048, TLS_FFDHE8192, TLS_CURVE_448,
+ENUM_NEXT(tls_named_group_names, TLS_FFDHE2048, TLS_FFDHE8192, TLS_CURVE448,
 	"FFDHE2048",
 	"FFDHE3072",
 	"FFDHE4096",
@@ -1471,6 +1471,8 @@ static struct {
 	{ ECP_521_BIT, TLS_SECP521R1},
 	{ ECP_224_BIT, TLS_SECP224R1},
 	{ ECP_192_BIT, TLS_SECP192R1},
+	{ CURVE_25519, TLS_CURVE25519},
+	{ CURVE_448,   TLS_CURVE448},
 };
 
 CALLBACK(group_filter, bool,
diff --git a/src/libtls/tls_crypto.h b/src/libtls/tls_crypto.h
index 0451906565..5cd007241e 100644
--- a/src/libtls/tls_crypto.h
+++ b/src/libtls/tls_crypto.h
@@ -362,7 +362,7 @@ enum tls_named_group_t {
 
 	/* TLS 1.3: new ecdhe, dhe groups */
 	TLS_CURVE25519 =    29,
-	TLS_CURVE_448  =    30,
+	TLS_CURVE448   =    30,
 	TLS_FFDHE2048  =    256,
 	TLS_FFDHE3072  =    257,
 	TLS_FFDHE4096  =    258,