From 83d8c73c91344b0487983b2b1b9d9b141579a347 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= <mpg@elzevir.fr>
Date: Mon, 7 Apr 2014 13:24:21 +0200
Subject: [PATCH] Disable ALPN by default

---
 include/polarssl/config.h | 2 +-
 tests/ssl-opt.sh          | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/include/polarssl/config.h b/include/polarssl/config.h
index 78102f0a8..f6ea78cdd 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 cc89bfe46..916ce77ec 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -21,6 +21,8 @@ O_CLI="echo 'GET / HTTP/1.0' | $OPENSSL_CMD s_client"
 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 @@ run_test    "Version check #8 (srv min 1.2, cli max 1.1 -> fail)" \
 
 # 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 @@ run_test    "ALPN #6 (both, no common)" \
             -C "Application Layer Protocol is 1234" \
             -S "Application Layer Protocol is 1234"
 
+fi
+
 # Final report
 
 echo "------------------------------------------------------------------------"