mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure.ac: remove enable-quic from enable-all feature set;

Browse Source 
remove ENABLED_QUIC="yes" from "$ENABLED_CURL" = "yes" setup section;
add ENABLED_CURVE25519=yes if $ENABLED_QUIC = yes;

tests/unit.c: move QuicTest() and SrpTest() before SuiteTest().
This commit is contained in:
Daniel Pouzzner 2022-08-17 14:25:38 -05:00
parent be378a346e
commit 5b260ac52e
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure.ac
View File

@ -743,7 +743,6 @@ then
if test "$ENABLED_LINUXKM_DEFAULTS" != "yes" if test "$ENABLED_LINUXKM_DEFAULTS" != "yes"
then then
test "$enable_compkey" = "" && enable_compkey=yes test "$enable_compkey" = "" && enable_compkey=yes
test "$enable_quic" = "" && enable_quic=yes
AM_CFLAGS="$AM_CFLAGS -DHAVE_CRL_IO -DHAVE_IO_TIMEOUT" AM_CFLAGS="$AM_CFLAGS -DHAVE_CRL_IO -DHAVE_IO_TIMEOUT"
fi fi
@ -2927,6 +2926,10 @@ AC_ARG_ENABLE([curve25519],
[ ENABLED_CURVE25519=no ] [ ENABLED_CURVE25519=no ]
) )
if test "$ENABLED_QUIC" = "yes" && test "$ENABLED_CURVE25519" = "no"
then
ENABLED_CURVE25519=yes
fi
if test "$ENABLED_OPENSSH" = "yes" && test "x$ENABLED_FIPS" = "xno" if test "$ENABLED_OPENSSH" = "yes" && test "x$ENABLED_FIPS" = "xno"
then then
@ -5709,12 +5712,6 @@ then
# FTPS server requires pointer to session cache # FTPS server requires pointer to session cache
AM_CFLAGS="$AM_CFLAGS -DNO_SESSION_CACHE_REF" AM_CFLAGS="$AM_CFLAGS -DNO_SESSION_CACHE_REF"
if test "x$ENABLED_QUIC" = "xno"
then
ENABLED_QUIC="yes"
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_QUIC"
fi
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_DES_ECB" AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_DES_ECB"
fi fi

18
tests/unit.c
View File

@ -174,6 +174,15 @@ int unit_test(int argc, char** argv)
} }
#ifdef WOLFSSL_QUIC
if ( (ret = QuicTest()) != 0){
printf("quic test failed with %d\n", ret);
goto exit;
}
#endif
SrpTest();
#ifndef NO_WOLFSSL_CIPHER_SUITE_TEST #ifndef NO_WOLFSSL_CIPHER_SUITE_TEST
#if !defined(NO_WOLFSSL_CLIENT) && !defined(NO_WOLFSSL_SERVER) #if !defined(NO_WOLFSSL_CLIENT) && !defined(NO_WOLFSSL_SERVER)
#ifndef SINGLE_THREADED #ifndef SINGLE_THREADED
@ -185,15 +194,6 @@ int unit_test(int argc, char** argv)
#endif #endif
#endif /* NO_WOLFSSL_CIPHER_SUITE_TEST */ #endif /* NO_WOLFSSL_CIPHER_SUITE_TEST */
#ifdef WOLFSSL_QUIC
if ( (ret = QuicTest()) != 0){
printf("quic test failed with %d\n", ret);
goto exit;
}
#endif
SrpTest();
exit: exit:
#ifdef HAVE_WNR #ifdef HAVE_WNR
if (wc_FreeNetRandom() < 0) if (wc_FreeNetRandom() < 0)