commit b61c47e0b1bcff09ae1b565c30c9fdc05963a55a
author Thomas Klausner <tk@giga.or.at> Mon Dec 14 15:21:44 2020 +0100
committer GitHub <noreply@github.com> Mon Dec 14 15:21:44 2020 +0100
tree 0f5df351f7177e09dbb2c5c94c5bd475e4e85464
parent 159b94530e4af364fb859b9fea7207b698b09562
parent f2933c1860d4cbe28d782a7f9fc8d057ae6ee9be

Merge pull request #225 from boaz001/patch-1

Move variable declaration to support old compiler

lib/zip_crypto_win.c

diff --git a/lib/zip_crypto_win.c b/lib/zip_crypto_win.c
index a6bdc0d..663c894 100644
--- a/lib/zip_crypto_win.c
+++ b/lib/zip_crypto_win.c
@@ -31,6 +31,7 @@
   IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #include <stdlib.h>
+#include <limits.h>
 
 #include "zipint.h"
 
@@ -89,12 +90,13 @@
 bool
 _zip_crypto_pbkdf2(const zip_uint8_t *key, zip_uint64_t key_length, const zip_uint8_t *salt, zip_uint16_t salt_length, zip_uint16_t iterations, zip_uint8_t *output, zip_uint16_t output_length) {
     BCRYPT_ALG_HANDLE hAlgorithm = NULL;
+    bool result;
 
     if (!BCRYPT_SUCCESS(BCryptOpenAlgorithmProvider(&hAlgorithm, BCRYPT_SHA1_ALGORITHM, NULL, BCRYPT_ALG_HANDLE_HMAC_FLAG))) {
         return false;
     }
 
-    bool result = BCRYPT_SUCCESS(BCryptDeriveKeyPBKDF2(hAlgorithm, (PUCHAR)key, (ULONG)key_length, (PUCHAR)salt, salt_length, iterations, output, output_length, 0));
+    result = BCRYPT_SUCCESS(BCryptDeriveKeyPBKDF2(hAlgorithm, (PUCHAR)key, (ULONG)key_length, (PUCHAR)salt, salt_length, iterations, output, output_length, 0));
 
     BCryptCloseAlgorithmProvider(hAlgorithm, 0);