Merge pull request sqlcipher#229 from Pinkbyte/libressl-build-fix2

sjlombardo · web-flow · commit 15fb88f37b5b · 2017-07-10T08:48:27.000-04:00
Fix building with libressl
diff --git a/src/crypto_openssl.c b/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
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
 static HMAC_CTX *HMAC_CTX_new(void)
 {
   HMAC_CTX *ctx = OPENSSL_malloc(sizeof(*ctx));

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ static unsigned int openssl_external_init = 0;`
`47`	`47`	`static unsigned int openssl_init_count = 0;`
`48`	`48`	`static sqlite3_mutex* openssl_rand_mutex = NULL;`
`49`	`49`
`50`		`-#if OPENSSL_VERSION_NUMBER < 0x10100000L`
	`50`	`+#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)`
`51`	`51`	`static HMAC_CTX *HMAC_CTX_new(void)`
`52`	`52`	`{`
`53`	`53`	`HMAC_CTX ctx = OPENSSL_malloc(sizeof(ctx));`