wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 19:24:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1915 from JacobBarthelmeh/Testing

Browse Source 
fix side init for set connect/accept functions
This commit is contained in:
David Garske
2018-11-07 09:24:44 -08:00
committed by GitHub
parent 196791390b 7a2a66743b
commit 6e4ab91ccf
1 changed files with 6 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/ssl.c
View File

@@ -11700,10 +11700,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
#if defined(OPENSSL_EXTRA) || defined(WOLFSSL_EXTRA) #if defined(OPENSSL_EXTRA) || defined(WOLFSSL_EXTRA)
void wolfSSL_set_accept_state(WOLFSSL* ssl) void wolfSSL_set_accept_state(WOLFSSL* ssl)
{ {
word16 haveRSA = 1; WOLFSSL_ENTER("wolfSSL_set_accept_state");
word16 havePSK = 0;
WOLFSSL_ENTER("SSL_set_accept_state");
if (ssl->options.side == WOLFSSL_CLIENT_END) { if (ssl->options.side == WOLFSSL_CLIENT_END) {
#ifdef HAVE_ECC #ifdef HAVE_ECC
ecc_key key; ecc_key key;
@@ -11729,19 +11726,10 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
} }
#endif #endif
} }
ssl->options.side = WOLFSSL_SERVER_END;
/* reset suites in case user switched */
#ifdef NO_RSA if (InitSSL_Side(ssl, WOLFSSL_SERVER_END) != WOLFSSL_SUCCESS) {
haveRSA = 0; WOLFSSL_MSG("Error initializing server side");
#endif }
#ifndef NO_PSK
havePSK = ssl->options.havePSK;
#endif
InitSuites(ssl->suites, ssl->version, ssl->buffers.keySz, haveRSA,
havePSK, ssl->options.haveDH, ssl->options.haveNTRU,
ssl->options.haveECDSAsig, ssl->options.haveECC,
ssl->options.haveStaticECC, ssl->options.side);
} }
#endif /* OPENSSL_EXTRA || WOLFSSL_EXTRA */ #endif /* OPENSSL_EXTRA || WOLFSSL_EXTRA */
@@ -15689,9 +15677,6 @@ int wolfSSL_ASN1_STRING_to_UTF8(unsigned char **out, WOLFSSL_ASN1_STRING *in)
void wolfSSL_set_connect_state(WOLFSSL* ssl) void wolfSSL_set_connect_state(WOLFSSL* ssl)
{ {
word16 haveRSA = 1;
word16 havePSK = 0;
if (ssl == NULL) { if (ssl == NULL) {
WOLFSSL_MSG("WOLFSSL struct pointer passed in was null"); WOLFSSL_MSG("WOLFSSL struct pointer passed in was null");
return; return;
@@ -15711,19 +15696,9 @@ void wolfSSL_set_connect_state(WOLFSSL* ssl)
ssl->buffers.serverDH_G.buffer = NULL; ssl->buffers.serverDH_G.buffer = NULL;
#endif #endif
if (ssl->options.side == WOLFSSL_SERVER_END) { if (InitSSL_Side(ssl, WOLFSSL_CLIENT_END) != WOLFSSL_SUCCESS) {
#ifdef NO_RSA WOLFSSL_MSG("Error initializing client side");
haveRSA = 0;
#endif
#ifndef NO_PSK
havePSK = ssl->options.havePSK;
#endif
InitSuites(ssl->suites, ssl->version, ssl->buffers.keySz, haveRSA,
havePSK, ssl->options.haveDH, ssl->options.haveNTRU,
ssl->options.haveECDSAsig, ssl->options.haveECC,
ssl->options.haveStaticECC, WOLFSSL_CLIENT_END);
} }
ssl->options.side = WOLFSSL_CLIENT_END;
} }
#endif /* OPENSSL_EXTRA || WOLFSSL_EXTRA */ #endif /* OPENSSL_EXTRA || WOLFSSL_EXTRA */