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

[openssl.git] / test / ssl-tests / 25-cipher.conf.in

diff --git a/test/ssl-tests/25-cipher.conf.in b/test/ssl-tests/25-cipher.conf.in
index c4b0b0509a0b869f47ed9206f0ced49439d002e6..d75e2741209084e1ba4b5792233afabe75d9a840 100644 (file)
--- a/test/ssl-tests/25-cipher.conf.in
+++ b/test/ssl-tests/25-cipher.conf.in
@@ -13,18 +13,18 @@ use strict;
 use warnings;
 
 package ssltests;
-
+use OpenSSL::Test::Utils;
 
 our @tests = (
     {
         name => "cipher-server-1",
         server => {
-           "MaxProtocol" => "TLSv1.2",
-           "CipherString" => "ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256",
-       },
+            "MaxProtocol" => "TLSv1.2",
+            "CipherString" => "ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256",
+    },
         client => {
-           "MaxProtocol" => "TLSv1.2",
-           "CipherString" => "ECDHE-RSA-AES256-SHA384"
+            "MaxProtocol" => "TLSv1.2",
+            "CipherString" => "ECDHE-RSA-AES256-SHA384"
         },
         test => {
             "ExpectedCipher" => "ECDHE-RSA-AES256-SHA384",
@@ -33,12 +33,12 @@ our @tests = (
     {
         name => "cipher-server-2",
         server => {
-           "MaxProtocol" => "TLSv1.2",
-           "CipherString" => "ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256",
-       },
+            "MaxProtocol" => "TLSv1.2",
+            "CipherString" => "ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256",
+        },
         client => {
-           "MaxProtocol" => "TLSv1.2",
-           "CipherString" => "ECDHE-RSA-AES128-SHA256"
+            "MaxProtocol" => "TLSv1.2",
+            "CipherString" => "ECDHE-RSA-AES128-SHA256"
         },
         test => {
             "ExpectedCipher" => "ECDHE-RSA-AES128-SHA256",
@@ -47,12 +47,12 @@ our @tests = (
     {
         name => "cipher-server-client-list",
         server => {
-           "MaxProtocol" => "TLSv1.2",
-           "CipherString" => "ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256",
-       },
+            "MaxProtocol" => "TLSv1.2",
+            "CipherString" => "ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256",
+        },
         client => {
-           "MaxProtocol" => "TLSv1.2",
-           "CipherString" => "ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384",
+            "MaxProtocol" => "TLSv1.2",
+            "CipherString" => "ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384",
         },
         test => {
             "ExpectedCipher" => "ECDHE-RSA-AES128-SHA256",
@@ -61,13 +61,13 @@ our @tests = (
     {
         name => "cipher-server-pref-1",
         server => {
-           "MaxProtocol" => "TLSv1.2",
-           "CipherString" => "ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256",
-           "Options" => "ServerPreference",
-       },
+            "MaxProtocol" => "TLSv1.2",
+            "CipherString" => "ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256",
+            "Options" => "ServerPreference",
+        },
         client => {
-           "MaxProtocol" => "TLSv1.2",
-           "CipherString" => "ECDHE-RSA-AES256-SHA384"
+            "MaxProtocol" => "TLSv1.2",
+            "CipherString" => "ECDHE-RSA-AES256-SHA384"
         },
         test => {
             "ExpectedCipher" => "ECDHE-RSA-AES256-SHA384",
@@ -76,13 +76,13 @@ our @tests = (
     {
         name => "cipher-server-pref-2",
         server => {
-           "MaxProtocol" => "TLSv1.2",
-           "CipherString" => "ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256",
-           "Options" => "ServerPreference",
-       },
+            "MaxProtocol" => "TLSv1.2",
+            "CipherString" => "ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256",
+            "Options" => "ServerPreference",
+        },
         client => {
-           "MaxProtocol" => "TLSv1.2",
-           "CipherString" => "ECDHE-RSA-AES128-SHA256"
+            "MaxProtocol" => "TLSv1.2",
+            "CipherString" => "ECDHE-RSA-AES128-SHA256"
         },
         test => {
             "ExpectedCipher" => "ECDHE-RSA-AES128-SHA256",
@@ -91,13 +91,13 @@ our @tests = (
     {
         name => "cipher-server-pref-client-list",
         server => {
-           "MaxProtocol" => "TLSv1.2",
-           "CipherString" => "ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256",
-           "Options" => "ServerPreference",
-       },
+            "MaxProtocol" => "TLSv1.2",
+            "CipherString" => "ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256",
+            "Options" => "ServerPreference",
+        },
         client => {
-           "MaxProtocol" => "TLSv1.2",
-           "CipherString" => "ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384",
+            "MaxProtocol" => "TLSv1.2",
+            "CipherString" => "ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384",
         },
         test => {
             "ExpectedCipher" => "ECDHE-RSA-AES256-SHA384",
@@ -106,13 +106,13 @@ our @tests = (
     {
         name => "cipher-server-pref-not-mobile",
         server => {
-           "MaxProtocol" => "TLSv1.2",
-           "CipherString" => "ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-CHACHA20-POLY1305",
-           "Options" => "ServerPreference",
-       },
+            "MaxProtocol" => "TLSv1.2",
+            "CipherString" => "ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-CHACHA20-POLY1305",
+            "Options" => "ServerPreference",
+        },
         client => {
-           "MaxProtocol" => "TLSv1.2",
-           "CipherString" => "ECDHE-RSA-CHACHA20-POLY1305:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384",
+            "MaxProtocol" => "TLSv1.2",
+            "CipherString" => "ECDHE-RSA-CHACHA20-POLY1305:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384",
         },
         test => {
             "ExpectedCipher" => "ECDHE-RSA-AES256-SHA384",
@@ -121,31 +121,36 @@ our @tests = (
     {
         name => "cipher-server-pref-mobile",
         server => {
-           "MaxProtocol" => "TLSv1.2",
-           "CipherString" => "ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-CHACHA20-POLY1305",
-           "Options" => "ServerPreference,PrioritizeChaCha",
-       },
+            "MaxProtocol" => "TLSv1.2",
+            "CipherString" => "ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-CHACHA20-POLY1305",
+            "Options" => "ServerPreference,PrioritizeChaCha",
+        },
         client => {
-           "MaxProtocol" => "TLSv1.2",
-           "CipherString" => "ECDHE-RSA-CHACHA20-POLY1305:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384",
+            "MaxProtocol" => "TLSv1.2",
+            "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 => {
-           "MaxProtocol" => "TLSv1.2",
-           "CipherString" => "ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-CHACHA20-POLY1305",
-           "Options" => "ServerPreference,PrioritizeChaCha",
-       },
+            "MaxProtocol" => "TLSv1.2",
+            "CipherString" => "ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-CHACHA20-POLY1305",
+            "Options" => "ServerPreference,PrioritizeChaCha",
+        },
         client => {
-           "MaxProtocol" => "TLSv1.2",
-           "CipherString" => "ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-CHACHA20-POLY1305",
+            "MaxProtocol" => "TLSv1.2",
+            "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");