Bug 1518: fix description of condition processing

[users/heiko/exim.git] / test / stdout / 2114

diff --git a/test/stdout/2114 b/test/stdout/2114
index f675141ce7a2b38efaa3737c514726cf2134f43f..c0c698b22a69b7643a2a0fae328dbf02cfb060f0 100644 (file)
--- a/test/stdout/2114
+++ b/test/stdout/2114
@@ -7,6 +7,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-8BITMIME
+??? 250-
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-STARTTLS
@@ -18,9 +20,9 @@ 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
 SSL info: SSLv3 read server certificate request A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client certificate A
@@ -28,8 +30,8 @@ SSL info: SSLv3 write client key exchange A
 SSL info: SSLv3 write change cipher spec A
 SSL info: SSLv3 write finished A
 SSL info: SSLv3 flush data
-SSL info: SSLv3 read finished A
-SSL info: SSLv3 read finished A
+SSL info: SSLv3 read server session ticket A
+SSL info: SSLv3 read server session ticket A
 pppp:error:14094410:SSL routines:SSL3_READ_BYTES:sslv3 alert handshake failure:s3_pkt.c:dddd:SSL alert number 40
 Failed to start TLS
 End of script
@@ -42,6 +44,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-8BITMIME
+??? 250-
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-STARTTLS
@@ -53,9 +57,9 @@ 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
 SSL info: SSLv3 read server certificate request A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client certificate A
@@ -63,6 +67,7 @@ SSL info: SSLv3 write client key exchange A
 SSL info: SSLv3 write change cipher spec A
 SSL info: SSLv3 write finished A
 SSL info: SSLv3 flush data
+SSL info: SSLv3 read server session ticket A
 SSL info: SSLv3 read finished A
 SSL info: SSL negotiation finished successfully
 SSL info: SSL negotiation finished successfully
@@ -92,6 +97,8 @@ Key file = aux-fixed/cert2
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-8BITMIME
+??? 250-
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-STARTTLS
@@ -103,9 +110,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
+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
@@ -114,6 +121,7 @@ SSL info: SSLv3 write certificate verify A
 SSL info: SSLv3 write change cipher spec A
 SSL info: SSLv3 write finished A
 SSL info: SSLv3 flush data
+SSL info: SSLv3 read server session ticket A
 SSL info: SSLv3 read finished A
 SSL info: SSL negotiation finished successfully
 SSL info: SSL negotiation finished successfully
@@ -140,6 +148,8 @@ Key file = aux-fixed/cert2
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-8BITMIME
+??? 250-
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-STARTTLS
@@ -151,9 +161,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
+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
@@ -162,6 +172,7 @@ SSL info: SSLv3 write certificate verify A
 SSL info: SSLv3 write change cipher spec A
 SSL info: SSLv3 write finished A
 SSL info: SSLv3 flush data
+SSL info: SSLv3 read server session ticket A
 SSL info: SSLv3 read finished A
 SSL info: SSL negotiation finished successfully
 SSL info: SSL negotiation finished successfully
@@ -188,6 +199,8 @@ Key file = aux-fixed/cert1
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-8BITMIME
+??? 250-
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-STARTTLS
@@ -199,9 +212,9 @@ 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
 SSL info: SSLv3 read server certificate request A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client certificate A
@@ -210,8 +223,8 @@ SSL info: SSLv3 write certificate verify A
 SSL info: SSLv3 write change cipher spec A
 SSL info: SSLv3 write finished A
 SSL info: SSLv3 flush data
-SSL info: SSLv3 read finished A
-SSL info: SSLv3 read finished A
+SSL info: SSLv3 read server session ticket A
+SSL info: SSLv3 read server session ticket A
 pppp:error:14094418:SSL routines:SSL3_READ_BYTES:tlsv1 alert unknown ca:s3_pkt.c:dddd:SSL alert number 48
 Failed to start TLS
 End of script
@@ -226,6 +239,8 @@ Key file = aux-fixed/cert1
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-8BITMIME
+??? 250-
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-STARTTLS
@@ -237,9 +252,9 @@ 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
 SSL info: SSLv3 read server certificate request A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client certificate A
@@ -248,6 +263,7 @@ SSL info: SSLv3 write certificate verify A
 SSL info: SSLv3 write change cipher spec A
 SSL info: SSLv3 write finished A
 SSL info: SSLv3 flush data
+SSL info: SSLv3 read server session ticket A
 SSL info: SSLv3 read finished A
 SSL info: SSL negotiation finished successfully
 SSL info: SSL negotiation finished successfully
@@ -258,9 +274,9 @@ Succeeded in starting TLS
 <<< 250 OK
 >>> rcpt to:<userx@test.ex>
 ??? 550-
-<<< 550-certificate not verified: peerdn=/C=UK/L=Cambridge/O=University of
+<<< 550-certificate not verified: peerdn=/C=UK/O=The Exim Maintainers/OU=Test
 ??? 550
-<<< 550 Cambridge/OU=Computing Service/CN=Philip Hazel
+<<< 550 Suite/CN=Phil Pennock
 >>> quit
 ??? 221
 <<< 221 myhost.test.ex closing connection
@@ -276,6 +292,8 @@ Key file = aux-fixed/cert2
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-8BITMIME
+??? 250-
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-STARTTLS
@@ -287,9 +305,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
+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
@@ -298,8 +316,8 @@ SSL info: SSLv3 write certificate verify A
 SSL info: SSLv3 write change cipher spec A
 SSL info: SSLv3 write finished A
 SSL info: SSLv3 flush data
-SSL info: SSLv3 read finished A
-SSL info: SSLv3 read finished A
+SSL info: SSLv3 read server session ticket A
+SSL info: SSLv3 read server session ticket A
 pppp:error:14094414:SSL routines:SSL3_READ_BYTES:sslv3 alert certificate revoked:s3_pkt.c:dddd:SSL alert number 44
 Failed to start TLS
 End of script
@@ -314,6 +332,8 @@ Key file = aux-fixed/cert1
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-8BITMIME
+??? 250-
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-STARTTLS
@@ -325,9 +345,9 @@ 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
 SSL info: SSLv3 read server certificate request A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client certificate A
@@ -336,6 +356,7 @@ SSL info: SSLv3 write certificate verify A
 SSL info: SSLv3 write change cipher spec A
 SSL info: SSLv3 write finished A
 SSL info: SSLv3 flush data
+SSL info: SSLv3 read server session ticket A
 SSL info: SSLv3 read finished A
 SSL info: SSL negotiation finished successfully
 SSL info: SSL negotiation finished successfully
@@ -346,9 +367,9 @@ Succeeded in starting TLS
 <<< 250 OK
 >>> rcpt to:<userx@test.ex>
 ??? 550-
-<<< 550-certificate not verified: peerdn=/C=UK/L=Cambridge/O=University of
+<<< 550-certificate not verified: peerdn=/C=UK/O=The Exim Maintainers/OU=Test
 ??? 550
-<<< 550 Cambridge/OU=Computing Service/CN=Philip Hazel
+<<< 550 Suite/CN=Phil Pennock
 >>> quit
 ??? 221
 <<< 221 myhost.test.ex closing connection