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

Fix for TLSX_PopulateExtensions to not use #else HAVE_QSH case for populating supported curves.

Browse Source
This commit is contained in:
David Garske
2017-01-19 09:23:07 -08:00
parent 01f4a7b5bd
commit 784ce57f45
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/tls.c
View File

@@ -4493,7 +4493,6 @@ int TLSX_PopulateExtensions(WOLFSSL* ssl, byte isServer)
/* server will add extension depending on whats parsed from client */ /* server will add extension depending on whats parsed from client */
if (!isServer) { if (!isServer) {
#ifdef HAVE_QSH #ifdef HAVE_QSH
/* test if user has set a specific scheme already */ /* test if user has set a specific scheme already */
if (!ssl->user_set_QSHSchemes) { if (!ssl->user_set_QSHSchemes) {
@@ -4564,8 +4563,9 @@ int TLSX_PopulateExtensions(WOLFSSL* ssl, byte isServer)
} }
} }
} }
#else #endif
#if defined(HAVE_ECC) && defined(HAVE_SUPPORTED_CURVES)
#if defined(HAVE_ECC) && defined(HAVE_SUPPORTED_CURVES)
if (!ssl->options.userCurves && !ssl->ctx->userCurves) { if (!ssl->options.userCurves && !ssl->ctx->userCurves) {
#if defined(HAVE_ECC160) || defined(HAVE_ALL_CURVES) #if defined(HAVE_ECC160) || defined(HAVE_ALL_CURVES)
#ifndef NO_ECC_SECP #ifndef NO_ECC_SECP
@@ -4638,8 +4638,7 @@ int TLSX_PopulateExtensions(WOLFSSL* ssl, byte isServer)
#endif #endif
#endif #endif
} }
#endif /* HAVE_ECC && HAVE_SUPPORTED_CURVES */ #endif /* HAVE_ECC && HAVE_SUPPORTED_CURVES */
#endif
} /* is not server */ } /* is not server */
(void)public_key; (void)public_key;