Commit 4ef8a6b2 authored by Matt Caswell's avatar Matt Caswell
Browse files

Add SCTP testing to 18-dtls-renegotiate.conf 



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

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

+162 −144
Original line number Diff line number Diff line
@@ -15,26 +15,35 @@ use warnings; 
package ssltests;

use OpenSSL::Test::Utils;



our @tests = (

our @tests = ();



foreach my $sctp ("No", "Yes")

{

    next if disabled("sctp");



    my $suffix = ($sctp eq "No") ? "" : "-sctp";

    our @tests_basic = (

        {

        name => "renegotiate-client-no-resume",

            name => "renegotiate-client-no-resume".$suffix,

            server => {

                "Options" => "NoResumptionOnRenegotiation"

            },

            client => {},

            test => {

                "Method" => "DTLS",

                "UseSCTP" => $sctp,

                "HandshakeMode" => "RenegotiateClient",

                "ResumptionExpected" => "No",

                "ExpectedResult" => "Success"

            }

        },

        {

        name => "renegotiate-client-resume",

            name => "renegotiate-client-resume".$suffix,

            server => {},

            client => {},

            test => {

                "Method" => "DTLS",

                "UseSCTP" => $sctp,

                "HandshakeMode" => "RenegotiateClient",

                "ResumptionExpected" => "Yes",

                "ExpectedResult" => "Success"
@@ -50,18 +59,19 @@ our @tests = ( 
        # discrepancy is strange. TODO: Should we harmonise the TLS and DTLS behaviour,

        # and if so, what to?

        {

        name => "renegotiate-server-resume",

            name => "renegotiate-server-resume".$suffix,

            server => {},

            client => {},

            test => {

                "Method" => "DTLS",

                "UseSCTP" => $sctp,

                "HandshakeMode" => "RenegotiateServer",

                "ResumptionExpected" => "No",

                "ExpectedResult" => "Success"

            }

        },

        {

        name => "renegotiate-client-auth-require",

            name => "renegotiate-client-auth-require".$suffix,

            server => {

                "VerifyCAFile" => test_pem("root-cert.pem"),

                "VerifyMode" => "Require",
@@ -72,13 +82,14 @@ our @tests = ( 
            },

            test => {

                "Method" => "DTLS",

                "UseSCTP" => $sctp,

                "HandshakeMode" => "RenegotiateServer",

                "ResumptionExpected" => "No",

                "ExpectedResult" => "Success"

            }

        },

        {

        name => "renegotiate-client-auth-once",

            name => "renegotiate-client-auth-once".$suffix,

            server => {

                "VerifyCAFile" => test_pem("root-cert.pem"),

                "VerifyMode" => "Once",
@@ -89,15 +100,19 @@ our @tests = ( 
            },

            test => {

                "Method" => "DTLS",

                "UseSCTP" => $sctp,

                "HandshakeMode" => "RenegotiateServer",

                "ResumptionExpected" => "No",

                "ExpectedResult" => "Success"

            }

        }

    );

    push @tests, @tests_basic;



    next if disabled("dtls1_2");

    our @tests_dtls1_2 = (

        {

        name => "renegotiate-aead-to-non-aead",

            name => "renegotiate-aead-to-non-aead".$suffix,

            server => {

                "Options" => "NoResumptionOnRenegotiation"

            },
@@ -109,13 +124,14 @@ our @tests_dtls1_2 = ( 
            },

            test => {

                "Method" => "DTLS",

                "UseSCTP" => $sctp,

                "HandshakeMode" => "RenegotiateClient",

                "ResumptionExpected" => "No",

                "ExpectedResult" => "Success"

            }

        },

        {

        name => "renegotiate-non-aead-to-aead",

            name => "renegotiate-non-aead-to-aead".$suffix,

            server => {

                "Options" => "NoResumptionOnRenegotiation"

            },
@@ -127,13 +143,14 @@ our @tests_dtls1_2 = ( 
            },

            test => {

                "Method" => "DTLS",

                "UseSCTP" => $sctp,

                "HandshakeMode" => "RenegotiateClient",

                "ResumptionExpected" => "No",

                "ExpectedResult" => "Success"

            }

        },

        {

        name => "renegotiate-non-aead-to-non-aead",

            name => "renegotiate-non-aead-to-non-aead".$suffix,

            server => {

                "Options" => "NoResumptionOnRenegotiation"

            },
@@ -145,13 +162,14 @@ our @tests_dtls1_2 = ( 
            },

            test => {

                "Method" => "DTLS",

                "UseSCTP" => $sctp,

                "HandshakeMode" => "RenegotiateClient",

                "ResumptionExpected" => "No",

                "ExpectedResult" => "Success"

            }

        },

        {

        name => "renegotiate-aead-to-aead",

            name => "renegotiate-aead-to-aead".$suffix,

            server => {

                "Options" => "NoResumptionOnRenegotiation"

            },
@@ -163,12 +181,12 @@ our @tests_dtls1_2 = ( 
            },

            test => {

                "Method" => "DTLS",

                "UseSCTP" => $sctp,

                "HandshakeMode" => "RenegotiateClient",

                "ResumptionExpected" => "No",

                "ExpectedResult" => "Success"

            }

        },

    );





push @tests, @tests_dtls1_2 unless disabled("dtls1_2");
 
    push @tests, @tests_dtls1_2;

}