Attachment 35905 Details for Bug 62346 – Backport r1828222 + r1830522

[patch] Backport r1828222 + r1830522

libressl_compat.diff (text/plain), 3.72 KB, created by Yann Ylavic on 2018-05-02 16:11:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yann Ylavic

Created: 2018-05-02 16:11:40 UTC

Size: 3.72 KB

patch

obsolete

>Index: modules/md/md_crypt.c
>===================================================================
>--- modules/md/md_crypt.c	(revision 1830755)
>+++ modules/md/md_crypt.c	(working copy)
>@@ -471,7 +471,7 @@ apr_status_t md_pkey_gen(md_pkey_t **ppkey, apr_po
>     }
> }
> 
>-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
>+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000f)
> 
> #ifndef NID_tlsfeature
> #define NID_tlsfeature          1020
>Index: modules/ssl/mod_ssl.c
>===================================================================
>--- modules/ssl/mod_ssl.c	(revision 1830755)
>+++ modules/ssl/mod_ssl.c	(working copy)
>@@ -398,7 +398,7 @@ static int ssl_hook_pre_config(apr_pool_t *pconf,
>     /* We must register the library in full, to ensure our configuration
>      * code can successfully test the SSL environment.
>      */
>-#if MODSSL_USE_OPENSSL_PRE_1_1_API
>+#if MODSSL_USE_OPENSSL_PRE_1_1_API || defined(LIBRESSL_VERSION_NUMBER)
>     (void)CRYPTO_malloc_init();
> #else
>     OPENSSL_malloc_init();
>Index: modules/ssl/ssl_engine_init.c
>===================================================================
>--- modules/ssl/ssl_engine_init.c	(revision 1830755)
>+++ modules/ssl/ssl_engine_init.c	(working copy)
>@@ -546,7 +546,8 @@ static apr_status_t ssl_init_ctx_protocol(server_r
>     char *cp;
>     int protocol = mctx->protocol;
>     SSLSrvConfigRec *sc = mySrvConfig(s);
>-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
>+#if OPENSSL_VERSION_NUMBER >= 0x10100000L  && \
>+	(!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x20800000L)
>     int prot;
> #endif
> 
>@@ -616,7 +617,8 @@ static apr_status_t ssl_init_ctx_protocol(server_r
> 
>     SSL_CTX_set_options(ctx, SSL_OP_ALL);
> 
>-#if OPENSSL_VERSION_NUMBER < 0x10100000L
>+#if OPENSSL_VERSION_NUMBER < 0x10100000L  || \
>+	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20800000L)
>     /* always disable SSLv2, as per RFC 6176 */
>     SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2);
> 
>Index: modules/ssl/ssl_private.h
>===================================================================
>--- modules/ssl/ssl_private.h	(revision 1830755)
>+++ modules/ssl/ssl_private.h	(working copy)
>@@ -132,13 +132,14 @@
>         SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MIN_PROTO_VERSION, version, NULL)
> #define SSL_CTX_set_max_proto_version(ctx, version) \
>         SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MAX_PROTO_VERSION, version, NULL)
>-#endif
>-/* LibreSSL declares OPENSSL_VERSION_NUMBER == 2.0 but does not include most
>- * changes from OpenSSL >= 1.1 (new functions, macros, deprecations, ...), so
>- * we have to work around this...
>+#elif LIBRESSL_VERSION_NUMBER < 0x2070000f
>+/* LibreSSL before 2.7 declares OPENSSL_VERSION_NUMBER == 2.0 but does not
>+ * include most changes from OpenSSL >= 1.1 (new functions, macros, 
>+ * deprecations, ...), so we have to work around this...
>  */
> #define MODSSL_USE_OPENSSL_PRE_1_1_API (1)
>-#else
>+#endif /* LIBRESSL_VERSION_NUMBER < 0x2060000f */
>+#else /* defined(LIBRESSL_VERSION_NUMBER) */
> #define MODSSL_USE_OPENSSL_PRE_1_1_API (OPENSSL_VERSION_NUMBER < 0x10100000L)
> #endif
> 
>@@ -238,7 +239,8 @@ void init_bio_methods(void);
> void free_bio_methods(void);
> #endif
> 
>-#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
>+#if OPENSSL_VERSION_NUMBER < 0x10002000L || \
>+	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000f)
> #define X509_STORE_CTX_get0_store(x) (x->ctx)
> #endif
> 
>Index: .
>===================================================================
>--- .	(revision 1830755)
>+++ .	(working copy)
>
>Property changes on: .
>___________________________________________________________________
>Modified: svn:mergeinfo
>## -0,0 +0,1 ##
>   Merged /httpd/httpd/trunk:r1828222,1830522

Actions: View | Diff

Attachments on bug 62346: 35905