Gitweb:
http://git.exim.org/exim.git/commitdiff/24c83d149054570a727c6229adc611c9e9cf1064
Commit: 24c83d149054570a727c6229adc611c9e9cf1064
Parent: dc4dc04e65b8011b9242c47099ab1f87f5143b3e
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Wed Mar 19 21:16:37 2014 +0000
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Wed Mar 19 21:16:37 2014 +0000
Fix testcase for GnuTLS tls_require_ciphers
---
test/confs/2025 | 2 +-
test/log/2025 | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/test/confs/2025 b/test/confs/2025
index b844072..c19f65e 100644
--- a/test/confs/2025
+++ b/test/confs/2025
@@ -23,7 +23,7 @@ queue_run_in_order
tls_advertise_hosts = *
tls_require_ciphers = ${if eq{$sender_host_address}{HOSTIPV4}\
- {IDEA-CBC-MD5}{!RSA_AES_256:DES-CBC3-SHA}}
+ {NONE}{SECURE256}}
# Set certificate only if server
diff --git a/test/log/2025 b/test/log/2025
index 0b602bd..aa2745c 100644
--- a/test/log/2025
+++ b/test/log/2025
@@ -1,11 +1,11 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
1999-03-02 09:44:33 10HmaX-0005vi-00 TLS error on connection to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] (gnutls_handshake): A TLS packet with unexpected length was received.
-1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.2:RSA_3DES_EDE_CBC_SHA1:192 CV=no DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmaY-0005vi-00"
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 End queue run: pid=pppp -qf
******** SERVER ********
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
-1999-03-02 09:44:33 TLS error on connection from the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] (gnutls_handshake): No supported cipher suites have been found.
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.2:RSA_3DES_EDE_CBC_SHA1:192 CV=no S=sss id=E10HmaX-0005vi-00@???
+1999-03-02 09:44:33 TLS error on connection from the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] (gnutls_handshake): Could not negotiate a supported cipher suite.
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no S=sss id=E10HmaX-0005vi-00@???
