svn commit: r472199 - head/databases/sqlcipher/files
Bernard Spil
brnrd at FreeBSD.org
Mon Jun 11 18:35:26 UTC 2018
Author: brnrd
Date: Mon Jun 11 18:35:25 2018
New Revision: 472199
URL: https://svnweb.freebsd.org/changeset/ports/472199
Log:
databases/sqlcipher: Fix build with LibreSSL 2.7
- LibreSSL 2.7 adds OpenSSL 1.1 ABI
PR: 228248
Approved by: maintainer (jharris widomaker com)
Added:
head/databases/sqlcipher/files/
head/databases/sqlcipher/files/patch-sqlcipher-libressl-2.7 (contents, props changed)
Added: head/databases/sqlcipher/files/patch-sqlcipher-libressl-2.7
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/sqlcipher/files/patch-sqlcipher-libressl-2.7 Mon Jun 11 18:35:25 2018 (r472199)
@@ -0,0 +1,31 @@
+diff --git a/src/crypto_openssl.c b/src/crypto_openssl.c
+index a45db3b..4344076 100644
+--- src/crypto_openssl.c.orig
++++ src/crypto_openssl.c
+@@ -47,7 +47,7 @@ static unsigned int openssl_external_init = 0;
+ static unsigned int openssl_init_count = 0;
+ static sqlite3_mutex* openssl_rand_mutex = NULL;
+
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000)
+ static HMAC_CTX *HMAC_CTX_new(void)
+ {
+ HMAC_CTX *ctx = OPENSSL_malloc(sizeof(*ctx));
+@@ -117,7 +117,7 @@ static int sqlcipher_openssl_activate(void *ctx) {
+
+ if(openssl_init_count == 0 && openssl_external_init == 0) {
+ /* if the library was not externally initialized, then should be now */
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000)
+ OpenSSL_add_all_algorithms();
+ #endif
+ }
+@@ -154,7 +154,7 @@ static int sqlcipher_openssl_deactivate(void *ctx) {
+ Note: this code will only be reached if OpensSSL_add_all_algorithms()
+ is called by SQLCipher internally. This should prevent SQLCipher from
+ "cleaning up" openssl when it was initialized externally by the program */
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000)
+ EVP_cleanup();
+ #endif
+ } else {
More information about the svn-ports-all
mailing list