Attachment 174199 Details for Bug 212223 – quick&dirty patch

[patch] quick&dirty patch

postfix_new.diff (text/plain), 5.46 KB, created by Markus Kohlmeyer on 2016-08-29 18:12:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Kohlmeyer

Created: 2016-08-29 18:12:12 UTC

Size: 5.46 KB

patch

obsolete

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

Actions: View | Diff

Attachments on bug 212223: 174167 | 174175 | 174176 | 174199 | 174202