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

Add SCTP testing for 11-dtls_resumption.conf 



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

test/recipes/80-test_ssl_new.t

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ my %conf_dependent_tests = ( 
  "05-sni.conf" => disabled("tls1_1"),

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

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

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

  "11-dtls_resumption.conf" => !$is_default_dtls || !disabled("sctp"),

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

  "17-renegotiate.conf" => disabled("tls1_2"),

  "18-dtls-renegotiate.conf" => disabled("dtls1_2") || !disabled("sctp"),

test/ssl-tests/protocol_version.pm

+45 −40
Original line number Diff line number Diff line
@@ -163,6 +163,8 @@ sub generate_resumption_tests { 
                $resumption_expected = "No";

            }



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

                 $sctp++) {

                foreach my $ticket ("SessionTicket", "-SessionTicket") {

                    # Client is flexible, server upgrades/downgrades.

                    push @server_tests, {
@@ -183,6 +185,7 @@ sub generate_resumption_tests { 
                            "ResumptionExpected" => $resumption_expected,

                        }

                    };

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

                    # Server is flexible, client upgrades/downgrades.

                    push @client_tests, {

                        "name" => "resumption",
@@ -203,6 +206,8 @@ sub generate_resumption_tests { 
                            "ResumptionExpected" => $resumption_expected,

                        }

                    };

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

                }

            }

        }

    }