summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2014-08-13 16:23:44 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2014-08-13 16:24:24 +0100
commit903546d89b632736573e38f9b68c480c4d5d1593 (patch)
tree809debba00a73885aee8c3f8b895a21f86a8326f
parenteb4d1c0be04d768afe4947f75724a130b2bd2256 (diff)
Testsuite - Squashed commit of the following:
commit 7566c531c43298510e080eb8a7ed7cf767f9476b Author: Jeremy Harris <jgh146exb@wizmail.org> Date: Wed Aug 13 16:20:38 2014 +0100 Assorted OpenSSL cases fail on different library versions. Discard stdout info to hide this. commit 3d389bc6a5ba0943f1b451fa7a8f2e3246de0bb1 Author: Jeremy Harris <jgh146exb@wizmail.org> Date: Wed Aug 13 14:05:19 2014 +0100 Case 0563 was broken when the GECOS field had spaces. Accept quoted ones in stderr. commit d4333083f230702c8be45650dc48b6eb65a162eb Author: Jeremy Harris <jgh146exb@wizmail.org> Date: Mon Aug 11 18:30:49 2014 +0100 Case 0601 was unreliable; perl racing with exim for output. Quieten exim.
Diffstat
-rw-r--r--test/confs/060111
-rw-r--r--test/log/06017
-rw-r--r--test/rejectlog/06011
-rwxr-xr-xtest/runtest7
-rw-r--r--test/scripts/0000-Basic/06013
-rw-r--r--test/stdout/06017
-rw-r--r--test/stdout/21024
-rw-r--r--test/stdout/21032
-rw-r--r--test/stdout/21051
-rw-r--r--test/stdout/21061
-rw-r--r--test/stdout/21148
-rw-r--r--test/stdout/21181
-rw-r--r--test/stdout/21192
-rw-r--r--test/stdout/21221
-rw-r--r--test/stdout/21241
-rw-r--r--test/stdout/21282
-rw-r--r--test/stdout/21501
-rw-r--r--test/stdout/34601
-rw-r--r--test/stdout/34632
-rw-r--r--test/stdout/34642
-rw-r--r--test/stdout/56004
21 files changed, 23 insertions, 46 deletions
diff --git a/test/confs/0601 b/test/confs/0601
index 58b47d517..84f7d38a6 100644
--- a/test/confs/0601
+++ b/test/confs/0601
@@ -4,17 +4,12 @@
exim_path = EXIM_PATH
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
+queue_only
# ----- Main settings -----
-acl_smtp_connect = check
+acl_smtp_connect = accept udpsend = <; 127.0.0.1 ; 1223 ; message from exim
+acl_smtp_rcpt = accept
-# ----- ACL -----
-
-begin acl
-
-check:
- warn udpsend = <; 127.0.0.1 ; 1223 ; message from exim
-
# End
diff --git a/test/log/0601 b/test/log/0601
index 1d4157f7f..6f48bb034 100644
--- a/test/log/0601
+++ b/test/log/0601
@@ -1 +1,6 @@
-1999-03-02 09:44:33 U=CALLER rejected connection in "connect" ACL
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-smtp S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** CALLER@the.local.host.name: Unrouteable address
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 ** CALLER@the.local.host.name: Unrouteable address
+1999-03-02 09:44:33 10HmaY-0005vi-00 Frozen (delivery error message)
+1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
diff --git a/test/rejectlog/0601 b/test/rejectlog/0601
deleted file mode 100644
index 1d4157f7f..000000000
--- a/test/rejectlog/0601
+++ /dev/null
@@ -1 +0,0 @@
-1999-03-02 09:44:33 U=CALLER rejected connection in "connect" ACL
diff --git a/test/runtest b/test/runtest
index 926385f17..a6c4f0acd 100755
--- a/test/runtest
+++ b/test/runtest
@@ -560,7 +560,7 @@ RESET_AFTER_EXTRA_LINE_READ:
s/\buid=$parm_caller_uid\b/uid=CALLER_UID/g;
s/\bgid=$parm_caller_gid\b/gid=CALLER_GID/g;
- s/\bname=$parm_caller_gecos\b/name=CALLER_GECOS/g;
+ s/\bname="?$parm_caller_gecos"?/name=CALLER_GECOS/g;
# When looking at spool files with -Mvh, we will find not only the caller
# login, but also the uid and gid. It seems that $) in some Perls gives all
@@ -833,6 +833,11 @@ RESET_AFTER_EXTRA_LINE_READ:
next;
}
}
+
+ # openssl version variances
+ next if /^SSL info: unknown state/;
+ next if /^SSL info: SSLv2\/v3 write client hello A/;
+
}
# ======== stderr ========
diff --git a/test/scripts/0000-Basic/0601 b/test/scripts/0000-Basic/0601
index c126c06fb..8ff091866 100644
--- a/test/scripts/0000-Basic/0601
+++ b/test/scripts/0000-Basic/0601
@@ -13,4 +13,5 @@ This is a test message.
.
quit
***
-sleep 4
+sleep 2
+no_msglog_check
diff --git a/test/stdout/0601 b/test/stdout/0601
index 75968f3de..85107ba74 100644
--- a/test/stdout/0601
+++ b/test/stdout/0601
@@ -1,2 +1,7 @@
+220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
received: message from exim
-550 Administrative prohibition
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaX-0005vi-00
+221 the.local.host.name closing connection
diff --git a/test/stdout/2102 b/test/stdout/2102
index 77ae109b2..56c47f8b3 100644
--- a/test/stdout/2102
+++ b/test/stdout/2102
@@ -20,7 +20,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
Attempting to start TLS
SSL info: before/connect initialization
SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
SSL info: SSLv3 read server hello A
SSL info: SSLv3 read server certificate A
SSL info: SSLv3 read server key exchange A
@@ -74,7 +73,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
Attempting to start TLS
SSL info: before/connect initialization
SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
SSL info: SSLv3 read server hello A
SSL info: SSLv3 read server certificate A
SSL info: SSLv3 read server key exchange A
@@ -128,7 +126,6 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
Attempting to start TLS
SSL info: before/connect initialization
SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
SSL info: SSLv3 read server hello A
SSL info: SSLv3 read server certificate A
SSL info: SSLv3 read server key exchange A
@@ -168,7 +165,6 @@ Key file = TESTSUITE/aux-fixed/exim-ca/example.com/server2.example.com/server2.e
Attempting to start TLS
SSL info: before/connect initialization
SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
SSL info: SSLv3 read server hello A
SSL info: SSLv3 read server certificate A
SSL info: SSLv3 read server key exchange A
diff --git a/test/stdout/2103 b/test/stdout/2103
index 1c2f41881..d7d74beca 100644
--- a/test/stdout/2103
+++ b/test/stdout/2103
@@ -20,7 +20,6 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
Attempting to start TLS
SSL info: before/connect initialization
SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
SSL info: SSLv3 read server hello A
SSL info: SSLv3 read server certificate A
SSL info: SSLv3 read server key exchange A
@@ -67,7 +66,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
Attempting to start TLS
SSL info: before/connect initialization
SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
SSL info: SSLv3 read server hello A
SSL info: SSLv3 read server certificate A
SSL info: SSLv3 read server key exchange A
diff --git a/test/stdout/2105 b/test/stdout/2105
index a9eb350be..457921c41 100644
--- a/test/stdout/2105
+++ b/test/stdout/2105
@@ -26,7 +26,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
Attempting to start TLS
SSL info: before/connect initialization
SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
SSL info: SSLv3 read server hello A
SSL info: SSLv3 read server certificate A
SSL info: SSLv3 read server key exchange A
diff --git a/test/stdout/2106 b/test/stdout/2106
index cae6e21c8..576eef83f 100644
--- a/test/stdout/2106
+++ b/test/stdout/2106
@@ -20,7 +20,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
Attempting to start TLS
SSL info: before/connect initialization
SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
SSL info: SSLv3 read server hello A
SSL info: SSLv3 read server certificate A
SSL info: SSLv3 read server key exchange A
diff --git a/test/stdout/2114 b/test/stdout/2114
index 35a696915..c0c698b22 100644
--- a/test/stdout/2114
+++ b/test/stdout/2114
@@ -20,7 +20,6 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
Attempting to start TLS
SSL info: before/connect initialization
SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
SSL info: SSLv3 read server hello A
SSL info: SSLv3 read server certificate A
SSL info: SSLv3 read server key exchange A
@@ -58,7 +57,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
Attempting to start TLS
SSL info: before/connect initialization
SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
SSL info: SSLv3 read server hello A
SSL info: SSLv3 read server certificate A
SSL info: SSLv3 read server key exchange A
@@ -112,7 +110,6 @@ Key file = aux-fixed/cert2
Attempting to start TLS
SSL info: before/connect initialization
SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
SSL info: SSLv3 read server hello A
SSL info: SSLv3 read server certificate A
SSL info: SSLv3 read server key exchange A
@@ -164,7 +161,6 @@ Key file = aux-fixed/cert2
Attempting to start TLS
SSL info: before/connect initialization
SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
SSL info: SSLv3 read server hello A
SSL info: SSLv3 read server certificate A
SSL info: SSLv3 read server key exchange A
@@ -216,7 +212,6 @@ Key file = aux-fixed/cert1
Attempting to start TLS
SSL info: before/connect initialization
SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
SSL info: SSLv3 read server hello A
SSL info: SSLv3 read server certificate A
SSL info: SSLv3 read server key exchange A
@@ -257,7 +252,6 @@ Key file = aux-fixed/cert1
Attempting to start TLS
SSL info: before/connect initialization
SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
SSL info: SSLv3 read server hello A
SSL info: SSLv3 read server certificate A
SSL info: SSLv3 read server key exchange A
@@ -311,7 +305,6 @@ Key file = aux-fixed/cert2
Attempting to start TLS
SSL info: before/connect initialization
SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
SSL info: SSLv3 read server hello A
SSL info: SSLv3 read server certificate A
SSL info: SSLv3 read server key exchange A
@@ -352,7 +345,6 @@ Key file = aux-fixed/cert1
Attempting to start TLS
SSL info: before/connect initialization
SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
SSL info: SSLv3 read server hello A
SSL info: SSLv3 read server certificate A
SSL info: SSLv3 read server key exchange A
diff --git a/test/stdout/2118 b/test/stdout/2118
index 1709dee8a..fa74b6c51 100644
--- a/test/stdout/2118
+++ b/test/stdout/2118
@@ -20,7 +20,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
Attempting to start TLS
SSL info: before/connect initialization
SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
SSL info: SSLv3 read server hello A
SSL info: SSLv3 read server certificate A
SSL info: SSLv3 read server key exchange A
diff --git a/test/stdout/2119 b/test/stdout/2119
index 0bcff273b..a5c488226 100644
--- a/test/stdout/2119
+++ b/test/stdout/2119
@@ -2,7 +2,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
Attempting to start TLS
SSL info: before/connect initialization
SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
SSL info: SSLv3 read server hello A
SSL info: SSLv3 read server certificate A
SSL info: SSLv3 read server key exchange A
@@ -53,7 +52,6 @@ Key file = aux-fixed/cert2
Attempting to start TLS
SSL info: before/connect initialization
SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
SSL info: SSLv3 read server hello A
SSL info: SSLv3 read server certificate A
SSL info: SSLv3 read server key exchange A
diff --git a/test/stdout/2122 b/test/stdout/2122
index 4bb927032..8da07cd89 100644
--- a/test/stdout/2122
+++ b/test/stdout/2122
@@ -20,7 +20,6 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
Attempting to start TLS
SSL info: before/connect initialization
SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
SSL info: SSLv3 read server hello A
SSL info: SSLv3 read server certificate A
SSL info: SSLv3 read server key exchange A
diff --git a/test/stdout/2124 b/test/stdout/2124
index d2d83d5b6..d1e0f2137 100644
--- a/test/stdout/2124
+++ b/test/stdout/2124
@@ -22,7 +22,6 @@ Key file = aux-fixed/cert2
Attempting to start TLS
SSL info: before/connect initialization
SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
SSL info: SSLv3 read server hello A
SSL info: SSLv3 read server certificate A
SSL info: SSLv3 read server key exchange A
diff --git a/test/stdout/2128 b/test/stdout/2128
index 795f469d1..65457b924 100644
--- a/test/stdout/2128
+++ b/test/stdout/2128
@@ -20,7 +20,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
Attempting to start TLS
SSL info: before/connect initialization
SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
SSL info: SSLv3 read server hello A
SSL info: SSLv3 read server certificate A
SSL info: SSLv3 read server key exchange A
@@ -43,7 +42,6 @@ Connecting to 127.0.0.1 port 1226 ... connected
Attempting to start TLS
SSL info: before/connect initialization
SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
SSL info: SSLv3 read server hello A
SSL info: SSLv3 read server certificate A
SSL info: SSLv3 read server key exchange A
diff --git a/test/stdout/2150 b/test/stdout/2150
index 2f5596499..6601866c9 100644
--- a/test/stdout/2150
+++ b/test/stdout/2150
@@ -20,7 +20,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
Attempting to start TLS
SSL info: before/connect initialization
SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
SSL info: SSLv3 read server hello A
SSL info: SSLv3 read server certificate A
SSL info: SSLv3 read server key exchange A
diff --git a/test/stdout/3460 b/test/stdout/3460
index 92c47970f..b9dc4ef50 100644
--- a/test/stdout/3460
+++ b/test/stdout/3460
@@ -50,7 +50,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
Attempting to start TLS
SSL info: before/connect initialization
SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
SSL info: SSLv3 read server hello A
SSL info: SSLv3 read server certificate A
SSL info: SSLv3 read server key exchange A
diff --git a/test/stdout/3463 b/test/stdout/3463
index 68b1b55c0..d1c8d2aa6 100644
--- a/test/stdout/3463
+++ b/test/stdout/3463
@@ -22,7 +22,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
Attempting to start TLS
SSL info: before/connect initialization
SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
SSL info: SSLv3 read server hello A
SSL info: SSLv3 read server certificate A
SSL info: SSLv3 read server key exchange A
@@ -71,7 +70,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
Attempting to start TLS
SSL info: before/connect initialization
SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
SSL info: SSLv3 read server hello A
SSL info: SSLv3 read server certificate A
SSL info: SSLv3 read server key exchange A
diff --git a/test/stdout/3464 b/test/stdout/3464
index 46f1c3729..2b900a3e1 100644
--- a/test/stdout/3464
+++ b/test/stdout/3464
@@ -22,7 +22,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
Attempting to start TLS
SSL info: before/connect initialization
SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
SSL info: SSLv3 read server hello A
SSL info: SSLv3 read server certificate A
SSL info: SSLv3 read server key exchange A
@@ -65,7 +64,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
Attempting to start TLS
SSL info: before/connect initialization
SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
SSL info: SSLv3 read server hello A
SSL info: SSLv3 read server certificate A
SSL info: SSLv3 read server key exchange A
diff --git a/test/stdout/5600 b/test/stdout/5600
index 9020be17e..7c6a458ab 100644
--- a/test/stdout/5600
+++ b/test/stdout/5600
@@ -22,11 +22,9 @@ Key file = aux-fixed/cert2
Attempting to start TLS
SSL info: before/connect initialization
SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
SSL info: SSLv3 read server hello A
SSL info: SSLv3 read server certificate A
Response verify OK
-SSL info: unknown state
SSL info: SSLv3 read server key exchange A
SSL info: SSLv3 read server certificate request A
SSL info: SSLv3 read server done A
@@ -76,7 +74,6 @@ Key file = aux-fixed/cert2
Attempting to start TLS
SSL info: before/connect initialization
SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
no response received
SSL info: SSLv3 read server hello A
SSL info: SSLv3 read server certificate A
@@ -120,7 +117,6 @@ Key file = aux-fixed/cert2
Attempting to start TLS
SSL info: before/connect initialization
SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
no response received
SSL info: SSLv3 read server hello A
SSL info: SSLv3 read server certificate A
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-19 20:08:42 +0000