From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Tue, 15 Dec 2015 18:52:14 +0000 (+0000)
Subject: DANE: fix testcase 2/0/1 TLSA record
X-Git-Tag: exim-4_87_RC2~6
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=6975138c03d4ab190b5033b43351b95d05ab700e;p=exim.git

DANE: fix testcase 2/0/1 TLSA record
---

diff --git a/test/dnszones-src/db.test.ex b/test/dnszones-src/db.test.ex
index 07e3c0e79..7404a5c16 100644
--- a/test/dnszones-src/db.test.ex
+++ b/test/dnszones-src/db.test.ex
@@ -421,18 +421,34 @@ AA a-aa        A V4NET.0.0.100
 ; ------- Testing DANE ------------
 
 ; full suite dns chain, sha512
+;
+; openssl x509 -in aux-fixed/cert1 -noout -pubkey \
+; | openssl pkey -pubin -outform DER \
+; | openssl dgst -sha512 \
+; | awk '{print $2}'
+;
 DNSSEC mxdane512ee          MX  1  dane512ee
 DNSSEC dane512ee            A      HOSTIPV4
 DNSSEC _1225._tcp.dane512ee TLSA  3 1 2 3d5eb81b1dfc3f93c1fa8819e3fb3fdb41bb590441d5f3811db17772f4bc6de29bdd7c4f4b723750dda871b99379192b3f979f03db1252c4f08b03ef7176528d
 
 ; A-only, sha256
+;
+; openssl x509 -in aux-fixed/cert1 -noout -pubkey \
+; | openssl pkey -pubin -outform DER \
+; | openssl dgst -sha256 \
+; | awk '{print $2}'
+;
 DNSSEC dane256ee            A      HOSTIPV4
 DNSSEC _1225._tcp.dane256ee TLSA  3 1 1 2bb55f418bb03411a5007cecbfcd3ec1c94404312c0d53a44bb2166b32654db3
 
 ; full MX, sha256, TA-mode
+;
+; openssl x509 -in aux-fixed/exim-ca/example.com/CA/CA.pem -fingerprint -sha256 -noout \
+;  | awk -F= '{print $2}' | tr -d : | tr '[A-F]' '[a-f]'
+;
 DNSSEC mxdane256ta          MX  1  dane256ta
 DNSSEC dane256ta            A      HOSTIPV4
-DNSSEC _1225._tcp.dane256ta TLSA 2 0 1 b2c6f27f2d16390b4f71cacc69742bf610d750534fab240516c0f2deb4042ad4
+DNSSEC _1225._tcp.dane256ta TLSA 2 0 1 72f0326cc46e7e49d002b44cfce53f0f4b54a765944f9fa6f4d8f2e510478829
 
 
 ; A multiple-return MX where all TLSA lookups defer
diff --git a/test/log/5860 b/test/log/5860
index 7c1bf6657..471a31df1 100644
--- a/test/log/5860
+++ b/test/log/5860
@@ -12,7 +12,6 @@
 1999-03-02 09:44:33 End queue run: pid=pppp -qf
 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for CALLER@mxdane256ta.test.ex
 1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmbB-0005vi-00 tls:cert depth = 2 <CN=clica CA,O=example.com>
 1999-03-02 09:44:33 10HmbB-0005vi-00 tls:cert depth = 0 <CN=server1.example.com>
 1999-03-02 09:44:33 10HmbB-0005vi-00 tls:cert depth = 2 <CN=clica CA,O=example.com>
 1999-03-02 09:44:33 10HmbB-0005vi-00 tls:cert depth = 1 <CN=clica Signing Cert,O=example.com>