Merge pull request libgit2#6340 from vishwin/main

ethomson · web-flow · commit c2dc51e81215 · 2022-07-06T23:14:17.000-04:00
ntlmclient: LibreSSL 3.5 removed HMAC_CTX_cleanup
diff --git a/deps/ntlmclient/crypt_openssl.c b/deps/ntlmclient/crypt_openssl.c
@@ -44,7 +44,9 @@ static inline void HMAC_CTX_free(HMAC_CTX *ctx)
 
 #endif
 
-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !LIBRESSL_VERSION_NUMBER) || defined(CRYPT_OPENSSL_DYNAMIC)
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) || \
+	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x03050000fL) || \
+	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,9 @@ static inline void HMAC_CTX_free(HMAC_CTX *ctx)`
`44`	`44`
`45`	`45`	`#endif`
`46`	`46`
`47`		`-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !LIBRESSL_VERSION_NUMBER) \|\| defined(CRYPT_OPENSSL_DYNAMIC)`
	`47`	`+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) \|\| \`
	`48`	`+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x03050000fL) \|\| \`
	`49`	`+ defined(CRYPT_OPENSSL_DYNAMIC)`
`48`	`50`
`49`	`51`	`static inline void HMAC_CTX_cleanup(HMAC_CTX *ctx)`
`50`	`52`	`{`