From: Tobias Stoeckmann <tobias@stoeckmann.org>
Date: Fri, 23 May 2025 17:33:53 +0000 (+0200)
Subject: Set ARCHIVE_CRYPTOR_USE_WINCRYPT for WinCrypt
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2630%2Fhead;p=thirdparty%2Flibarchive.git

Set ARCHIVE_CRYPTOR_USE_WINCRYPT for WinCrypt

If WinCrypt is used, actually set ARCHIVE_CRYPTOR_USE_WINCRYPT
for version details output.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
---

diff --git a/libarchive/archive_cryptor_private.h b/libarchive/archive_cryptor_private.h
index 460d38c12..4b3c6c161 100644
--- a/libarchive/archive_cryptor_private.h
+++ b/libarchive/archive_cryptor_private.h
@@ -144,6 +144,10 @@ typedef struct {
 
 #else
 
+#if defined(_WIN32) && !defined(__CYGWIN__) && !(defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA)
+#define ARCHIVE_CRYPTOR_USE_WINCRYPT 1
+#endif
+
 #define AES_BLOCK_SIZE	16
 #define AES_MAX_KEY_SIZE 32
 typedef int archive_crypto_ctx;