Merge pull request libgit2#6157 from boretrk/hmac_ctx_cleanup

ethomson · web-flow · commit 82f526a91293 · 2022-01-04T22:46:10.000-05:00
ntmlclient: fix linking with libressl
diff --git a/deps/ntlmclient/crypt_openssl.c b/deps/ntlmclient/crypt_openssl.c
@@ -44,7 +44,7 @@ static inline void HMAC_CTX_free(HMAC_CTX *ctx)
 
 #endif
 
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(CRYPT_OPENSSL_DYNAMIC)
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !LIBRESSL_VERSION_NUMBER) || defined(CRYPT_OPENSSL_DYNAMIC)
 
 static inline void HMAC_CTX_cleanup(HMAC_CTX *ctx)
 {

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ static inline void HMAC_CTX_free(HMAC_CTX *ctx)`
`44`	`44`
`45`	`45`	`#endif`
`46`	`46`
`47`		`-#if OPENSSL_VERSION_NUMBER >= 0x10100000L \|\| defined(CRYPT_OPENSSL_DYNAMIC)`
	`47`	`+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !LIBRESSL_VERSION_NUMBER) \|\| defined(CRYPT_OPENSSL_DYNAMIC)`
`48`	`48`
`49`	`49`	`static inline void HMAC_CTX_cleanup(HMAC_CTX *ctx)`
`50`	`50`	`{`