From e3b95b0da424e55682c8c7b025d9d272a4a35ffe Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Fri, 11 Dec 2020 15:09:15 +0100
Subject: libinterimap: remove default SSL_protocols value.

Namely, use the system default instead of "!SSLv2 !SSLv3 !TLSv1 !TLSv1.1".

As of Debian Buster (OpenSSL 1.1.1) this does not make a difference,
however using the system default provides better compatibility with
future libssl versions.
---
 tests/starttls/t      | 1 -
 tests/tls-protocols/t | 7 +------
 tests/tls/t           | 1 -
 3 files changed, 1 insertion(+), 8 deletions(-)

(limited to 'tests')

diff --git a/tests/starttls/t b/tests/starttls/t
index 5f9bd4f..55caf99 100644
--- a/tests/starttls/t
+++ b/tests/starttls/t
@@ -21,7 +21,6 @@ grep -Fx "STARTTLS"  <"$TMPDIR/capabilities" || error
 grep -Fx "remote: C: 000000 STARTTLS"   <"$STDERR" || error
 grep -Fx "remote: C: 000001 CAPABILITY" <"$STDERR" || error
 
-grep -Fx "remote: Disabling SSL protocols: SSLv3, TLSv1, TLSv1.1" <"$STDERR" || error
 grep -Fx "remote: Peer certificate fingerprint: sha256\$$X509_SHA256" <"$STDERR" || error
 grep "^remote: SSL protocol: TLSv1\.[23] " <"$STDERR" || error
 grep "^remote: SSL cipher: " <"$STDERR" || error
diff --git a/tests/tls-protocols/t b/tests/tls-protocols/t
index f34a95b..5444658 100644
--- a/tests/tls-protocols/t
+++ b/tests/tls-protocols/t
@@ -5,12 +5,7 @@ with_remote_tls_protocols() {
     printf "SSL_protocols = %s\\n" "$*" >>"$XDG_CONFIG_HOME/interimap/config"
 }
 
-# default
-interimap --debug || error
-grep -Fx "remote: Disabling SSL protocols: SSLv3, TLSv1, TLSv1.1" <"$STDERR" || error
-grep -E "^remote: SSL protocol: TLSv1\.[23] " <"$STDERR" || error
-
-# also disable TLSv1.2
+# disable TLSv1.2 and earlier versions
 with_remote_tls_protocols "!SSLv2" "!SSLv3" "!TLSv1" "!TLSv1.1" "!TLSv1.2"
 interimap --debug || error
 grep -Fx "remote: Disabling SSL protocols: SSLv3, TLSv1, TLSv1.1, TLSv1.2" <"$STDERR" || error
diff --git a/tests/tls/t b/tests/tls/t
index 9fdd399..76f7c14 100644
--- a/tests/tls/t
+++ b/tests/tls/t
@@ -8,7 +8,6 @@ for ((i = 0; i < 32; i++)); do
 done
 
 interimap --debug || error
-grep -Fx "remote: Disabling SSL protocols: SSLv3, TLSv1, TLSv1.1" <"$STDERR" || error
 grep -Fx "remote: Peer certificate fingerprint: sha256\$$X509_SHA256" <"$STDERR" || error
 grep "^remote: SSL protocol: TLSv1\.[23] " <"$STDERR" || error
 grep "^remote: SSL cipher: " <"$STDERR" || error
-- 
cgit v1.2.3