Attachment #181863 for bug #218727

View | Details | Raw Unified | Return to bug 218727
Collapse All | Expand All

Lines 3-8 Link Here

(-)b/security/opensc/Makefile (+1 lines)
3		3
4	PORTNAME= opensc	4	PORTNAME= opensc
5	PORTVERSION= 0.16.0	5	PORTVERSION= 0.16.0
		6	PORTREVISION= 1
6	CATEGORIES= security devel	7	CATEGORIES= security devel
7	MASTER_SITES= SF/${PORTNAME}/OpenSC/${DISTNAME}	8	MASTER_SITES= SF/${PORTNAME}/OpenSC/${DISTNAME}
8		9




--- 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);

Return to bug 218727

Added Link Here

(-)b/security/opensc/files/patch-src_pkcs11_openssl.c (+20 lines)
1	--- src/pkcs11/openssl.c.orig 2017-04-18 12:36:02 UTC
2	+++ src/pkcs11/openssl.c
3	@@ -180,7 +180,7 @@ sc_pkcs11_register_openssl_mechanisms(st
4	e = ENGINE_by_id("gost");
5	if (!e)
6	{
7	-#if !defined(OPENSSL_NO_STATIC_ENGINE) && !defined(OPENSSL_NO_GOST)
8	+#if !defined(LIBRESSL_VERSION_NUMBER) && !defined(OPENSSL_NO_STATIC_ENGINE) && !defined(OPENSSL_NO_GOST)
9	ENGINE_load_gost();
10	e = ENGINE_by_id("gost");
11	#else
12	@@ -195,7 +195,7 @@ sc_pkcs11_register_openssl_mechanisms(st
13	ENGINE_free(e);
14	e = NULL;
15	}
16	-#endif /* !OPENSSL_NO_STATIC_ENGINE && !OPENSSL_NO_GOST */
17	+#endif /* !LIBRESSL_VERSION_NUMBER && !OPENSSL_NO_STATIC_ENGINE && !OPENSSL_NO_GOST */
18	}
19	if (e) {
20	ENGINE_set_default(e, ENGINE_METHOD_ALL);