Merge pull request #9404 from cconlon/jniNoQuicEch

Fixes for "--enable-jni --enable-all" with WOLFSSL_TLS13_MIDDLEBOX_COMPAT

Author: dgarske

configure.ac

@@ -1087,7 +1087,8 @@ then
 
     if test "$ENABLED_LINUXKM_DEFAULTS" != "yes"
     then
-        test "$enable_quic" = "" && test "$enable_cryptonly" != "yes" && enable_quic=yes
+        # Disable QUIC with JNI since incompatible with WOLFSSL_TLS13_MIDDLEBOX_COMPAT
+        test "$enable_quic" = "" && test "$enable_cryptonly" != "yes" && test "$enable_jni" != "yes" && enable_quic=yes
         AM_CFLAGS="$AM_CFLAGS -DHAVE_CRL_IO -DHAVE_IO_TIMEOUT"
     fi
 
@@ -1104,7 +1105,8 @@ then
 
     if test "$ENABLED_FIPS" = "no"
     then
-        test "$enable_ech" = "" && enable_ech=yes
+        # Disable ECH with JNI since incompatible with WOLFSSL_TLS13_MIDDLEBOX_COMPAT
+        test "$enable_ech" = "" && test "$enable_jni" != "yes" && enable_ech=yes
         test "$enable_scep" = "" && enable_scep=yes
         test "$enable_mcast" = "" && enable_mcast=yes
     fi

tests/api/test_tls13.c

@@ -2232,7 +2232,8 @@ int test_tls13_hrr_different_cs(void)
     defined(WOLFSSL_TLS13) && \
     defined(BUILD_TLS_AES_256_GCM_SHA384) && \
     defined(BUILD_TLS_CHACHA20_POLY1305_SHA256) && \
-    defined(HAVE_ECC) && defined(HAVE_ECC384)
+    defined(HAVE_ECC) && defined(HAVE_ECC384) && \
+    !defined(WOLFSSL_TLS13_MIDDLEBOX_COMPAT)
     /*
      * TLSv1.3 Record Layer: Handshake Protocol: Hello Retry Request
      *     Content Type: Handshake (22)