Attachment 194092 Details for Bug 224148 – svn diff for security/stunnel

[patch] svn diff for security/stunnel

patch-security_stunnel-LibreSSL2.7 (text/plain), 2.27 KB, created by Bernard Spil on 2018-06-09 09:20:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2018-06-09 09:20:52 UTC

Size: 2.27 KB

patch

obsolete

>Index: security/stunnel/files/patch-src_common.h
>===================================================================
>--- security/stunnel/files/patch-src_common.h	(nonexistent)
>+++ security/stunnel/files/patch-src_common.h	(working copy)
>@@ -0,0 +1,18 @@
>+--- src/common.h.orig	2017-01-02 14:27:26 UTC
>++++ src/common.h
>+@@ -415,6 +415,15 @@ extern char *sys_errlist[];
>+ /* opensslv.h requires prior opensslconf.h to include -fips in version string */
>+ #include <openssl/opensslv.h>
>+ 
>++#ifdef LIBRESSL_VERSION_NUMBER
>++#undef OPENSSL_VERSION_NUMBER
>++#if LIBRESSL_VERSION_NUMBER >= 0x2070000fL
>++#define OPENSSL_VERSION_NUMBER 0x10100000L
>++#else
>++#define OPENSSL_VERSION_NUMBER 0x1000107fL
>++#endif
>++#endif
>++
>+ #if OPENSSL_VERSION_NUMBER<0x0090700fL
>+ #error OpenSSL 0.9.7 or later is required
>+ #endif /* OpenSSL older than 0.9.7 */
>
>Property changes on: security/stunnel/files/patch-src_common.h
>___________________________________________________________________
>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: security/stunnel/files/patch-src_ctx.c
>===================================================================
>--- security/stunnel/files/patch-src_ctx.c	(nonexistent)
>+++ security/stunnel/files/patch-src_ctx.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/ctx.c.orig	2018-04-03 17:45:50 UTC
>++++ src/ctx.c
>+@@ -398,7 +398,7 @@ NOEXPORT int ecdh_init(SERVICE_OPTIONS *
>+ /**************************************** initialize OpenSSL CONF */
>+ 
>+ NOEXPORT int conf_init(SERVICE_OPTIONS *section) {
>+-#if OPENSSL_VERSION_NUMBER>=0x10002000L
>++#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
>+     SSL_CONF_CTX *cctx;
>+     NAME_LIST *curr;
>+     char *cmd, *param;
>
>Property changes on: security/stunnel/files/patch-src_ctx.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:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 224148: 188593 | 194092 | 194951 | 206956 | 211224