Attachment #205486 for bug #233777

Lines 3-9 Link Here

(-)Makefile (-2 / +2 lines)
3		3
4	PORTNAME= softhsm	4	PORTNAME= softhsm
5	PORTVERSION= 2.5.0	5	PORTVERSION= 2.5.0
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= security	7	CATEGORIES= security
8	MASTER_SITES= http://dist.opendnssec.org/source/ \	8	MASTER_SITES= http://dist.opendnssec.org/source/ \
9	http://dist.opendnssec.org/source/testing/	9	http://dist.opendnssec.org/source/testing/
Lines 48-54 Link Here
48	CRYP_BOTAN_CONFIGURE_ON= --with-crypto-backend=botan	48	CRYP_BOTAN_CONFIGURE_ON= --with-crypto-backend=botan
49	CRYP_BOTAN_LIB_DEPENDS= libbotan-1.10.so:security/botan110	49	CRYP_BOTAN_LIB_DEPENDS= libbotan-1.10.so:security/botan110
50		50
51	CRYP_OPEN_CONFIGURE_ON= --with-crypto-backend=openssl	51	CRYP_OPEN_CONFIGURE_ON= --with-crypto-backend=openssl --with-openssl=${OPENSSLBASE}
52		52
53	.include <bsd.port.options.mk>	53	.include <bsd.port.options.mk>
54		54




--- src/lib/crypto/OSSLCryptoFactory.cpp.orig	2019-07-02 17:52:44 UTC
+++ src/lib/crypto/OSSLCryptoFactory.cpp
@@ -141,8 +141,10 @@ OSSLCryptoFactory::OSSLCryptoFactory()
 	// Initialise OpenSSL
 	OpenSSL_add_all_algorithms();
 
+#if !( OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) )
 	// Make sure RDRAND is loaded first
 	ENGINE_load_rdrand();
+#endif
 	// Locate the engine
 	rdrand_engine = ENGINE_by_id("rdrand");
 	// Use RDRAND if available

Return to bug 233777

Line 0 Link Here

(-)files/patch-src_lib_crypto_OSSLCryptoFactory.cpp (+13 lines)
	1	--- src/lib/crypto/OSSLCryptoFactory.cpp.orig 2019-07-02 17:52:44 UTC
	2	+++ src/lib/crypto/OSSLCryptoFactory.cpp
	3	@@ -141,8 +141,10 @@ OSSLCryptoFactory::OSSLCryptoFactory()
	4	// Initialise OpenSSL
	5	OpenSSL_add_all_algorithms();
	6
	7	+#if !( OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER) )
	8	// Make sure RDRAND is loaded first
	9	ENGINE_load_rdrand();
	10	+#endif
	11	// Locate the engine
	12	rdrand_engine = ENGINE_by_id("rdrand");
	13	// Use RDRAND if available