Attachment 206186 Details for Bug 239491 – Patch to exclude openssl functions not supported by LibreSSL

[patch] Patch to exclude openssl functions not supported by LibreSSL

strongswan-Bug_239491.diff (text/plain), 5.42 KB, created by Francois ten Krooden on 2019-08-01 07:10:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Francois ten Krooden

Created: 2019-08-01 07:10:32 UTC

Size: 5.42 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 507538)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	strongswan
> PORTVERSION=	5.8.0
>+PORTREVISION=	1
> CATEGORIES=	security
> MASTER_SITES=	http://download.strongswan.org/ \
> 		http://download2.strongswan.org/
>Index: files/patch-src_libstrongswan_plugins_openssl_openssl__ed__private__key.c
>===================================================================
>--- files/patch-src_libstrongswan_plugins_openssl_openssl__ed__private__key.c	(nonexistent)
>+++ files/patch-src_libstrongswan_plugins_openssl_openssl__ed__private__key.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/libstrongswan/plugins/openssl/openssl_ed_private_key.c.orig	2019-07-31 10:17:06 UTC
>++++ src/libstrongswan/plugins/openssl/openssl_ed_private_key.c
>+@@ -15,7 +15,7 @@
>+ 
>+ #include <openssl/evp.h>
>+ 
>+-#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_EC)
>++#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_EC) && !defined(LIBRESSL_VERSION_NUMBER)
>+ 
>+ #include "openssl_ed_private_key.h"
>+ 
>
>Property changes on: files/patch-src_libstrongswan_plugins_openssl_openssl__ed__private__key.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_libstrongswan_plugins_openssl_openssl__ed__public__key.c
>===================================================================
>--- files/patch-src_libstrongswan_plugins_openssl_openssl__ed__public__key.c	(nonexistent)
>+++ files/patch-src_libstrongswan_plugins_openssl_openssl__ed__public__key.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/libstrongswan/plugins/openssl/openssl_ed_public_key.c.orig	2019-07-31 10:17:19 UTC
>++++ src/libstrongswan/plugins/openssl/openssl_ed_public_key.c
>+@@ -15,7 +15,7 @@
>+ 
>+ #include <openssl/evp.h>
>+ 
>+-#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_EC)
>++#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_EC) && !defined(LIBRESSL_VERSION_NUMBER)
>+ 
>+ #include <openssl/x509.h>
>+ 
>
>Property changes on: files/patch-src_libstrongswan_plugins_openssl_openssl__ed__public__key.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_libstrongswan_plugins_openssl_openssl__plugin.c
>===================================================================
>--- files/patch-src_libstrongswan_plugins_openssl_openssl__plugin.c	(revision 507538)
>+++ files/patch-src_libstrongswan_plugins_openssl_openssl__plugin.c	(working copy)
>@@ -1,6 +1,24 @@
>---- src/libstrongswan/plugins/openssl/openssl_plugin.c.orig	2018-12-14 15:48:24 UTC
>+--- src/libstrongswan/plugins/openssl/openssl_plugin.c.orig	2019-03-14 13:20:42 UTC
> +++ src/libstrongswan/plugins/openssl/openssl_plugin.c
>-@@ -810,7 +810,7 @@ plugin_t *openssl_plugin_create()
>+@@ -310,7 +310,7 @@ static private_key_t *openssl_private_key_load(key_typ
>+ 				case EVP_PKEY_EC:
>+ 					return openssl_ec_private_key_create(key, FALSE);
>+ #endif
>+-#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_EC)
>++#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_EC) && !defined(LIBRESSL_VERSION_NUMBER)
>+ 				case EVP_PKEY_ED25519:
>+ 				case EVP_PKEY_ED448:
>+ 					return openssl_ed_private_key_create(key, FALSE);
>+@@ -462,7 +462,7 @@ static private_key_t *openssl_private_key_connect(key_
>+ 		case EVP_PKEY_EC:
>+ 			return openssl_ec_private_key_create(key, TRUE);
>+ #endif
>+-#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_EC)
>++#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_EC) && !defined(LIBRESSL_VERSION_NUMBER)
>+ 		case EVP_PKEY_ED25519:
>+ 		case EVP_PKEY_ED448:
>+ 			return openssl_ed_private_key_create(key, TRUE);
>+@@ -814,7 +814,7 @@ plugin_t *openssl_plugin_create()
>  		},
>  	);
>  
>Index: files/patch-src_libstrongswan_plugins_openssl_openssl__x__diffie__hellman.c
>===================================================================
>--- files/patch-src_libstrongswan_plugins_openssl_openssl__x__diffie__hellman.c	(nonexistent)
>+++ files/patch-src_libstrongswan_plugins_openssl_openssl__x__diffie__hellman.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/libstrongswan/plugins/openssl/openssl_x_diffie_hellman.c.orig	2019-07-31 10:16:04 UTC
>++++ src/libstrongswan/plugins/openssl/openssl_x_diffie_hellman.c
>+@@ -17,7 +17,7 @@
>+ 
>+ /* basic support for X25519 was added with 1.1.0a, but we require features (e.g.
>+  * to load the keys) that were only added with 1.1.1 */
>+-#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_ECDH)
>++#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_ECDH) && !defined(LIBRESSL_VERSION_NUMBER)
>+ 
>+ #include "openssl_x_diffie_hellman.h"
>+ 
>
>Property changes on: files/patch-src_libstrongswan_plugins_openssl_openssl__x__diffie__hellman.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

Actions: View | Diff

Attachments on bug 239491: 206113 | 206186