DANE: fix TA-mode verify under GnuTLS. Bug 2311

4 files changed, 5 insertions, 43 deletions

diff --git a/test/scripts/5820-DANE-GnuTLS/5820 b/test/scripts/5820-DANE-GnuTLS/5820
index 652661cc1..d7824a38c 100644
--- a/test/scripts/5820-DANE-GnuTLS/5820
+++ b/test/scripts/5820-DANE-GnuTLS/5820
@@ -2,11 +2,11 @@
 #
 exim -DSERVER=server -DDETAILS=ee -bd -oX PORT_D
 ****
-### TLSA (3 1 1)
+### TLSA (3 1 1) (DANE-EE SPKI SHA2-256)
 exim -odq CALLER@dane256ee.test.ex
 Testing
 ****
-### TLSA (3 1 2)
+### TLSA (3 1 2) (            SHA2-512)
 exim -odq CALLER@mxdane512ee.test.ex
 Testing
 ****
@@ -24,7 +24,7 @@ killdaemon
 #
 exim -DSERVER=server -DDETAILS=ta -bd -oX PORT_D
 ****
-### TLSA (2 0 1)
+### TLSA (2 0 1) (DANE-TA CERT SHA2-256)
 exim -odf CALLER@mxdane256ta.test.ex
 Testing
 ****
@@ -44,7 +44,7 @@ killdaemon
 # Check we get a CV and TLS connection, with try_dane but no require_dane
 exim -DSERVER=server -DDETAILS=ca -bd -oX PORT_D
 ****
-exim -odf CALLER@thishost.test.ex
+exim -odf -DDETAILS=ca CALLER@thishost.test.ex
 Testing
 ****
 exim -DOPT=no_certname -qf
diff --git a/test/scripts/5820-DANE-GnuTLS/5822 b/test/scripts/5820-DANE-GnuTLS/5822
deleted file mode 100644
index 9e565ab49..000000000
--- a/test/scripts/5820-DANE-GnuTLS/5822
+++ /dev/null
@@ -1,19 +0,0 @@
-# DANE server: selfsigned cert
-#
-exim -DSERVER=server -bd -oX PORT_D
-****
-### TLSA (2 0 1)
-exim -odf CALLER@mxdane256tas.test.ex
-Testing
-****
-### TLSA (2 1 1)
-exim -odf CALLER@mxdane256task.test.ex
-Testing
-****
-### TLSA (3 1 1)
-exim -odf CALLER@mxdane256ees.test.ex
-Testing
-****
-killdaemon
-# 
-no_msglog_check
diff --git a/test/scripts/5840-DANE-OpenSSL/5840 b/test/scripts/5840-DANE-OpenSSL/5840
index b1ea2f307..4d88131ea 100644
--- a/test/scripts/5840-DANE-OpenSSL/5840
+++ b/test/scripts/5840-DANE-OpenSSL/5840
@@ -52,7 +52,7 @@ killdaemon
 # Check we get a CV and TLS connection, with try_dane but no require_dane
 exim -DSERVER=server -DDETAILS=ca -bd -oX PORT_D
 ****
-exim -odf CALLER@thishost.test.ex
+exim -odf -DDETAILS=ca CALLER@thishost.test.ex
 Testing
 ****
 exim -DOPT=no_certname -qf
diff --git a/test/scripts/5840-DANE-OpenSSL/5842 b/test/scripts/5840-DANE-OpenSSL/5842
deleted file mode 100644
index da9e4e3c7..000000000
--- a/test/scripts/5840-DANE-OpenSSL/5842
+++ /dev/null
@@ -1,19 +0,0 @@
-# DANE server: selfsigned and TA-mode
-#
-exim -DSERVER=server -bd -oX PORT_D
-****
-### TLSA (2 0 1)
-exim -odf CALLER@mxdane256tas.test.ex
-Testing
-****
-### TLSA (2 1 1)
-exim -odf CALLER@mxdane256task.test.ex
-Testing
-****
-### TLSA (3 1 1)
-exim -odf CALLER@mxdane256ees.test.ex
-Testing
-****
-killdaemon
-# 
-no_msglog_check