summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>2019-09-10 12:49:32 +0200
committerHeiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>2019-09-10 12:49:32 +0200
commitdc46d79f6c3b958036358dfd6c75b7bdc8471835 (patch)
tree13777d5b5b3d82a12084d2e24022a356ae2514e3
parentb6d5e1ac6a49f39b79827a1fa5dd4a0d8e6bd9a9 (diff)
Move the regression test for CVE-2019-15846 to 1100-Basic-TLS/1100
-rw-r--r--test/aux-fixed/1100/input/1i2t1o-0000cD-CV-D (renamed from test/aux-fixed/0909/input/1i2t1o-0000cD-CV-D)0
-rw-r--r--test/aux-fixed/1100/input/1i2t1o-0000cD-CV-H (renamed from test/aux-fixed/0909/input/1i2t1o-0000cD-CV-H)0
-rw-r--r--test/confs/1100 (renamed from test/confs/0909)2
-rw-r--r--test/scripts/0000-Basic/09092
-rw-r--r--test/scripts/1100-Basic-TLS/11002
-rw-r--r--test/scripts/1100-Basic-TLS/REQUIRES1
-rw-r--r--test/stdout/1100 (renamed from test/stdout/0909)0
7 files changed, 4 insertions, 3 deletions
diff --git a/test/aux-fixed/0909/input/1i2t1o-0000cD-CV-D b/test/aux-fixed/1100/input/1i2t1o-0000cD-CV-D
index 22baf8b6f..22baf8b6f 100644
--- a/test/aux-fixed/0909/input/1i2t1o-0000cD-CV-D
+++ b/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
index e93e2eaa1..e93e2eaa1 100644
--- a/test/aux-fixed/0909/input/1i2t1o-0000cD-CV-H
+++ b/test/aux-fixed/1100/input/1i2t1o-0000cD-CV-H
diff --git a/test/confs/0909 b/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
index 4deed14a1..4deed14a1 100644
--- a/test/stdout/0909
+++ b/test/stdout/1100