X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=test%2Fscripts%2F2000-GnuTLS%2F2024;h=307fde7064a44029558d6108875b75a6c5f8e96e;hb=b2ba9267abe2c6d16330497041ab8c289e41bd03;hp=46b93d413d879c99425aa397084dfcdee4814fe3;hpb=59371ea735c941334861aa5b8e1e9a06facf044f;p=user%2Fhenk%2Fcode%2Fexim.git

diff --git a/test/scripts/2000-GnuTLS/2024 b/test/scripts/2000-GnuTLS/2024
index 46b93d413..307fde706 100644
--- a/test/scripts/2000-GnuTLS/2024
+++ b/test/scripts/2000-GnuTLS/2024
@@ -2,9 +2,17 @@
 gnutls
 exim -DSERVER=server -bd -oX PORT_D
 ****
+#
+#
+# This one has a cert, but the server isn't expecting it.
+# Earlier versions of GnuTLS would send it despite the server giving a list of acceptable ones, and the
+# server would fail its verification.  Now the client correctly doesn't send it; the mainlog reflects
+# this, the custom munge patches output with old GnuTLS (I hope; not actually tested).
+munge gnutls_bad_clientcert
 client-gnutls HOSTIPV4 PORT_D aux-fixed/cert2 aux-fixed/cert2
 ??? 220
-ehlo rhu.barb
+ehlo rhu1.barb
+??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
@@ -12,13 +20,18 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
+nop
+????554
 ****
 killdaemon
+#
+# Here the server really doesn't have a cert
 exim -DSERVER=server -DCERT=/non/exist -bd -oX PORT_D
 ****
 client-gnutls HOSTIPV4 PORT_D aux-fixed/cert2 aux-fixed/cert2
 ??? 220
-ehlo rhu.barb
+ehlo rhu2.barb
+??? 250-
 ??? 250-
 ??? 250-
 ??? 250-