More testsuite variance between OpenSSL library versions

diff --git a/test/runtest b/test/runtest
index d1af19afaacab0e40d08ca3b6661ddfdc53b6bfd..a62cd153e84980d0e10c7e3d7f58debe67d41fb8 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -497,6 +497,7 @@ RESET_AFTER_EXTRA_LINE_READ:
   # different protocols; can't rely upon TLS 1.2's AES256-GCM-SHA384, so we
   # treat the standard algorithms the same.
   # So far, have seen:
+  #   TLSv1:AES128-GCM-SHA256:128
   #   TLSv1:AES256-SHA:256
   #   TLSv1.1:AES256-SHA:256
   #   TLSv1.2:AES256-GCM-SHA384:256
@@ -509,6 +510,8 @@ RESET_AFTER_EXTRA_LINE_READ:
   # (and \b doesn't match between ' ' and '(' )
 
   s/( (?: (?:\b|\s) [\(=] ) | \s )TLSv1\.[12]:/$1TLSv1:/xg;
+  s/\bAES128-GCM-SHA256:128\b/AES256-SHA:256/g;
+  s/\bAES128-GCM-SHA256\b/AES256-SHA/g;
   s/\bAES256-GCM-SHA384\b/AES256-SHA/g;
   s/\bDHE-RSA-AES256-SHA\b/AES256-SHA/g;
 
@@ -837,6 +840,7 @@ RESET_AFTER_EXTRA_LINE_READ:
     # openssl version variances
     next if /^SSL info: unknown state/;
     next if /^SSL info: SSLv2\/v3 write client hello A/;
+    next if /^SSL info: SSLv3 read server key exchange A/;
 
     }
 

diff --git a/test/stdout/2102 b/test/stdout/2102
index 56c47f8b3d2bac38eca1544a5b01c0f14ca55b67..965b7dddb827a8158b36ac67512215f442d42826 100644 (file)
--- a/test/stdout/2102
+++ b/test/stdout/2102
@@ -22,7 +22,6 @@ SSL info: before/connect initialization
 SSL info: before/connect initialization
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client key exchange A
 SSL info: SSLv3 write change cipher spec A
@@ -75,7 +74,6 @@ SSL info: before/connect initialization
 SSL info: before/connect initialization
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client key exchange A
 SSL info: SSLv3 write change cipher spec A
@@ -128,7 +126,6 @@ SSL info: before/connect initialization
 SSL info: before/connect initialization
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server certificate request A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client certificate A
@@ -167,7 +164,6 @@ SSL info: before/connect initialization
 SSL info: before/connect initialization
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server certificate request A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client certificate A

diff --git a/test/stdout/2103 b/test/stdout/2103
index d7d74becab0023dee321eadf8be3d61e8dffd00e..bf79d4217f4bbded1228e25343c9a0ad8c687891 100644 (file)
--- a/test/stdout/2103
+++ b/test/stdout/2103
@@ -22,7 +22,6 @@ SSL info: before/connect initialization
 SSL info: before/connect initialization
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client key exchange A
 SSL info: SSLv3 write change cipher spec A
@@ -68,7 +67,6 @@ SSL info: before/connect initialization
 SSL info: before/connect initialization
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client key exchange A
 SSL info: SSLv3 write change cipher spec A

diff --git a/test/stdout/2105 b/test/stdout/2105
index 457921c41c076604745a8cde2cf0dc4d47463ecb..4faa84d506273999d5420ca267d0b1009c31747a 100644 (file)
--- a/test/stdout/2105
+++ b/test/stdout/2105
@@ -28,7 +28,6 @@ SSL info: before/connect initialization
 SSL info: before/connect initialization
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client key exchange A
 SSL info: SSLv3 write change cipher spec A

diff --git a/test/stdout/2106 b/test/stdout/2106
index 576eef83f01a18dd0f4ca903288571b744d22ca1..25b649cf403d1632bcb56ed6edf5eaaa65525714 100644 (file)
--- a/test/stdout/2106
+++ b/test/stdout/2106
@@ -22,7 +22,6 @@ SSL info: before/connect initialization
 SSL info: before/connect initialization
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client key exchange A
 SSL info: SSLv3 write change cipher spec A

diff --git a/test/stdout/2114 b/test/stdout/2114
index c0c698b22a69b7643a2a0fae328dbf02cfb060f0..c624f6381bc8c08e7c19945224ec7cf73cd393e8 100644 (file)
--- a/test/stdout/2114
+++ b/test/stdout/2114
@@ -22,7 +22,6 @@ SSL info: before/connect initialization
 SSL info: before/connect initialization
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server certificate request A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client certificate A
@@ -59,7 +58,6 @@ SSL info: before/connect initialization
 SSL info: before/connect initialization
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server certificate request A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client certificate A
@@ -112,7 +110,6 @@ SSL info: before/connect initialization
 SSL info: before/connect initialization
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server certificate request A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client certificate A
@@ -163,7 +160,6 @@ SSL info: before/connect initialization
 SSL info: before/connect initialization
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server certificate request A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client certificate A
@@ -214,7 +210,6 @@ SSL info: before/connect initialization
 SSL info: before/connect initialization
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server certificate request A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client certificate A
@@ -254,7 +249,6 @@ SSL info: before/connect initialization
 SSL info: before/connect initialization
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server certificate request A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client certificate A
@@ -307,7 +301,6 @@ SSL info: before/connect initialization
 SSL info: before/connect initialization
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server certificate request A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client certificate A
@@ -347,7 +340,6 @@ SSL info: before/connect initialization
 SSL info: before/connect initialization
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server certificate request A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client certificate A

diff --git a/test/stdout/2118 b/test/stdout/2118
index fa74b6c51f42d1d37626e1260ddee4dc173524a0..0359564ba51fe24c2effbf5922ae49720c4789e4 100644 (file)
--- a/test/stdout/2118
+++ b/test/stdout/2118
@@ -22,7 +22,6 @@ SSL info: before/connect initialization
 SSL info: before/connect initialization
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client key exchange A
 SSL info: SSLv3 write change cipher spec A

diff --git a/test/stdout/2119 b/test/stdout/2119
index a5c4882269aa32cde3e7d8efee56e1bd63ceb9de..dd74cb469ac5dad2fa8bde20141e6f51da574776 100644 (file)
--- a/test/stdout/2119
+++ b/test/stdout/2119
@@ -4,7 +4,6 @@ SSL info: before/connect initialization
 SSL info: before/connect initialization
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client key exchange A
 SSL info: SSLv3 write change cipher spec A
@@ -54,7 +53,6 @@ SSL info: before/connect initialization
 SSL info: before/connect initialization
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server certificate request A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client certificate A

diff --git a/test/stdout/2122 b/test/stdout/2122
index 8da07cd8926257798cc2da9ad0c756f08dcd6bdf..76433323a50f0a6c9256cbd8a37b26b70ddd1783 100644 (file)
--- a/test/stdout/2122
+++ b/test/stdout/2122
@@ -22,7 +22,6 @@ SSL info: before/connect initialization
 SSL info: before/connect initialization
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client key exchange A
 SSL info: SSLv3 write change cipher spec A

diff --git a/test/stdout/2124 b/test/stdout/2124
index d1e0f21374b19934f38187623e6f5c54825cc114..251ae384f80f9a2d6f36525d8ab5a962d1affa3e 100644 (file)
--- a/test/stdout/2124
+++ b/test/stdout/2124
@@ -24,7 +24,6 @@ SSL info: before/connect initialization
 SSL info: before/connect initialization
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server certificate request A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client certificate A

diff --git a/test/stdout/2128 b/test/stdout/2128
index 65457b9244ae1c56fe277a35c8b25a5ee12b4a02..e0a0c3b0042e2d5c8499b25df8a83febc13205ae 100644 (file)
--- a/test/stdout/2128
+++ b/test/stdout/2128
@@ -22,7 +22,6 @@ SSL info: before/connect initialization
 SSL info: before/connect initialization
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client key exchange A
 SSL info: SSLv3 write change cipher spec A
@@ -44,7 +43,6 @@ SSL info: before/connect initialization
 SSL info: before/connect initialization
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client key exchange A
 SSL info: SSLv3 write change cipher spec A

diff --git a/test/stdout/2150 b/test/stdout/2150
index 6601866c91fddb45a561925a9ff574a97e44ec25..8580754c1cce60f7dce08c3788bbef67061baf9b 100644 (file)
--- a/test/stdout/2150
+++ b/test/stdout/2150
@@ -22,7 +22,6 @@ SSL info: before/connect initialization
 SSL info: before/connect initialization
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client key exchange A
 SSL info: SSLv3 write change cipher spec A

diff --git a/test/stdout/3460 b/test/stdout/3460
index b9dc4ef50fe8a0bc966b7f0557c5e133622187b1..e77771e9d8705c4428a2b328288a46d41a2a5eec 100644 (file)
--- a/test/stdout/3460
+++ b/test/stdout/3460
@@ -52,7 +52,6 @@ SSL info: before/connect initialization
 SSL info: before/connect initialization
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client key exchange A
 SSL info: SSLv3 write change cipher spec A

diff --git a/test/stdout/3463 b/test/stdout/3463
index d1c8d2aa6afd6464f67628e8995959463a5c7462..859d8b166b9837febd515cd4c3a1acfaedcd6c12 100644 (file)
--- a/test/stdout/3463
+++ b/test/stdout/3463
@@ -24,7 +24,6 @@ SSL info: before/connect initialization
 SSL info: before/connect initialization
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client key exchange A
 SSL info: SSLv3 write change cipher spec A
@@ -72,7 +71,6 @@ SSL info: before/connect initialization
 SSL info: before/connect initialization
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client key exchange A
 SSL info: SSLv3 write change cipher spec A

diff --git a/test/stdout/3464 b/test/stdout/3464
index 2b900a3e1e00f01b1a5c736ceacae80bb24fff75..4ec7dcc0bf943f111e21dcb139f85d8db7ae785e 100644 (file)
--- a/test/stdout/3464
+++ b/test/stdout/3464
@@ -24,7 +24,6 @@ SSL info: before/connect initialization
 SSL info: before/connect initialization
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client key exchange A
 SSL info: SSLv3 write change cipher spec A
@@ -66,7 +65,6 @@ SSL info: before/connect initialization
 SSL info: before/connect initialization
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client key exchange A
 SSL info: SSLv3 write change cipher spec A

diff --git a/test/stdout/5600 b/test/stdout/5600
index 7c6a458ab31b0934eb5ead18f9062b412fcee345..ce8638213b9aaaf2df0f35f6d15d577671c7824d 100644 (file)
--- a/test/stdout/5600
+++ b/test/stdout/5600
@@ -25,7 +25,6 @@ SSL info: before/connect initialization
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
 Response verify OK
-SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server certificate request A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client certificate A
@@ -77,7 +76,6 @@ SSL info: before/connect initialization
 no response received
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server certificate request A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client certificate A
@@ -120,7 +118,6 @@ SSL info: before/connect initialization
 no response received
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server certificate request A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client certificate A