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

Merge pull request #2797 from kaleb-himes/JENKINS_STUFF

Browse Source 
--disable-supportedcurves --enable-opensslextra - NIGHTLY DISABLE OPT…
This commit is contained in:
David Garske
2020-02-14 09:01:03 -08:00
committed by GitHub
parent b62064f6a8 bb7508f570
commit 8f6a614d17
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ssl.c
View File

@ -2307,8 +2307,7 @@ int wolfSSL_CTX_UseOCSPStaplingV2(WOLFSSL_CTX* ctx, byte status_type,
#endif /* HAVE_CERTIFICATE_STATUS_REQUEST_V2 */ #endif /* HAVE_CERTIFICATE_STATUS_REQUEST_V2 */
/* Elliptic Curves */ /* Elliptic Curves */
#ifdef HAVE_SUPPORTED_CURVES #if defined(HAVE_SUPPORTED_CURVES) && !defined(NO_WOLFSSL_CLIENT)
#ifndef NO_WOLFSSL_CLIENT
int wolfSSL_UseSupportedCurve(WOLFSSL* ssl, word16 name) int wolfSSL_UseSupportedCurve(WOLFSSL* ssl, word16 name)
{ {
@ -2386,8 +2385,7 @@ int wolfSSL_CTX_UseSupportedCurve(WOLFSSL_CTX* ctx, word16 name)
return TLSX_UseSupportedCurve(&ctx->extensions, name, ctx->heap); return TLSX_UseSupportedCurve(&ctx->extensions, name, ctx->heap);
} }
#endif /* NO_WOLFSSL_CLIENT */ #endif /* HAVE_SUPPORTED_CURVES && !NO_WOLFSSL_CLIENT */
#endif /* HAVE_SUPPORTED_CURVES */
/* QSH quantum safe handshake */ /* QSH quantum safe handshake */
#ifdef HAVE_QSH #ifdef HAVE_QSH
@ -44552,7 +44550,7 @@ int wolfSSL_CTX_set1_curves_list(WOLFSSL_CTX* ctx, const char* names)
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
#ifndef NO_WOLFSSL_CLIENT #if defined(HAVE_SUPPORTED_CURVES) && !defined(NO_WOLFSSL_CLIENT)
/* set the supported curve so client TLS extension contains only the /* set the supported curve so client TLS extension contains only the
* desired curves */ * desired curves */
if (wolfSSL_CTX_UseSupportedCurve(ctx, curve) != WOLFSSL_SUCCESS) { if (wolfSSL_CTX_UseSupportedCurve(ctx, curve) != WOLFSSL_SUCCESS) {