Merge pull request #2966 from solbjorn/win-crypt-unforce

libarchive: fix Windows compilation with `ENABLE_CNG=OFF`
(cherry picked from commit d8ca779e4d)

libarchive/archive_random.c

@@ -57,7 +57,7 @@ static void la_arc4random_buf(void *, size_t);
 #include "archive.h"
 #include "archive_random_private.h"
 
-#if defined(_WIN32) && !defined(__CYGWIN__) && defined(HAVE_BCRYPT_H)
+#if defined(_WIN32) && !defined(__CYGWIN__)
 #include <bcrypt.h>
 
 /* Common in other bcrypt implementations, but missing from VS2008. */

libarchive/archive_util.c

@@ -42,7 +42,6 @@
 #include <string.h>
 #endif
 #if defined(_WIN32) && !defined(__CYGWIN__)
-#if defined(HAVE_BCRYPT_H)
 #include <bcrypt.h>
 
 /* Common in other bcrypt implementations, but missing from VS2008. */
@@ -50,7 +49,6 @@
 #define BCRYPT_SUCCESS(r) ((NTSTATUS)(r) == STATUS_SUCCESS)
 #endif
 #endif
-#endif
 #ifdef HAVE_ZLIB_H
 #include <zlib.h>
 #endif