Merge pull request #4202 from JacobBarthelmeh/BuildOptions

fix for build with wpas and disable tls13
This commit is contained in:
John Safranek
2021-07-14 09:07:08 -07:00
committed by GitHub
2 changed files with 4 additions and 1 deletions

View File

@@ -231,8 +231,10 @@ static int SSL_hmac(WOLFSSL* ssl, byte* digest, const byte* in, word32 sz,
static int SessionSecret_callback(WOLFSSL* ssl, void* secret, static int SessionSecret_callback(WOLFSSL* ssl, void* secret,
int* secretSz, void* ctx); int* secretSz, void* ctx);
#ifdef WOLFSSL_TLS13
static int SessionSecret_callback_Tls13(WOLFSSL* ssl, int id, static int SessionSecret_callback_Tls13(WOLFSSL* ssl, int id,
const unsigned char* secret, int secretSz, void* ctx); const unsigned char* secret, int secretSz, void* ctx);
#endif
/* /*
* This function builds up string for key-logging then call user's * This function builds up string for key-logging then call user's

View File

@@ -30669,7 +30669,8 @@ static void test_wolfSSL_Tls12_Key_Logging_test(void)
} }
static void test_wolfSSL_Tls13_Key_Logging_test(void) static void test_wolfSSL_Tls13_Key_Logging_test(void)
{ {
#if defined(OPENSSL_EXTRA) && defined(HAVE_SECRET_CALLBACK) #if defined(WOLFSSL_TLS13) && defined(OPENSSL_EXTRA) && \
defined(HAVE_SECRET_CALLBACK)
/* This test is intended for checking whether keylog callback is called /* This test is intended for checking whether keylog callback is called
* in client during TLS handshake between the client and a server. * in client during TLS handshake between the client and a server.
*/ */