FreeBSD Bugzilla – Attachment 205486 Details for
Bug 233777
security/softhsm2: Fails to build with OpenSSL 1.1.x / LibreSSL
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
improved patch
softhsm2-2.5.0_2.diff (text/plain), 1.75 KB, created by
Jaap Akkerhuis
on 2019-07-02 18:50:55 UTC
(
hide
)
Description:
improved patch
Filename:
MIME Type:
Creator:
Jaap Akkerhuis
Created:
2019-07-02 18:50:55 UTC
Size:
1.75 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 505671) >+++ Makefile (working copy) >@@ -3,7 +3,7 @@ > > PORTNAME= softhsm > PORTVERSION= 2.5.0 >-PORTREVISION= 1 >+PORTREVISION= 2 > CATEGORIES= security > MASTER_SITES= http://dist.opendnssec.org/source/ \ > http://dist.opendnssec.org/source/testing/ >@@ -48,7 +48,7 @@ > CRYP_BOTAN_CONFIGURE_ON= --with-crypto-backend=botan > CRYP_BOTAN_LIB_DEPENDS= libbotan-1.10.so:security/botan110 > >-CRYP_OPEN_CONFIGURE_ON= --with-crypto-backend=openssl >+CRYP_OPEN_CONFIGURE_ON= --with-crypto-backend=openssl --with-openssl=${OPENSSLBASE} > > .include <bsd.port.options.mk> > >Index: files/patch-src_lib_crypto_OSSLCryptoFactory.cpp >=================================================================== >--- files/patch-src_lib_crypto_OSSLCryptoFactory.cpp (nonexistent) >+++ files/patch-src_lib_crypto_OSSLCryptoFactory.cpp (working copy) >@@ -0,0 +1,13 @@ >+--- 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 > >Property changes on: files/patch-src_lib_crypto_OSSLCryptoFactory.cpp >___________________________________________________________________ >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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
jaap
:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 233777
:
199815
|
199821
| 205486