Gitweb:
http://git.exim.org/exim.git/commitdiff/d7e464f461172e814b2498c8ade0f17721683d18
Commit: d7e464f461172e814b2498c8ade0f17721683d18
Parent: bd21a787cdeef803334a6c7bf50d23b2a18cbd6f
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Sun Sep 28 17:58:38 2014 +0100
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Sun Sep 28 18:00:09 2014 +0100
More testsuite variance between OpenSSL library versions
---
test/runtest | 4 ++++
test/stdout/2102 | 4 ----
test/stdout/2103 | 2 --
test/stdout/2105 | 1 -
test/stdout/2106 | 1 -
test/stdout/2114 | 8 --------
test/stdout/2118 | 1 -
test/stdout/2119 | 2 --
test/stdout/2122 | 1 -
test/stdout/2124 | 1 -
test/stdout/2128 | 2 --
test/stdout/2150 | 1 -
test/stdout/3460 | 1 -
test/stdout/3463 | 2 --
test/stdout/3464 | 2 --
test/stdout/5600 | 3 ---
16 files changed, 4 insertions(+), 32 deletions(-)
diff --git a/test/runtest b/test/runtest
index d1af19a..a62cd15 100755
--- 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 56c47f8..965b7dd 100644
--- 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 d7d74be..bf79d42 100644
--- 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 457921c..4faa84d 100644
--- 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 576eef8..25b649c 100644
--- 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 c0c698b..c624f63 100644
--- 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 fa74b6c..0359564 100644
--- 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 a5c4882..dd74cb4 100644
--- 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 8da07cd..7643332 100644
--- 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 d1e0f21..251ae38 100644
--- 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 65457b9..e0a0c3b 100644
--- 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 6601866..8580754 100644
--- 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 b9dc4ef..e77771e 100644
--- 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 d1c8d2a..859d8b1 100644
--- 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 2b900a3..4ec7dcc 100644
--- 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 7c6a458..ce86382 100644
--- 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
