commit d231403e8c781ec260f1ebfcf69631a8c1eab51d
author Thomas Klausner <tk@giga.or.at> Sun Mar 29 13:31:42 2020 +0200
committer Thomas Klausner <tk@giga.or.at> Sun Mar 29 13:31:42 2020 +0200
tree 2c162c1d597322b35498cd34b1840922c75ce512
parent 0bdfd6a2943d8c6cc68a3ab83afa0d572a3aecd3

Move ZIP_CRYPTO_PKWARE_HEADERLEN to zipint.h.

Fixes build without AES support.

lib/zip_crypto.h

diff --git a/lib/zip_crypto.h b/lib/zip_crypto.h
index 0706a02..f46c7d8 100644
--- a/lib/zip_crypto.h
+++ b/lib/zip_crypto.h
@@ -37,8 +37,6 @@
 #define ZIP_CRYPTO_SHA1_LENGTH 20
 #define ZIP_CRYPTO_AES_BLOCK_LENGTH 16
 
-#define ZIP_CRYPTO_PKWARE_HEADERLEN 12
-
 #if defined(HAVE_WINDOWS_CRYPTO)
 #include "zip_crypto_win.h"
 #elif defined(HAVE_COMMONCRYPTO)

lib/zip_pkware.c

diff --git a/lib/zip_pkware.c b/lib/zip_pkware.c
index afb0d30..def627c 100644
--- a/lib/zip_pkware.c
+++ b/lib/zip_pkware.c
@@ -37,9 +37,6 @@
 
 #include "zipint.h"
 
-#include "zip_crypto.h"
-
-
 #define PKWARE_KEY0 305419896
 #define PKWARE_KEY1 591751049
 #define PKWARE_KEY2 878082192

lib/zip_source_pkware_decode.c

diff --git a/lib/zip_source_pkware_decode.c b/lib/zip_source_pkware_decode.c
index a7224ea..d5489a5 100644
--- a/lib/zip_source_pkware_decode.c
+++ b/lib/zip_source_pkware_decode.c
@@ -37,9 +37,6 @@
 
 #include "zipint.h"
 
-#include "zip_crypto.h"
-
-
 struct trad_pkware {
     char *password;
     zip_pkware_keys_t keys;

lib/zip_source_pkware_encode.c

diff --git a/lib/zip_source_pkware_encode.c b/lib/zip_source_pkware_encode.c
index f2423d9..5516bad 100644
--- a/lib/zip_source_pkware_encode.c
+++ b/lib/zip_source_pkware_encode.c
@@ -37,8 +37,6 @@
 
 #include "zipint.h"
 
-#include "zip_crypto.h"
-
 struct trad_pkware {
     char *password;
     zip_pkware_keys_t keys;

lib/zipint.h

diff --git a/lib/zipint.h b/lib/zipint.h
index 52f418c..127d532 100644
--- a/lib/zipint.h
+++ b/lib/zipint.h
@@ -71,6 +71,8 @@
 #define EF_WINZIP_AES_SIZE 7
 #define MAX_DATA_DESCRIPTOR_LENGTH 24
 
+#define ZIP_CRYPTO_PKWARE_HEADERLEN 12
+
 #define ZIP_CM_REPLACED_DEFAULT (-2)
 #define ZIP_CM_WINZIP_AES 99 /* Winzip AES encrypted */