From dc46d79f6c3b958036358dfd6c75b7bdc8471835 Mon Sep 17 00:00:00 2001
From: "Heiko Schlittermann (HS12-RIPE)" <hs@schlittermann.de>
Date: Tue, 10 Sep 2019 12:49:32 +0200
Subject: [PATCH] Move the regression test for CVE-2019-15846 to
 1100-Basic-TLS/1100

---
 test/aux-fixed/{0909 => 1100}/input/1i2t1o-0000cD-CV-D | 0
 test/aux-fixed/{0909 => 1100}/input/1i2t1o-0000cD-CV-H | 0
 test/confs/{0909 => 1100}                              | 2 +-
 test/scripts/0000-Basic/0909                           | 2 --
 test/scripts/1100-Basic-TLS/1100                       | 2 ++
 test/scripts/1100-Basic-TLS/REQUIRES                   | 1 +
 test/stdout/{0909 => 1100}                             | 0
 7 files changed, 4 insertions(+), 3 deletions(-)
 rename test/aux-fixed/{0909 => 1100}/input/1i2t1o-0000cD-CV-D (100%)
 rename test/aux-fixed/{0909 => 1100}/input/1i2t1o-0000cD-CV-H (100%)
 rename test/confs/{0909 => 1100} (67%)
 delete mode 100644 test/scripts/0000-Basic/0909
 create mode 100644 test/scripts/1100-Basic-TLS/1100
 create mode 100644 test/scripts/1100-Basic-TLS/REQUIRES
 rename test/stdout/{0909 => 1100} (100%)

diff --git a/test/aux-fixed/0909/input/1i2t1o-0000cD-CV-D b/test/aux-fixed/1100/input/1i2t1o-0000cD-CV-D
similarity index 100%
rename from test/aux-fixed/0909/input/1i2t1o-0000cD-CV-D
rename to test/aux-fixed/1100/input/1i2t1o-0000cD-CV-D
diff --git a/test/aux-fixed/0909/input/1i2t1o-0000cD-CV-H b/test/aux-fixed/1100/input/1i2t1o-0000cD-CV-H
similarity index 100%
rename from test/aux-fixed/0909/input/1i2t1o-0000cD-CV-H
rename to test/aux-fixed/1100/input/1i2t1o-0000cD-CV-H
diff --git a/test/confs/0909 b/test/confs/1100
similarity index 67%
rename from test/confs/0909
rename to test/confs/1100
index 68b5be68f..48f8c2029 100644
--- a/test/confs/0909
+++ b/test/confs/1100
@@ -1,4 +1,4 @@
 keep_environment =
 tls_advertise_hosts =
 log_file_path = DIR/spool/log/%slog
-spool_directory = DIR/aux-fixed/0909
+spool_directory = DIR/aux-fixed/1100
diff --git a/test/scripts/0000-Basic/0909 b/test/scripts/0000-Basic/0909
deleted file mode 100644
index 6476caa75..000000000
--- 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
index 000000000..d993eb62a
--- /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
index 000000000..1b465a6dd
--- /dev/null
+++ b/test/scripts/1100-Basic-TLS/REQUIRES
@@ -0,0 +1 @@
+feature _HAVE_TLS
diff --git a/test/stdout/0909 b/test/stdout/1100
similarity index 100%
rename from test/stdout/0909
rename to test/stdout/1100
-- 
2.25.1