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

Merge pull request #3632 from SparkiDev/all_not_tls13_fix

Browse Source 
Configuration: enable all, disable TLS 1.3 - turn off TLS 1.3 only op…
This commit is contained in:
toddouska
2021-01-18 13:37:34 -08:00
committed by GitHub
parent 3bae6e2dc2 fa86c1aa91
commit 5a7e79cbfd
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@@ -628,9 +628,11 @@ if test "$ENABLED_TLS13_POST_AUTH" = "yes"
then then
if test "x$ENABLED_TLS13" = "xno" if test "x$ENABLED_TLS13" = "xno"
then then
AC_MSG_ERROR([cannot enable postauth without enabling tls13.]) AC_MSG_NOTICE([TLS 1.3 is disabled - disabling Post-handshake Authentication])
fi ENABLED_TLS13_POST_AUTH="no"
else
AM_CFLAGS="-DWOLFSSL_POST_HANDSHAKE_AUTH $AM_CFLAGS" AM_CFLAGS="-DWOLFSSL_POST_HANDSHAKE_AUTH $AM_CFLAGS"
fi
fi fi
@@ -644,9 +646,11 @@ if test "$ENABLED_SEND_HRR_COOKIE" = "yes"
then then
if test "x$ENABLED_TLS13" = "xno" if test "x$ENABLED_TLS13" = "xno"
then then
AC_MSG_ERROR([cannot enable hrrcookie without enabling tls13.]) AC_MSG_NOTICE([TLS 1.3 is disabled - disabling HRR Cookie])
fi ENABLED_SEND_HRR_COOKIE="no"
else
AM_CFLAGS="-DWOLFSSL_SEND_HRR_COOKIE $AM_CFLAGS" AM_CFLAGS="-DWOLFSSL_SEND_HRR_COOKIE $AM_CFLAGS"
fi
fi fi

2
scripts/ocsp-stapling.test
View File

@@ -408,7 +408,7 @@ openssl ciphers -tls1_3
openssl_tls13=$? openssl_tls13=$?
./examples/client/client -v 4 2>&1 | grep -- 'Bad SSL version' ./examples/client/client -v 4 2>&1 | grep -- 'Bad SSL version'
wolfssl_not_tls13=$? wolfssl_not_tls13=$?
if [ "$openssl_tls13" = "0" -a "wolfssl_not_tls13" != "0" ]; then if [ "$openssl_tls13" = "0" -a "$wolfssl_not_tls13" != "0" ]; then
printf '%s\n\n' "------------- TEST CASE 8 SHOULD PASS --------------------" printf '%s\n\n' "------------- TEST CASE 8 SHOULD PASS --------------------"
# client asks for OCSP staple but doesn't fail when none returned # client asks for OCSP staple but doesn't fail when none returned
./examples/client/client -p $port -g -v 4 -W 1 ./examples/client/client -p $port -g -v 4 -W 1

5
tests/api.c
View File

@@ -6096,7 +6096,8 @@ static int test_wolfSSL_UseOCSPStaplingV2 (void)
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
static void test_wolfSSL_mcast(void) static void test_wolfSSL_mcast(void)
{ {
#if defined(WOLFSSL_DTLS) && defined(WOLFSSL_MULTICAST) #if defined(WOLFSSL_DTLS) && defined(WOLFSSL_MULTICAST) && \
(defined(WOLFSSL_TLS13) || defined(WOLFSSL_SNIFFER))
WOLFSSL_CTX* ctx; WOLFSSL_CTX* ctx;
WOLFSSL* ssl; WOLFSSL* ssl;
int result; int result;
@@ -6130,7 +6131,7 @@ static void test_wolfSSL_mcast(void)
wolfSSL_free(ssl); wolfSSL_free(ssl);
wolfSSL_CTX_free(ctx); wolfSSL_CTX_free(ctx);
#endif /* WOLFSSL_DTLS && WOLFSSL_MULTICAST */ #endif /* WOLFSSL_DTLS && WOLFSSL_MULTICAST && (WOLFSSL_TLS13 || WOLFSSL_SNIFFER) */
} }