Disable ALPN by default
diff --git a/include/polarssl/config.h b/include/polarssl/config.h
index 78102f0..f6ea78c 100644
--- a/include/polarssl/config.h
+++ b/include/polarssl/config.h
@@ -871,7 +871,7 @@
*
* Uncomment this macro to enable support for ALPN.
*/
-#define POLARSSL_SSL_ALPN
+//#define POLARSSL_SSL_ALPN
/**
* \def POLARSSL_SSL_SESSION_TICKETS
diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index cc89bfe..916ce77 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -21,6 +21,8 @@
TESTS=0
FAILS=0
+CONFIG_H='../include/polarssl/config.h'
+
MEMCHECK=0
FILTER='.*'
EXCLUDE='SSLv2' # disabled by default, needs OpenSSL compiled with SSLv2
@@ -878,6 +880,8 @@
# Tests for ALPN extension
+if grep '^#define POLARSSL_SSL_ALPN' $CONFIG_H >/dev/null; then
+
run_test "ALPN #0 (none)" \
"$P_SRV debug_level=4" \
"$P_CLI debug_level=4" \
@@ -962,6 +966,8 @@
-C "Application Layer Protocol is 1234" \
-S "Application Layer Protocol is 1234"
+fi
+
# Final report
echo "------------------------------------------------------------------------"