diff options
| author | Matt Caswell <matt@openssl.org> | 2017-04-24 13:58:07 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-04-25 11:13:39 +0100 |
| commit | ce466c96f0eb14e5c35181e54e52164de1afe921 (patch) | |
| tree | 4e651367d1ed9b92f50be24964e5562ffbd9877d | |
| parent | e829142846467b4815d96fe9198e73d5e4d9bbf1 (diff) | |
| download | openssl-ce466c96f0eb14e5c35181e54e52164de1afe921.tar.gz | |
Fix issue in 18-dtls-renegotiate.conf.in
Don't skip all tests if SCTP is disabled!
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3286)
| -rw-r--r-- | test/ssl-tests/18-dtls-renegotiate.conf | 9 | ||||
| -rw-r--r-- | test/ssl-tests/18-dtls-renegotiate.conf.in | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/test/ssl-tests/18-dtls-renegotiate.conf b/test/ssl-tests/18-dtls-renegotiate.conf index 3d8ebd74c4..9204dd2c5d 100644 --- a/test/ssl-tests/18-dtls-renegotiate.conf +++ b/test/ssl-tests/18-dtls-renegotiate.conf @@ -36,6 +36,7 @@ ExpectedResult = Success HandshakeMode = RenegotiateClient Method = DTLS ResumptionExpected = No +UseSCTP = No # =========================================================== @@ -62,6 +63,7 @@ ExpectedResult = Success HandshakeMode = RenegotiateClient Method = DTLS ResumptionExpected = Yes +UseSCTP = No # =========================================================== @@ -88,6 +90,7 @@ ExpectedResult = Success HandshakeMode = RenegotiateServer Method = DTLS ResumptionExpected = No +UseSCTP = No # =========================================================== @@ -118,6 +121,7 @@ ExpectedResult = Success HandshakeMode = RenegotiateServer Method = DTLS ResumptionExpected = No +UseSCTP = No # =========================================================== @@ -148,6 +152,7 @@ ExpectedResult = Success HandshakeMode = RenegotiateServer Method = DTLS ResumptionExpected = No +UseSCTP = No # =========================================================== @@ -175,6 +180,7 @@ ExpectedResult = Success HandshakeMode = RenegotiateClient Method = DTLS ResumptionExpected = No +UseSCTP = No client = 5-renegotiate-aead-to-non-aead-client-extra [5-renegotiate-aead-to-non-aead-client-extra] @@ -206,6 +212,7 @@ ExpectedResult = Success HandshakeMode = RenegotiateClient Method = DTLS ResumptionExpected = No +UseSCTP = No client = 6-renegotiate-non-aead-to-aead-client-extra [6-renegotiate-non-aead-to-aead-client-extra] @@ -237,6 +244,7 @@ ExpectedResult = Success HandshakeMode = RenegotiateClient Method = DTLS ResumptionExpected = No +UseSCTP = No client = 7-renegotiate-non-aead-to-non-aead-client-extra [7-renegotiate-non-aead-to-non-aead-client-extra] @@ -268,6 +276,7 @@ ExpectedResult = Success HandshakeMode = RenegotiateClient Method = DTLS ResumptionExpected = No +UseSCTP = No client = 8-renegotiate-aead-to-aead-client-extra [8-renegotiate-aead-to-aead-client-extra] diff --git a/test/ssl-tests/18-dtls-renegotiate.conf.in b/test/ssl-tests/18-dtls-renegotiate.conf.in index 82935ccad8..467d6f26c9 100644 --- a/test/ssl-tests/18-dtls-renegotiate.conf.in +++ b/test/ssl-tests/18-dtls-renegotiate.conf.in @@ -19,7 +19,7 @@ our @tests = (); foreach my $sctp ("No", "Yes") { - next if disabled("sctp"); + next if disabled("sctp") && $sctp eq "Yes"; my $suffix = ($sctp eq "No") ? "" : "-sctp"; our @tests_basic = ( |