blob: 06552942e945c83b5b424fe022965739515b9687 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
From 64542c8c5cb3ad9249fa353ff4472c405057d743 Mon Sep 17 00:00:00 2001
From: Stefan Strogin <stefan.strogin@gmail.com>
Date: Mon, 25 Mar 2019 18:07:13 +0200
Subject: [PATCH] #3505 Fix compilation with LibreSSL >=2.7.0
HMAC_CTX_{new,free} were provided by LibreSSL 2.7.0.
Do not redefine them, otherwise it breaks compilation.
Upstream-Status: Accepted
[https://github.com/pawelsalawa/sqlitestudio/pull/3507]
Signed-off-by: Stefan Strogin <stefan.strogin@gmail.com>
---
Plugins/DbSqliteCipher/sqlcipher.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Plugins/DbSqliteCipher/sqlcipher.c b/Plugins/DbSqliteCipher/sqlcipher.c
index 4918cb6f..10c4e5a3 100644
--- a/Plugins/DbSqliteCipher/sqlcipher.c
+++ b/Plugins/DbSqliteCipher/sqlcipher.c
@@ -21638,7 +21638,8 @@ static unsigned int openssl_external_init = 0;
static unsigned int openssl_init_count = 0;
static sqlcipher_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 < 0x2070000fL)
static HMAC_CTX *HMAC_CTX_new(void)
{
HMAC_CTX *ctx = OPENSSL_malloc(sizeof(*ctx));
--
2.21.0
|
GitWeb
