Update default configuration
Change the default settings for SSL and modify the tests accordingly.
diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index e2efae9..dcf9bb1 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -66,6 +66,13 @@
done
}
+# skip next test if the flag is not enabled in config.h
+requires_config_enabled() {
+ if grep "^#define $1" $CONFIG_H > /dev/null; then :; else
+ SKIP_NEXT="YES"
+ fi
+}
+
# skip next test if OpenSSL can't send SSLv2 ClientHello
requires_openssl_with_sslv2() {
if [ -z "${OPENSSL_HAS_SSL2:-}" ]; then
@@ -560,6 +567,7 @@
-C "using encrypt then mac" \
-S "using encrypt then mac"
+requires_config_enabled POLARSSL_SSL_PROTO_SSL3
run_test "Encrypt then MAC: client SSLv3, server enabled" \
"$P_SRV debug_level=3 min_version=ssl3 \
force_ciphersuite=TLS-RSA-WITH-AES-128-CBC-SHA" \
@@ -572,6 +580,7 @@
-C "using encrypt then mac" \
-S "using encrypt then mac"
+requires_config_enabled POLARSSL_SSL_PROTO_SSL3
run_test "Encrypt then MAC: client enabled, server SSLv3" \
"$P_SRV debug_level=3 force_version=ssl3 \
force_ciphersuite=TLS-RSA-WITH-AES-128-CBC-SHA" \
@@ -619,6 +628,7 @@
-C "using extended master secret" \
-S "using extended master secret"
+requires_config_enabled POLARSSL_SSL_PROTO_SSL3
run_test "Extended Master Secret: client SSLv3, server enabled" \
"$P_SRV debug_level=3 min_version=ssl3" \
"$P_CLI debug_level=3 force_version=ssl3" \
@@ -630,6 +640,7 @@
-C "using extended master secret" \
-S "using extended master secret"
+requires_config_enabled POLARSSL_SSL_PROTO_SSL3
run_test "Extended Master Secret: client enabled, server SSLv3" \
"$P_SRV debug_level=3 force_version=ssl3" \
"$P_CLI debug_level=3 min_version=ssl3" \
@@ -748,6 +759,7 @@
-s "Read from client: 1 bytes read" \
-s "122 bytes read"
+requires_config_enabled POLARSSL_SSL_PROTO_SSL3
run_test "CBC Record splitting: SSLv3, splitting" \
"$P_SRV min_version=ssl3" \
"$P_CLI force_ciphersuite=TLS-RSA-WITH-AES-128-CBC-SHA \
@@ -1454,6 +1466,7 @@
-c "skip write certificate verify" \
-C "! ssl_handshake returned"
+requires_config_enabled POLARSSL_SSL_PROTO_SSL3
run_test "Authentication: client no cert, ssl3" \
"$P_SRV debug_level=3 auth_mode=optional force_version=ssl3" \
"$P_CLI debug_level=3 crt_file=none key_file=none min_version=ssl3" \
@@ -2159,6 +2172,7 @@
# Tests for ciphersuites per version
+requires_config_enabled POLARSSL_SSL_PROTO_SSL3
run_test "Per-version suites: SSL3" \
"$P_SRV min_version=ssl3 version_suites=TLS-RSA-WITH-3DES-EDE-CBC-SHA,TLS-RSA-WITH-RC4-128-SHA,TLS-RSA-WITH-AES-128-CBC-SHA,TLS-RSA-WITH-AES-128-GCM-SHA256" \
"$P_CLI force_version=ssl3" \
@@ -2199,6 +2213,7 @@
# Tests for small packets
+requires_config_enabled POLARSSL_SSL_PROTO_SSL3
run_test "Small packet SSLv3 BlockCipher" \
"$P_SRV min_version=ssl3" \
"$P_CLI request_size=1 force_version=ssl3 \
@@ -2206,6 +2221,7 @@
0 \
-s "Read from client: 1 bytes read"
+requires_config_enabled POLARSSL_SSL_PROTO_SSL3
run_test "Small packet SSLv3 StreamCipher" \
"$P_SRV min_version=ssl3 arc4=1" \
"$P_CLI request_size=1 force_version=ssl3 \
@@ -2340,6 +2356,7 @@
# Test for large packets
+requires_config_enabled POLARSSL_SSL_PROTO_SSL3
run_test "Large packet SSLv3 BlockCipher" \
"$P_SRV min_version=ssl3" \
"$P_CLI request_size=16384 force_version=ssl3 recsplit=0 \
@@ -2347,6 +2364,7 @@
0 \
-s "Read from client: 16384 bytes read"
+requires_config_enabled POLARSSL_SSL_PROTO_SSL3
run_test "Large packet SSLv3 StreamCipher" \
"$P_SRV min_version=ssl3 arc4=1" \
"$P_CLI request_size=16384 force_version=ssl3 \