Testsuite: OpenSSL version changes

diff --git a/test/log/2112 b/test/log/2112
index 0ef7921f7c72fa2b9f1dcc700cc68b5199c487e3..7ef247773cf940ec083282003afe9dea7fc9f1c1 100644 (file)
--- a/test/log/2112
+++ b/test/log/2112
@@ -16,7 +16,6 @@
 1999-03-02 09:44:33 10HmaY-0005vi-00 => usery@test.ex R=client_y T=send_to_server_retry H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbD-0005vi-00"
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaZ-0005vi-00 [ip4.ip4.ip4.ip4] SSL verify error: depth=0 error=unable to get local issuer certificate cert=/CN=server1.example.com
-1999-03-02 09:44:33 10HmaZ-0005vi-00 [ip4.ip4.ip4.ip4] SSL verify error: depth=0 error=certificate not trusted cert=/CN=server1.example.com
 1999-03-02 09:44:33 10HmaZ-0005vi-00 [ip4.ip4.ip4.ip4] SSL verify error: depth=0 error=unable to verify the first certificate cert=/CN=server1.example.com
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userz@test.ex R=client_z T=send_to_server_crypt H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:AES256-SHA:256 CV=no DN="/CN=server1.example.com" C="250 OK id=10HmbE-0005vi-00"
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed

diff --git a/test/runtest b/test/runtest
index 97a32cb7ff4f2fb37fd9df3b073ee96d0460dc96..f4e6bc7a50b676cd552454616a84a9d1d1ea60bd 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -857,6 +857,8 @@ RESET_AFTER_EXTRA_LINE_READ:
     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/;
+    next if /SSL verify error: depth=0 error=certificate not trusted/;
+    s/SSL3_READ_BYTES/ssl3_read_bytes/;
     }
 
   # ======== stderr ========

diff --git a/test/stdout/2102 b/test/stdout/2102
index 965b7dddb827a8158b36ac67512215f442d42826..ec0a7c9212a6155128517363b9a7dbc43705476b 100644 (file)
--- a/test/stdout/2102
+++ b/test/stdout/2102
@@ -135,7 +135,7 @@ SSL info: SSLv3 write finished A
 SSL info: SSLv3 flush data
 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
+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
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected

diff --git a/test/stdout/2114 b/test/stdout/2114
index c624f6381bc8c08e7c19945224ec7cf73cd393e8..0505199794870bbe05d0082e8fd45dc747299eed 100644 (file)
--- a/test/stdout/2114
+++ b/test/stdout/2114
@@ -31,7 +31,7 @@ SSL info: SSLv3 write finished A
 SSL info: SSLv3 flush data
 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
+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
 Connecting to 127.0.0.1 port 1225 ... connected
@@ -220,7 +220,7 @@ SSL info: SSLv3 write finished A
 SSL info: SSLv3 flush data
 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
+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
 Connecting to 127.0.0.1 port 1225 ... connected
@@ -311,7 +311,7 @@ SSL info: SSLv3 write finished A
 SSL info: SSLv3 flush data
 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
+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
 Connecting to 127.0.0.1 port 1225 ... connected

diff --git a/test/stdout/2124 b/test/stdout/2124
index 251ae384f80f9a2d6f36525d8ab5a962d1affa3e..9a7a744c5b8e88095812e034494337c63188bd52 100644 (file)
--- a/test/stdout/2124
+++ b/test/stdout/2124
@@ -34,7 +34,7 @@ SSL info: SSLv3 write finished A
 SSL info: SSLv3 flush data
 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
+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
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected

diff --git a/test/stdout/2132 b/test/stdout/2132
index a9724e1709a0eba90af1b2935e5fdc8698475e1b..97aca85c1ae1957c1fa5d2d6464a9c5ea89fcc46 100644 (file)
--- a/test/stdout/2132
+++ b/test/stdout/2132
@@ -135,7 +135,7 @@ SSL info: SSLv3 write finished A
 SSL info: SSLv3 flush data
 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
+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
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected