diff options
Diffstat (limited to 'test')
| l--------- | test/confs/4503 | 1 | ||||
| -rw-r--r-- | test/confs/4520 | 3 | ||||
| l--------- | test/confs/4523 | 1 | ||||
| -rw-r--r-- | test/log/4503 | 6 | ||||
| -rw-r--r-- | test/log/4523 | 11 | ||||
| -rwxr-xr-x | test/runtest | 2 | ||||
| -rw-r--r-- | test/scripts/4500-DKIM/4503 | 45 | ||||
| -rw-r--r-- | test/scripts/4500-DKIM/4523 | 15 |
8 files changed, 83 insertions, 1 deletions
diff --git a/test/confs/4503 b/test/confs/4503 new file mode 120000 index 000000000..c4f73bacd --- /dev/null +++ b/test/confs/4503 @@ -0,0 +1 @@ +4500
\ No newline at end of file diff --git a/test/confs/4520 b/test/confs/4520 index 70454c33c..449702855 100644 --- a/test/confs/4520 +++ b/test/confs/4520 @@ -46,5 +46,8 @@ send_to_server: .ifndef HEADERS_MAXSIZE dkim_sign_headers = OPT .endif +.ifdef VALUE + dkim_hash = VALUE +.endif # End diff --git a/test/confs/4523 b/test/confs/4523 new file mode 120000 index 000000000..072f5faf2 --- /dev/null +++ b/test/confs/4523 @@ -0,0 +1 @@ +4520
\ No newline at end of file diff --git a/test/log/4503 b/test/log/4503 new file mode 100644 index 000000000..7ec93a1f5 --- /dev/null +++ b/test/log/4503 @@ -0,0 +1,6 @@ + +******** 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 10HmaX-0005vi-00 DKIM: d=test.ex s=sel c=simple/simple a=rsa-sha512 b=1024 [verification failed - signature did not verify (headers probably modified in transit)] +1999-03-02 09:44:33 10HmaX-0005vi-00 signer: test.ex bits: 1024 +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss id=qwerty1234@disco-zombie.net diff --git a/test/log/4523 b/test/log/4523 new file mode 100644 index 000000000..45eb89c9c --- /dev/null +++ b/test/log/4523 @@ -0,0 +1,11 @@ +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmaY-0005vi-00" +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed + +******** 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 10HmaY-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha512 b=1024 [verification succeeded] +1999-03-02 09:44:33 10HmaY-0005vi-00 signer: test.ex bits: 1024 h=Date:Sender:Message-Id:From:Reply-To:Subject:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive +1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex +1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <a@test.ex> R=server_dump +1999-03-02 09:44:33 10HmaY-0005vi-00 Completed diff --git a/test/runtest b/test/runtest index 712ab79bc..35da4931b 100755 --- a/test/runtest +++ b/test/runtest @@ -1527,7 +1527,7 @@ $munges = 'optional_config' => { 'stdout' => '/^( - dkim_(canon|domain|private_key|selector|sign_headers|strict) + dkim_(canon|domain|private_key|selector|sign_headers|strict|hash) |gnutls_require_(kx|mac|protocols) |hosts_(requ(est|ire)|try)_(dane|ocsp) |hosts_(avoid|nopass|require|verify_avoid)_tls diff --git a/test/scripts/4500-DKIM/4503 b/test/scripts/4500-DKIM/4503 new file mode 100644 index 000000000..aca19583b --- /dev/null +++ b/test/scripts/4500-DKIM/4503 @@ -0,0 +1,45 @@ +# DKIM verify, sha512 +# +exim -DSERVER=server -bd -oX PORT_D +**** +# +# This should pass, only Mail::DKIM::Signer does not handle rsa-sha512. +# - sha512, 1024b +# Mail original in aux-fixed/4500.msg1.txt +# Sig generated by: perl aux-fixed/dkim/sign.pl --algorithm=rsa-sha512 \ +# --method=simple/simple < aux-fixed/4500.msg1.txt +# +# TODO - until we have that we can only test internal consistency, +# signing vs. verification. +# +client 127.0.0.1 PORT_D +??? 220 +HELO xxx +??? 250 +MAIL FROM:<CALLER@bloggs.com> +??? 250 +RCPT TO:<a@test.ex> +??? 250 +DATA +??? 354 +DKIM-Signature: v=1; a=rsa-sha512; c=simple/simple; d=test.ex; h=from:to + :date:message-id:subject; s=sel; bh=3UbbJTudPxmejzh7U1Zg33U3QT+1 + 6kfV2eOTvMeiEis=; b=xQSD/JMqz0C+xKf0A1NTkPTbkDuDdJbpBuyjjT9iYvyP + Zez+xl0TkoPobFGVa6EN8+ZeYV18zjifhtWYLSsNmPinUtcpKQLG1zxAKmmS0JEh + +qihlWbeGJ5+tK588ugUzXHPj+4JBW0H6kxHvdH0l2SlQE5xs/cdggnx5QX5USY= +From: mrgus@text.ex +To: bakawolf@yahoo.com +Date: Thu, 19 Nov 2015 17:00:07 -0700 +Message-ID: <qwerty1234@disco-zombie.net> +Subject: simple test + +This is a simple test. +. +??? 250 +QUIT +??? 221 +**** +# +killdaemon +no_stdout_check +no_msglog_check diff --git a/test/scripts/4500-DKIM/4523 b/test/scripts/4500-DKIM/4523 new file mode 100644 index 000000000..b897fc2a5 --- /dev/null +++ b/test/scripts/4500-DKIM/4523 @@ -0,0 +1,15 @@ +# DKIM signing, sha512 +# +exim -bd -DSERVER=server -oX PORT_D +**** +# +# default header set +exim -DHEADERS_MAXSIZE=y -DVALUE=sha512 -odf a@test.ex +From: nobody@example.com + +content +**** +# +millisleep 500 +killdaemon +no_msglog_check |