projects / oweals / openssl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b7ab4ee)
Replace tabs with spaces in 25-cipher.conf.in
authorMatt Caswell <matt@openssl.org>
Sun, 10 Dec 2017 11:01:00 +0000 (11:01 +0000)
committerMatt Caswell <matt@openssl.org>
Mon, 11 Dec 2017 09:41:59 +0000 (09:41 +0000)
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4891)

test/ssl-tests/25-cipher.conf.in patch | blob | history

diff --git a/test/ssl-tests/25-cipher.conf.in b/test/ssl-tests/25-cipher.conf.in
index c4b0b0509a0b869f47ed9206f0ced49439d002e6..b82f77ccd9738529345f4424be32d812bb4083b4 100644 (file)
--- a/test/ssl-tests/25-cipher.conf.in
+++ b/test/ssl-tests/25-cipher.conf.in
@@ -19,12 +19,12 @@ 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,13 +121,13 @@ 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-CHACHA20-POLY1305:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384",
         },
         test => {
             "ExpectedCipher" => "ECDHE-RSA-CHACHA20-POLY1305",
@@ -136,13 +136,13 @@ our @tests = (
     {
         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-AES128-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-CHACHA20-POLY1305",
         },
         test => {
             "ExpectedCipher" => "ECDHE-RSA-AES256-SHA384",
Unnamed repository; edit this file 'description' to name the repository.