summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2017-01-12 09:48:38 +0000
committerMatt Caswell <matt@openssl.org>2017-01-12 11:15:12 +0000
commit928933f92fa214fb8b4f9bbcd242ad2c3d16d46f (patch)
treee29618c4b404f50e19800251fafbfcebd7f22a50
parente3bc1305ec97d4ad4ab05fa59a288e92df2b2025 (diff)
Fix no-dh builds
One of the new tests uses a DH based ciphersuite. That test should be disabled if DH is disabled. Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2217)
-rwxr-xr-xtest/recipes/70-test_sslsignature.t21
1 files changed, 13 insertions, 8 deletions
diff --git a/test/recipes/70-test_sslsignature.t b/test/recipes/70-test_sslsignature.t
index 732e17eb6f..7892823406 100755
--- a/test/recipes/70-test_sslsignature.t
+++ b/test/recipes/70-test_sslsignature.t
@@ -93,14 +93,19 @@ SKIP: {
$proxy->start();
ok(TLSProxy::Message->fail, "Corrupt <=TLSv1.2 CertVerify");
- #Test 4: Corrupting a ServerKeyExchange signature in <=TLSv1.2 should fail
- $proxy->clear();
- $testtype = CORRUPT_TLS1_2_SERVER_KEY_EXCHANGE;
- $proxy->clientflags("-no_tls1_3");
- $proxy->cipherc('DHE-RSA-AES128-SHA');
- $proxy->ciphers('DHE-RSA-AES128-SHA');
- $proxy->start();
- ok(TLSProxy::Message->fail, "Corrupt <=TLSv1.2 ServerKeyExchange");
+ SKIP: {
+ skip "DH disabled", 1 if disabled("dh");
+
+ #Test 4: Corrupting a ServerKeyExchange signature in <=TLSv1.2 should
+ #fail
+ $proxy->clear();
+ $testtype = CORRUPT_TLS1_2_SERVER_KEY_EXCHANGE;
+ $proxy->clientflags("-no_tls1_3");
+ $proxy->cipherc('DHE-RSA-AES128-SHA');
+ $proxy->ciphers('DHE-RSA-AES128-SHA');
+ $proxy->start();
+ ok(TLSProxy::Message->fail, "Corrupt <=TLSv1.2 ServerKeyExchange");
+ }
}
sub signature_filter