Move the regression test for CVE-2019-15846 to 1100-Basic-TLS/1100

diff --git a/test/aux-fixed/0909/input/1i2t1o-0000cD-CV-D b/test/aux-fixed/0909/input/1i2t1o-0000cD-CV-D
deleted file mode 100644 (file)
index 22baf8b..0000000
--- a/test/aux-fixed/0909/input/1i2t1o-0000cD-CV-D
+++ /dev/null
@@ -1,49 +0,0 @@
-1i2t1o-0000cD-CV-D
---1566979804-eximdsn-1242325065
-Content-type: text/plain; charset=us-ascii
-
-This message was created automatically by mail delivery software.
-
-A message that you sent could not be delivered to one or more of its
-recipients. This is a permanent error. The following address(es) failed:
-
-  root@schlittermann.de
-    (generated from root@muli.schlittermann.de)
-    host ssl.schlittermann.de [212.80.235.130]
-    SMTP error from remote mail server after pipelined MAIL FROM:<root@schlittermann.de> SIZE=1882:
-    550 Authenticated connections only.
-
---1566979804-eximdsn-1242325065
-Content-type: message/delivery-status
-
-Reporting-MTA: dns; muli.schlittermann.de
-
-Action: failed
-Final-Recipient: rfc822;root@schlittermann.de
-Status: 5.0.0
-Remote-MTA: dns; ssl.schlittermann.de
-Diagnostic-Code: smtp; 550 Authenticated connections only.
-
---1566979804-eximdsn-1242325065
-Content-type: text/rfc822-headers
-
-Return-path: <root@schlittermann.de>
-Received: from root by muli.schlittermann.de with local (Exim 4.89)
-       (envelope-from <root@schlittermann.de>)
-       id 1i2t1l-0000c8-TF
-       for root@muli.schlittermann.de; Wed, 28 Aug 2019 10:10:02 +0200
-From: root@muli.schlittermann.de (Cron Daemon)
-To: root@muli.schlittermann.de
-Subject: Cron <root@muli>    /root/dbsync
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-X-Cron-Env: <SHELL=/bin/sh>
-X-Cron-Env: <PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin>
-X-Cron-Env: <HOME=/root>
-X-Cron-Env: <LOGNAME=root>
-Message-Id: <E1i2t1l-0000c8-TF@muli.schlittermann.de>
-Date: Wed, 28 Aug 2019 10:10:01 +0200
-
-
---1566979804-eximdsn-1242325065--

diff --git a/test/aux-fixed/0909/input/1i2t1o-0000cD-CV-H b/test/aux-fixed/0909/input/1i2t1o-0000cD-CV-H
deleted file mode 100644 (file)
index e93e2ea..0000000
--- a/test/aux-fixed/0909/input/1i2t1o-0000cD-CV-H
+++ /dev/null
@@ -1,29 +0,0 @@
-1i2t1o-0000cD-CV-H
-Debian-exim 107 110
-<>
-1566979804 0
--ident Debian-exim
--received_protocol local
--body_linecount 48
--max_received_linelength 99
--allow_unqualified_recipient
--allow_unqualified_sender
--frozen 1566979805
--localerror
--tls_peerdn example.com\
-XX
-1
-root@schlittermann.de
-
-156P Received: from Debian-exim by muli.schlittermann.de with local (Exim 4.89)
-       id 1i2t1o-0000cD-CV
-       for root@schlittermann.de; Wed, 28 Aug 2019 10:10:04 +0200
-043  X-Failed-Recipients: root@schlittermann.de
-029  Auto-Submitted: auto-replied
-065F From: Mail Delivery System <Mailer-Daemon@muli.schlittermann.de>
-026T To: root@schlittermann.de
-100  Content-Type: multipart/report; report-type=delivery-status; boundary=1566979804-eximdsn-1242325065
-018  MIME-Version: 1.0
-059  Subject: Mail delivery failed: returning message to sender
-054I Message-Id: <E1i2t1o-0000cD-CV@muli.schlittermann.de>
-038  Date: Wed, 28 Aug 2019 10:10:04 +0200

diff --git a/test/aux-fixed/1100/input/1i2t1o-0000cD-CV-D b/test/aux-fixed/1100/input/1i2t1o-0000cD-CV-D
new file mode 100644 (file)
index 0000000..22baf8b
--- /dev/null
+++ b/test/aux-fixed/1100/input/1i2t1o-0000cD-CV-D
@@ -0,0 +1,49 @@
+1i2t1o-0000cD-CV-D
+--1566979804-eximdsn-1242325065
+Content-type: text/plain; charset=us-ascii
+
+This message was created automatically by mail delivery software.
+
+A message that you sent could not be delivered to one or more of its
+recipients. This is a permanent error. The following address(es) failed:
+
+  root@schlittermann.de
+    (generated from root@muli.schlittermann.de)
+    host ssl.schlittermann.de [212.80.235.130]
+    SMTP error from remote mail server after pipelined MAIL FROM:<root@schlittermann.de> SIZE=1882:
+    550 Authenticated connections only.
+
+--1566979804-eximdsn-1242325065
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; muli.schlittermann.de
+
+Action: failed
+Final-Recipient: rfc822;root@schlittermann.de
+Status: 5.0.0
+Remote-MTA: dns; ssl.schlittermann.de
+Diagnostic-Code: smtp; 550 Authenticated connections only.
+
+--1566979804-eximdsn-1242325065
+Content-type: text/rfc822-headers
+
+Return-path: <root@schlittermann.de>
+Received: from root by muli.schlittermann.de with local (Exim 4.89)
+       (envelope-from <root@schlittermann.de>)
+       id 1i2t1l-0000c8-TF
+       for root@muli.schlittermann.de; Wed, 28 Aug 2019 10:10:02 +0200
+From: root@muli.schlittermann.de (Cron Daemon)
+To: root@muli.schlittermann.de
+Subject: Cron <root@muli>    /root/dbsync
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+X-Cron-Env: <SHELL=/bin/sh>
+X-Cron-Env: <PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin>
+X-Cron-Env: <HOME=/root>
+X-Cron-Env: <LOGNAME=root>
+Message-Id: <E1i2t1l-0000c8-TF@muli.schlittermann.de>
+Date: Wed, 28 Aug 2019 10:10:01 +0200
+
+
+--1566979804-eximdsn-1242325065--

diff --git a/test/aux-fixed/1100/input/1i2t1o-0000cD-CV-H b/test/aux-fixed/1100/input/1i2t1o-0000cD-CV-H
new file mode 100644 (file)
index 0000000..e93e2ea
--- /dev/null
+++ b/test/aux-fixed/1100/input/1i2t1o-0000cD-CV-H
@@ -0,0 +1,29 @@
+1i2t1o-0000cD-CV-H
+Debian-exim 107 110
+<>
+1566979804 0
+-ident Debian-exim
+-received_protocol local
+-body_linecount 48
+-max_received_linelength 99
+-allow_unqualified_recipient
+-allow_unqualified_sender
+-frozen 1566979805
+-localerror
+-tls_peerdn example.com\
+XX
+1
+root@schlittermann.de
+
+156P Received: from Debian-exim by muli.schlittermann.de with local (Exim 4.89)
+       id 1i2t1o-0000cD-CV
+       for root@schlittermann.de; Wed, 28 Aug 2019 10:10:04 +0200
+043  X-Failed-Recipients: root@schlittermann.de
+029  Auto-Submitted: auto-replied
+065F From: Mail Delivery System <Mailer-Daemon@muli.schlittermann.de>
+026T To: root@schlittermann.de
+100  Content-Type: multipart/report; report-type=delivery-status; boundary=1566979804-eximdsn-1242325065
+018  MIME-Version: 1.0
+059  Subject: Mail delivery failed: returning message to sender
+054I Message-Id: <E1i2t1o-0000cD-CV@muli.schlittermann.de>
+038  Date: Wed, 28 Aug 2019 10:10:04 +0200

diff --git a/test/confs/0909 b/test/confs/0909
deleted file mode 100644 (file)
index 68b5be6..0000000
--- a/test/confs/0909
+++ /dev/null
@@ -1,4 +0,0 @@
-keep_environment =
-tls_advertise_hosts =
-log_file_path = DIR/spool/log/%slog
-spool_directory = DIR/aux-fixed/0909

diff --git a/test/confs/1100 b/test/confs/1100
new file mode 100644 (file)
index 0000000..48f8c20
--- /dev/null
+++ b/test/confs/1100
@@ -0,0 +1,4 @@
+keep_environment =
+tls_advertise_hosts =
+log_file_path = DIR/spool/log/%slog
+spool_directory = DIR/aux-fixed/1100

diff --git a/test/scripts/0000-Basic/0909 b/test/scripts/0000-Basic/0909
deleted file mode 100644 (file)
index 6476caa..0000000
--- a/test/scripts/0000-Basic/0909
+++ /dev/null
@@ -1,2 +0,0 @@
-# Check for trailing backslash bug CVE-2019-XXX
-exim -Mset 1i2t1o-0000cD-CV -be '$tls_in_peerdn'

diff --git a/test/scripts/1100-Basic-TLS/1100 b/test/scripts/1100-Basic-TLS/1100
new file mode 100644 (file)
index 0000000..d993eb6
--- /dev/null
+++ b/test/scripts/1100-Basic-TLS/1100
@@ -0,0 +1,2 @@
+# Check for trailing backslash bug CVE-2019-15846
+exim -Mset 1i2t1o-0000cD-CV -be '$tls_in_peerdn'

diff --git a/test/scripts/1100-Basic-TLS/REQUIRES b/test/scripts/1100-Basic-TLS/REQUIRES
new file mode 100644 (file)
index 0000000..1b465a6
--- /dev/null
+++ b/test/scripts/1100-Basic-TLS/REQUIRES
@@ -0,0 +1 @@
+feature _HAVE_TLS

diff --git a/test/stdout/0909 b/test/stdout/0909
deleted file mode 100644 (file)
index 4deed14..0000000
--- a/test/stdout/0909
+++ /dev/null
@@ -1 +0,0 @@
-example.com\

diff --git a/test/stdout/1100 b/test/stdout/1100
new file mode 100644 (file)
index 0000000..4deed14
--- /dev/null
+++ b/test/stdout/1100
@@ -0,0 +1 @@
+example.com\