Commit 00da4f4d authored by Matt Caswell's avatar Matt Caswell
Browse files

Add SCTP testing to 07-dtls-protocol-version.conf 



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

test/recipes/80-test_ssl_new.t

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ my %conf_dependent_tests = ( 
  "02-protocol-version.conf" => !$is_default_tls,

  "04-client_auth.conf" => !$is_default_tls || !$is_default_dtls,

  "05-sni.conf" => disabled("tls1_1"),

  "07-dtls-protocol-version.conf" => !$is_default_dtls,

  "07-dtls-protocol-version.conf" => !$is_default_dtls || !disabled("sctp"),

  "10-resumption.conf" => !$is_default_tls,

  "11-dtls_resumption.conf" => !$is_default_dtls,

  "16-dtls-certstatus.conf" => !$is_default_dtls || !disabled("sctp"),

test/ssl-tests/protocol_version.pm

+29 −25
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ sub generate_version_tests { 


    my @tests = ();



    for (my $sctp = 0; $sctp < ($dtls && !disabled("sctp") ? 2 : 1); $sctp++) {

        foreach my $c_min (0..$#min_protocols) {

            my $c_max_min = $c_min == 0 ? 0 : $c_min - 1;

            foreach my $c_max ($c_max_min..$#max_protocols) {
@@ -104,7 +105,8 @@ sub generate_version_tests { 
                    foreach my $s_max ($s_max_min..$#max_protocols) {

                        my ($result, $protocol) =

                            expected_result($c_min, $c_max, $s_min, $s_max,

                                        $min_enabled, $max_enabled, \@protocols);

                                            $min_enabled, $max_enabled,

                                            \@protocols);

                        push @tests, {

                            "name" => "version-negotiation",

                            "client" => {
@@ -121,6 +123,8 @@ sub generate_version_tests { 
                                "Method" => $method,

                            }

                        };

                        $tests[-1]{"test"}{"UseSCTP"} = "Yes" if $sctp;

                    }

                }

            }

        }