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

Don't expect a POLY1305 ciphersuite when using no-poly1305 



Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4891)
parent 3b69eb30

test/recipes/80-test_ssl_new.t

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ my %conf_dependent_tests = ( 
  "19-mac-then-encrypt.conf" => !$is_default_tls,

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

  "22-compression.conf" => !$is_default_tls,

  "25-cipher.conf" => disabled("poly1305"),

);



# Add your test here if it should be skipped for some compile-time

test/ssl-tests/25-cipher.conf

+4 −4
Original line number Diff line number Diff line
@@ -207,13 +207,13 @@ Options = ServerPreference,PrioritizeChaCha 
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem



[7-cipher-server-pref-mobile-client]

CipherString = ECDHE-RSA-CHACHA20-POLY1305:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384

CipherString = ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-CHACHA20-POLY1305

MaxProtocol = TLSv1.2

VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem

VerifyMode = Peer



[test-7]

ExpectedCipher = ECDHE-RSA-CHACHA20-POLY1305

ExpectedCipher = ECDHE-RSA-AES256-SHA384





# ===========================================================
@@ -233,12 +233,12 @@ Options = ServerPreference,PrioritizeChaCha 
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem



[8-cipher-server-pref-mobile2-client]

CipherString = ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-CHACHA20-POLY1305

CipherString = ECDHE-RSA-CHACHA20-POLY1305:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384

MaxProtocol = TLSv1.2

VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem

VerifyMode = Peer



[test-8]

ExpectedCipher = ECDHE-RSA-AES256-SHA384

ExpectedCipher = ECDHE-RSA-CHACHA20-POLY1305

test/ssl-tests/25-cipher.conf.in

+10 −5
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ use strict; 
use warnings;



package ssltests;



use OpenSSL::Test::Utils;



our @tests = (

    {
@@ -127,12 +127,15 @@ our @tests = ( 
        },

        client => {

            "MaxProtocol" => "TLSv1.2",

            "CipherString" => "ECDHE-RSA-CHACHA20-POLY1305:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384",

            "CipherString" => "ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-CHACHA20-POLY1305",

        },

        test => {

            "ExpectedCipher" => "ECDHE-RSA-CHACHA20-POLY1305",

            "ExpectedCipher" => "ECDHE-RSA-AES256-SHA384",

        },

    },

);



my @tests_poly1305 = (

    {

        name => "cipher-server-pref-mobile2",

        server => {
@@ -142,10 +145,12 @@ our @tests = ( 
        },

        client => {

            "MaxProtocol" => "TLSv1.2",

            "CipherString" => "ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-CHACHA20-POLY1305",

            "CipherString" => "ECDHE-RSA-CHACHA20-POLY1305:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384",

        },

        test => {

            "ExpectedCipher" => "ECDHE-RSA-AES256-SHA384",

            "ExpectedCipher" => "ECDHE-RSA-CHACHA20-POLY1305",

        },

    },

);



push @tests, @tests_poly1305 unless disabled("poly1305");