Attachment 174202 Details for Bug 212223 – svn diff for mail/postfix

[patch] svn diff for mail/postfix

patch-mail_postfix-3.1.2-LibreSSL (text/plain), 6.50 KB, created by Bernard Spil on 2016-08-29 19:14:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2016-08-29 19:14:35 UTC

Size: 6.50 KB

patch

obsolete

>Index: files/patch-src_posttls-finger_posttls-finger.c
>===================================================================
>--- files/patch-src_posttls-finger_posttls-finger.c	(nonexistent)
>+++ files/patch-src_posttls-finger_posttls-finger.c	(working copy)
>@@ -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 || defined(LIBRESSL_VERSION_NUMBER) )
>+ 
>+ /* 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 || defined(LIBRESSL_VERSION_NUMBER) )
>+     ssl_cleanup();
>+ #endif
>+ 
>
>Property changes on: files/patch-src_posttls-finger_posttls-finger.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_tls_tls__client.c
>===================================================================
>--- files/patch-src_tls_tls__client.c	(nonexistent)
>+++ files/patch-src_tls_tls__client.c	(working copy)
>@@ -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 || defined(LIBRESSL_VERSION_NUMBER)
>+ 
>+     /*
>+      * 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 || defined(LIBRESSL_VERSION_NUMBER)
>+ 
>+     /*
>+      * According to the OpenSSL documentation, temporary RSA key is needed
>
>Property changes on: files/patch-src_tls_tls__client.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_tls_tls__dane.c
>===================================================================
>--- files/patch-src_tls_tls__dane.c	(nonexistent)
>+++ files/patch-src_tls_tls__dane.c	(working copy)
>@@ -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 || defined(LIBRESS_VERSION_NUMBER)
>+     SSL_load_error_strings();
>+     SSL_library_init();
>+ #endif
>
>Property changes on: files/patch-src_tls_tls__dane.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_tls_tls__rsa.c
>===================================================================
>--- files/patch-src_tls_tls__rsa.c	(nonexistent)
>+++ files/patch-src_tls_tls__rsa.c	(working copy)
>@@ -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 || defined(LIBRESSL_VERSION_NUMBER)
>+ 
>+ /* 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 || defined(LIBRESSL_VERSION_NUMBER)
>+     RSA    *rsa;
>+ 
>+     msg_vstream_init(argv[0], VSTREAM_ERR);
>
>Property changes on: files/patch-src_tls_tls__rsa.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_tls_tls__server.c
>===================================================================
>--- files/patch-src_tls_tls__server.c	(nonexistent)
>+++ files/patch-src_tls_tls__server.c	(working copy)
>@@ -0,0 +1,29 @@
>+--- src/tls/tls_server.c.orig	2016-08-27 20:27:50 UTC
>++++ src/tls/tls_server.c
>+@@ -174,7 +174,7 @@ static const char server_session_id_cont
>+ #endif					/* OPENSSL_VERSION_NUMBER */
>+ 
>+  /* OpenSSL 1.1.0 bitrot */
>+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
>++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
>+ typedef const unsigned char *session_id_t;
>+ 
>+ #else
>+@@ -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 && defined(LIBRESSL_VERSION_NUMBER)
>+ 
>+     /*
>+      * 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 || defined(LIBRESSL_VERSION_NUMBER)
>+ 
>+     /*
>+      * According to OpenSSL documentation, a temporary RSA key is needed when
>
>Property changes on: files/patch-src_tls_tls__server.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

brnrd: maintainer-approval? (ohauer)

Actions: View | Diff

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