View | Details | Raw Unified | Return to bug 212223 | Differences between
and this patch

Collapse All | Expand All

(-)mail/postfix/files/patch-src_posttls-finger_posttls-finger.c (+22 lines)
Line 0 Link Here
1 
--- src/posttls-finger/posttls-finger.c.orig	2016-08-27 20:27:50 UTC
2 
+++ src/posttls-finger/posttls-finger.c
3 
@@ -1511,7 +1511,8 @@ static int finger(STATE *state)
4 
     return (0);
5 
 }
6
7 
-#if defined(USE_TLS) && OPENSSL_VERSION_NUMBER < 0x10100000L
8 
+#if defined(USE_TLS) && \
9 
+    ( OPENSSL_VERSION_NUMBER < 0x10100000L || OPENSSL_VERSION_NUMBER == 0x20000000L )
10
11 
 /* ssl_cleanup - free memory allocated in the OpenSSL library */
12
13 
@@ -1958,7 +1959,8 @@ int     main(int argc, char *argv[])
14 
     cleanup(&state);
15
16 
     /* OpenSSL 1.1.0 and later (de)initialization is implicit */
17 
-#if defined(USE_TLS) && OPENSSL_VERSION_NUMBER < 0x10100000L
18 
+#if defined(USE_TLS) && \
19 
+    ( OPENSSL_VERSION_NUMBER < 0x10100000L || OPENSSL_VERSION_NUMBER == 0x20000000L )
20 
     ssl_cleanup();
21 
 #endif
22
(-)mail/postfix/files/patch-src_tls_tls.h (-1 / +1 lines)
Lines 8-14 Link Here
8
8
9 
  /* Backwards compatibility with OpenSSL < 1.1.0 */
 9 
  /* Backwards compatibility with OpenSSL < 1.1.0 */
10 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
 10 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
11 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
 11 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || OPENSSL_VERSION_NUMBER == 0x20000000L
12 
 #define OpenSSL_version_num SSLeay
 12 
 #define OpenSSL_version_num SSLeay
13 
 #define OpenSSL_version SSLeay_version
 13 
 #define OpenSSL_version SSLeay_version
14 
 #define OPENSSL_VERSION SSLEAY_VERSION
 14 
 #define OPENSSL_VERSION SSLEAY_VERSION
(-)mail/postfix/files/patch-src_tls_tls__client.c (+20 lines)
Line 0 Link Here
1 
--- src/tls/tls_client.c.orig	2016-08-27 20:27:50 UTC
2 
+++ src/tls/tls_client.c
3 
@@ -299,7 +299,7 @@ TLS_APPL_STATE *tls_client_init(const TL
4 
      */
5 
     tls_check_version();
6
7 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
8 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || OPENSSL_VERSION_NUMBER == 0x20000000L
9
10 
     /*
11 
      * Initialize the OpenSSL library by the book! To start with, we must
12 
@@ -441,7 +441,7 @@ TLS_APPL_STATE *tls_client_init(const TL
13 
     /*
14 
      * 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev
15 
      */
16 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
17 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || OPENSSL_VERSION_NUMBER == 0x20000000L
18
19 
     /*
20 
      * According to the OpenSSL documentation, temporary RSA key is needed
(-)mail/postfix/files/patch-src_tls_tls__dane.c (+11 lines)
Line 0 Link Here
1 
--- src/tls/tls_dane.c.orig	2016-08-27 20:27:50 UTC
2 
+++ src/tls/tls_dane.c
3 
@@ -2163,7 +2163,7 @@ static SSL_CTX *ctx_init(const char *CAf
4 
     tls_param_init();
5 
     tls_check_version();
6
7 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
8 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || OPENSSL_VERSION_NUMBER == 0x20000000L
9 
     SSL_load_error_strings();
10 
     SSL_library_init();
11 
 #endif
(-)mail/postfix/files/patch-src_tls_tls__rsa.c (+20 lines)
Line 0 Link Here
1 
--- src/tls/tls_rsa.c.orig	2016-01-03 14:49:51 UTC
2 
+++ src/tls/tls_rsa.c
3 
@@ -57,7 +57,7 @@
4 
  /*
5 
   * 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev
6 
   */
7 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
8 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || OPENSSL_VERSION_NUMBER == 0x20000000L
9
10 
 /* tls_tmp_rsa_cb - call-back to generate ephemeral RSA key */
11
12 
@@ -109,7 +109,7 @@ int     main(int unused_argc, char *cons
13 
     /*
14 
      * 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev
15 
      */
16 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
17 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || OPENSSL_VERSION_NUMBER == 0x20000000L
18 
     RSA    *rsa;
19
20 
     msg_vstream_init(argv[0], VSTREAM_ERR);
(-)mail/postfix/files/patch-src_tls_tls__server.c (+20 lines)
Line 0 Link Here
1 
--- src/tls/tls_server.c.orig	2016-08-27 20:27:50 UTC
2 
+++ src/tls/tls_server.c
3 
@@ -377,7 +377,7 @@ TLS_APPL_STATE *tls_server_init(const TL
4 
      */
5 
     tls_check_version();
6
7 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
8 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || OPENSSL_VERSION_NUMBER == 0x20000000L
9
10 
     /*
11 
      * Initialize the OpenSSL library by the book! To start with, we must
12 
@@ -588,7 +588,7 @@ TLS_APPL_STATE *tls_server_init(const TL
13 
     /*
14 
      * 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev
15 
      */
16 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
17 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || OPENSSL_VERSION_NUMBER == 0x20000000L
18
19 
     /*
20 
      * According to OpenSSL documentation, a temporary RSA key is needed when

Return to bug 212223