Attachment 181863 Details for Bug 218727 – conditionally remove gost support

[patch] conditionally remove gost support

opensc_0.16.0_1.diff (text/plain), 1.29 KB, created by Johannes Jost Meixner on 2017-04-18 12:44:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Johannes Jost Meixner

Created: 2017-04-18 12:44:11 UTC

Size: 1.29 KB

patch

obsolete

>diff --git a/security/opensc/Makefile b/security/opensc/Makefile
>index a6b9c622eb64..4da8d3d66f6b 100644
>--- a/security/opensc/Makefile
>+++ b/security/opensc/Makefile
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	opensc
> PORTVERSION=	0.16.0
>+PORTREVISION=	1
> CATEGORIES=	security devel
> MASTER_SITES=	SF/${PORTNAME}/OpenSC/${DISTNAME}
> 
>diff --git a/security/opensc/files/patch-src_pkcs11_openssl.c b/security/opensc/files/patch-src_pkcs11_openssl.c
>new file mode 100644
>index 000000000000..86ca806900fa
>--- /dev/null
>+++ b/security/opensc/files/patch-src_pkcs11_openssl.c
>@@ -0,0 +1,20 @@
>+--- src/pkcs11/openssl.c.orig	2017-04-18 12:36:02 UTC
>++++ src/pkcs11/openssl.c
>+@@ -180,7 +180,7 @@ sc_pkcs11_register_openssl_mechanisms(st
>+ 	e = ENGINE_by_id("gost");
>+ 	if (!e)
>+ 	{
>+-#if !defined(OPENSSL_NO_STATIC_ENGINE) && !defined(OPENSSL_NO_GOST)
>++#if !defined(LIBRESSL_VERSION_NUMBER) && !defined(OPENSSL_NO_STATIC_ENGINE) && !defined(OPENSSL_NO_GOST)
>+ 		ENGINE_load_gost();
>+ 		e = ENGINE_by_id("gost");
>+ #else
>+@@ -195,7 +195,7 @@ sc_pkcs11_register_openssl_mechanisms(st
>+ 			ENGINE_free(e);
>+ 			e = NULL;
>+ 		}
>+-#endif /* !OPENSSL_NO_STATIC_ENGINE && !OPENSSL_NO_GOST */
>++#endif /* !LIBRESSL_VERSION_NUMBER && !OPENSSL_NO_STATIC_ENGINE && !OPENSSL_NO_GOST */
>+ 	}
>+ 	if (e) {
>+ 		ENGINE_set_default(e, ENGINE_METHOD_ALL);

Actions: View | Diff

Attachments on bug 218727: 181863