Bitrot: SSLv2 dropped in OpenSSL 1.1.0

diff --git a/postfix/src/tls/tls.h b/postfix/src/tls/tls.h
index 66972c509ffc255524e439616c82339c07cf55d2..b62174635e078ec4d5ae13c44345c5ae3edd68a1 100644 (file)
--- a/postfix/src/tls/tls.h
+++ b/postfix/src/tls/tls.h
@@ -170,23 +170,52 @@ extern void tls_param_init(void);
   * Protocol selection.
   */
 #define TLS_PROTOCOL_INVALID   (~0)    /* All protocol bits masked */
+
+#ifdef SSL_TXT_SSLV2
 #define TLS_PROTOCOL_SSLv2     (1<<0)  /* SSLv2 */
+#else
+#define SSL_TXT_SSLV2          "SSLv2"
+#define TLS_PROTOCOL_SSLv2     0       /* Unknown */
+#undef  SSL_OP_NO_SSLv2
+#define SSL_OP_NO_SSLv2                0L      /* Noop */
+#endif
+
+#ifdef SSL_TXT_SSLV3
 #define TLS_PROTOCOL_SSLv3     (1<<1)  /* SSLv3 */
+#else
+#define SSL_TXT_SSLV3          "SSLv3"
+#define TLS_PROTOCOL_SSLv3     0       /* Unknown */
+#undef  SSL_OP_NO_SSLv3
+#define SSL_OP_NO_SSLv3                0L      /* Noop */
+#endif
+
+#ifdef SSL_TXT_TLSV1
 #define TLS_PROTOCOL_TLSv1     (1<<2)  /* TLSv1 */
+#else
+#define SSL_TXT_TLSV1          "TLSv1"
+#define TLS_PROTOCOL_TLSv1     0       /* Unknown */
+#undef  SSL_OP_NO_TLSv1
+#define SSL_OP_NO_TLSv1                0L      /* Noop */
+#endif
+
 #ifdef SSL_TXT_TLSV1_1
 #define TLS_PROTOCOL_TLSv1_1   (1<<3)  /* TLSv1_1 */
 #else
+#define SSL_TXT_TLSV1_1                "TLSv1.1"
 #define TLS_PROTOCOL_TLSv1_1   0       /* Unknown */
 #undef  SSL_OP_NO_TLSv1_1
 #define SSL_OP_NO_TLSv1_1      0L      /* Noop */
 #endif
+
 #ifdef SSL_TXT_TLSV1_2
 #define TLS_PROTOCOL_TLSv1_2   (1<<4)  /* TLSv1_2 */
 #else
+#define SSL_TXT_TLSV1_2                "TLSv1.2"
 #define TLS_PROTOCOL_TLSv1_2   0       /* Unknown */
 #undef  SSL_OP_NO_TLSv1_2
 #define SSL_OP_NO_TLSv1_2      0L      /* Noop */
 #endif
+
 #define TLS_KNOWN_PROTOCOLS    \
        ( TLS_PROTOCOL_SSLv2 | TLS_PROTOCOL_SSLv3 | TLS_PROTOCOL_TLSv1 \
           | TLS_PROTOCOL_TLSv1_1 | TLS_PROTOCOL_TLSv1_2 )

diff --git a/postfix/src/tls/tls_misc.c b/postfix/src/tls/tls_misc.c
index 4c032ee66dd0541901e865ab5a318e39edf5d350..15d057674ed1822e17ddf9b9e80a4fd083665838 100644 (file)
--- a/postfix/src/tls/tls_misc.c
+++ b/postfix/src/tls/tls_misc.c
@@ -226,12 +226,8 @@ static const NAME_CODE protocol_table[] = {
     SSL_TXT_SSLV2, TLS_PROTOCOL_SSLv2,
     SSL_TXT_SSLV3, TLS_PROTOCOL_SSLv3,
     SSL_TXT_TLSV1, TLS_PROTOCOL_TLSv1,
-#ifdef SSL_TXT_TLSV1_1
     SSL_TXT_TLSV1_1, TLS_PROTOCOL_TLSv1_1,
-#endif
-#ifdef SSL_TXT_TLSV1_2
     SSL_TXT_TLSV1_2, TLS_PROTOCOL_TLSv1_2,
-#endif
     0, TLS_PROTOCOL_INVALID,
 };