Skip to content

Commit eaa66dc

Browse files
committed
configure.ac: in enable-all, enable QUIC only if !ENABLED_LINUXKM_DEFAULTS, and enable aesgcm_stream only if enable_aesgcm.
1 parent 748b058 commit eaa66dc

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

configure.ac

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@ then
720720
# this set is also enabled by enable-all-crypto:
721721
test "$enable_atomicuser" = "" && enable_atomicuser=yes
722722
test "$enable_aesgcm" = "" && enable_aesgcm=yes
723-
test "$enable_aesgcm_stream" = "" && enable_aesgcm_stream=yes
723+
test "$enable_aesgcm_stream" = "" && test "$enable_aesgcm" = "yes" && enable_aesgcm_stream=yes
724724
test "$enable_aesccm" = "" && enable_aesccm=yes
725725
test "$enable_aesctr" = "" && enable_aesctr=yes
726726
test "$enable_aeseax" = "" && enable_aeseax=yes
@@ -788,7 +788,6 @@ then
788788
test "$enable_session_ticket" = "" && enable_session_ticket=yes
789789
test "$enable_earlydata" = "" && enable_earlydata=yes
790790
test "$enable_ech" = "" && enable_ech=yes
791-
test "$enable_quic" = "" && enable_quic=yes
792791

793792
if test "$ENABLED_32BIT" != "yes"
794793
then
@@ -799,6 +798,7 @@ then
799798
if test "$ENABLED_LINUXKM_DEFAULTS" != "yes"
800799
then
801800
test "$enable_compkey" = "" && enable_compkey=yes
801+
test "$enable_quic" = "" && enable_quic=yes
802802
AM_CFLAGS="$AM_CFLAGS -DHAVE_CRL_IO -DHAVE_IO_TIMEOUT"
803803
fi
804804

@@ -908,7 +908,7 @@ if test "$ENABLED_ALL_CRYPT" = "yes"
908908
then
909909
test "$enable_atomicuser" = "" && enable_atomicuser=yes
910910
test "$enable_aesgcm" = "" && enable_aesgcm=yes
911-
test "$enable_aesgcm_stream" = "" && enable_aesgcm_stream=yes
911+
test "$enable_aesgcm_stream" = "" && test "$enable_aesgcm" = "yes" && enable_aesgcm_stream=yes
912912
test "$enable_aesccm" = "" && enable_aesccm=yes
913913
test "$enable_aesctr" = "" && enable_aesctr=yes
914914
test "$enable_aeseax" = "" && enable_aeseax=yes
@@ -1476,6 +1476,10 @@ then
14761476
then
14771477
AC_MSG_ERROR([TLS 1.3 is disabled - necessary for QUIC])
14781478
fi
1479+
if test "$enable_aesgcm" = "no"
1480+
then
1481+
AC_MSG_ERROR([AES-GCM is disabled - necessary for QUIC])
1482+
fi
14791483
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_QUIC"
14801484
# QUIC proto handlers need app_data at WOLFSSL*
14811485
AM_CFLAGS="$AM_CFLAGS -DHAVE_EX_DATA"

0 commit comments

Comments
 (0)