summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/confs/20071
-rw-r--r--test/scripts/2000-GnuTLS/20908
-rw-r--r--test/scripts/2100-OpenSSL/21908
-rw-r--r--test/stdout/20908
-rw-r--r--test/stdout/21908
5 files changed, 5 insertions, 28 deletions
diff --git a/test/confs/2007 b/test/confs/2007
index 7b58b73ee..a16b9a57e 100644
--- a/test/confs/2007
+++ b/test/confs/2007
@@ -16,6 +16,7 @@ queue_only
queue_run_in_order
tls_advertise_hosts = *
+tls_require_ciphers = NORMAL:!DHE-RSA:!DHE-DSS:!ECDHE-RSA:!ECDHE-ECDSA:!ECDHE-PSK
# Set certificate only if server
diff --git a/test/scripts/2000-GnuTLS/2090 b/test/scripts/2000-GnuTLS/2090
index 278f03429..91227e8ca 100644
--- a/test/scripts/2000-GnuTLS/2090
+++ b/test/scripts/2000-GnuTLS/2090
@@ -58,13 +58,7 @@ EHLO rhu.barb
??? 250-PIPELINING
??? 250-CHUNKING
??? 250 HELP
-MAIL FROM:<someone@some.domain>
-RCPT TO:<CALLER@test.ex>
-BDAT 88 LAST
-To: Susan@random.com
-From: Sam@random.com
-Subject: This is a bodyless test message
-
+MAIL FROM:<someone@some.domain>\r\nRCPT TO:<CALLER@test.ex>\r\nBDAT 88 LAST\r\nTo: Susan@random.com\r\nFrom: Sam@random.com\r\nSubject: This is a bodyless test message\r\n
??? 250
??? 250
??? 250-
diff --git a/test/scripts/2100-OpenSSL/2190 b/test/scripts/2100-OpenSSL/2190
index 54095d49a..e004e5e02 100644
--- a/test/scripts/2100-OpenSSL/2190
+++ b/test/scripts/2100-OpenSSL/2190
@@ -57,13 +57,7 @@ EHLO rhu.barb
??? 250-PIPELINING
??? 250-CHUNKING
??? 250 HELP
-MAIL FROM:<someone@some.domain>
-RCPT TO:<CALLER@test.ex>
-BDAT 88 LAST
-To: Susan@random.com
-From: Sam@random.com
-Subject: This is a bodyless test message
-
+MAIL FROM:<someone@some.domain>\r\nRCPT TO:<CALLER@test.ex>\r\nBDAT 88 LAST\r\nTo: Susan@random.com\r\nFrom: Sam@random.com\r\nSubject: This is a bodyless test message\r\n
??? 250
??? 250
??? 250-
diff --git a/test/stdout/2090 b/test/stdout/2090
index 7bf70310a..f08abd10b 100644
--- a/test/stdout/2090
+++ b/test/stdout/2090
@@ -89,13 +89,7 @@ Succeeded in starting TLS
<<< 250-CHUNKING
??? 250 HELP
<<< 250 HELP
->>> MAIL FROM:<someone@some.domain>
->>> RCPT TO:<CALLER@test.ex>
->>> BDAT 88 LAST
->>> To: Susan@random.com
->>> From: Sam@random.com
->>> Subject: This is a bodyless test message
->>>
+>>> MAIL FROM:<someone@some.domain>\r\nRCPT TO:<CALLER@test.ex>\r\nBDAT 88 LAST\r\nTo: Susan@random.com\r\nFrom: Sam@random.com\r\nSubject: This is a bodyless test message\r\n
??? 250
<<< 250 OK
??? 250
diff --git a/test/stdout/2190 b/test/stdout/2190
index 9d386bdf7..e09556e69 100644
--- a/test/stdout/2190
+++ b/test/stdout/2190
@@ -91,13 +91,7 @@ Succeeded in starting TLS
<<< 250-CHUNKING
??? 250 HELP
<<< 250 HELP
->>> MAIL FROM:<someone@some.domain>
->>> RCPT TO:<CALLER@test.ex>
->>> BDAT 88 LAST
->>> To: Susan@random.com
->>> From: Sam@random.com
->>> Subject: This is a bodyless test message
->>>
+>>> MAIL FROM:<someone@some.domain>\r\nRCPT TO:<CALLER@test.ex>\r\nBDAT 88 LAST\r\nTo: Susan@random.com\r\nFrom: Sam@random.com\r\nSubject: This is a bodyless test message\r\n
??? 250
<<< 250 OK
??? 250