Commit ce466c96 authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix issue in 18-dtls-renegotiate.conf.in 



Don't skip all tests if SCTP is disabled!

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3286)
parent e8291428

test/ssl-tests/18-dtls-renegotiate.conf

+9 −0
Original line number Diff line number Diff line
@@ -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]

test/ssl-tests/18-dtls-renegotiate.conf.in

+1 −1
Original line number Diff line number Diff line
@@ -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 = (