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

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

Browse Source
This commit is contained in:
Tobias Brunner
2021-02-12 11:45:44 +01:00
parent 53ba0801ac
commit 3101120c75
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libtls/tls_crypto.c
+4 -2
View File
@@ -320,11 +320,11 @@ ENUM_BEGIN(tls_named_group_names, TLS_SECT163K1, TLS_SECP521R1,
"SECP384R1", "SECP384R1",
"SECP521R1", "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", "CURVE25519",
"CURVE448", "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", "FFDHE2048",
"FFDHE3072", "FFDHE3072",
"FFDHE4096", "FFDHE4096",
@@ -1471,6 +1471,8 @@ static struct {
{ ECP_521_BIT, TLS_SECP521R1}, { ECP_521_BIT, TLS_SECP521R1},
{ ECP_224_BIT, TLS_SECP224R1}, { ECP_224_BIT, TLS_SECP224R1},
{ ECP_192_BIT, TLS_SECP192R1}, { ECP_192_BIT, TLS_SECP192R1},
{ CURVE_25519, TLS_CURVE25519},
{ CURVE_448, TLS_CURVE448},
}; };
CALLBACK(group_filter, bool, CALLBACK(group_filter, bool,
src/libtls/tls_crypto.h
+1 -1
View File
@@ -362,7 +362,7 @@ enum tls_named_group_t {
/* TLS 1.3: new ecdhe, dhe groups */ /* TLS 1.3: new ecdhe, dhe groups */
TLS_CURVE25519 = 29, TLS_CURVE25519 = 29,
TLS_CURVE_448 = 30, TLS_CURVE448 = 30,
TLS_FFDHE2048 = 256, TLS_FFDHE2048 = 256,
TLS_FFDHE3072 = 257, TLS_FFDHE3072 = 257,
TLS_FFDHE4096 = 258, TLS_FFDHE4096 = 258,