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

Fix test_ssl_new when compiled with no-tls1_2 or no-dtls1_2 



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

test/recipes/80-test_ssl_new.t

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ my %conf_dependent_tests = ( 
  "07-dtls-protocol-version.conf" => !$is_default_dtls,

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

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

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

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

  "19-mac-then-encrypt.conf" => !$is_default_tls,

  "20-cert-select.conf" => !$is_default_tls || $no_dh || $no_dsa,

);

test/ssl-tests/17-renegotiate.conf.in

+7 −2
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ use strict; 
use warnings;



package ssltests;

use OpenSSL::Test::Utils;



our @tests = (

    {
@@ -106,7 +107,9 @@ our @tests = ( 
            "ResumptionExpected" => "No",

            "ExpectedResult" => "Success"

        }

    },

    }

);

our @tests_tls1_2 = (

    {

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

        server => {
@@ -182,5 +185,7 @@ our @tests = ( 
            "ResumptionExpected" => "No",

            "ExpectedResult" => "Success"

        }

    },

    }

);



push @tests, @tests_tls1_2 unless disabled("tls1_2");

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

+7 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ use strict; 
use warnings;



package ssltests;

use OpenSSL::Test::Utils;



our @tests = (

    {
@@ -92,7 +93,9 @@ our @tests = ( 
            "ResumptionExpected" => "No",

            "ExpectedResult" => "Success"

        }

    },

    }

);

our @tests_dtls1_2 = (

    {

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

        server => {
@@ -166,3 +169,6 @@ our @tests = ( 
        }

    },

);





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