feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #2977 from SparkiDev/tlsx_ks_ecc_fix

Browse Source 
KeyShare ECC shift index range check
This commit is contained in:
toddouska
2020-05-19 15:49:41 -07:00
committed by GitHub
parent 754c96965a 5b918f7ace
commit 7901f74d0b
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/tls.c
View File

@@ -8131,13 +8131,17 @@ int TLSX_KeyShare_Establish(WOLFSSL *ssl)
if (!TLSX_SupportedGroups_Find(ssl, clientKSE->group)) if (!TLSX_SupportedGroups_Find(ssl, clientKSE->group))
return BAD_KEY_SHARE_DATA; return BAD_KEY_SHARE_DATA;
#ifdef OPENSSL_EXTRA
if ((clientKSE->group & NAMED_DH_MASK) == 0) { if ((clientKSE->group & NAMED_DH_MASK) == 0) {
/* Check if server supports group. */ /* Check max value supported. */
if (ssl->ctx->disabledCurves & (1 << clientKSE->group)) if (clientKSE->group > WOLFSSL_ECC_MAX) {
continue; continue;
}
#ifdef OPENSSL_EXTRA
/* Check if server supports group. */
if (ssl->ctx->disabledCurves & ((word32)1 << clientKSE->group))
continue;
#endif
} }
#endif
if (!TLSX_KeyShare_IsSupported(clientKSE->group)) if (!TLSX_KeyShare_IsSupported(clientKSE->group))
continue; continue;

1
wolfssl/ssl.h
View File

@@ -3032,6 +3032,7 @@ enum {
WOLFSSL_ECC_BRAINPOOLP512R1 = 28, WOLFSSL_ECC_BRAINPOOLP512R1 = 28,
WOLFSSL_ECC_X25519 = 29, WOLFSSL_ECC_X25519 = 29,
WOLFSSL_ECC_X448 = 30, WOLFSSL_ECC_X448 = 30,
WOLFSSL_ECC_MAX = 30,
WOLFSSL_FFDHE_2048 = 256, WOLFSSL_FFDHE_2048 = 256,
WOLFSSL_FFDHE_3072 = 257, WOLFSSL_FFDHE_3072 = 257,