From cd7a01c34fc4304ef8161ee617568f274ace5d24 Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Sun, 18 Mar 2018 23:13:40 +0100
Subject: Windows: Update libzip to version 1.5.0 that include fixes for some
 security issues.

---
 src/Common/libzip/zipconf.h | 101 ++++++--------------------------------------
 1 file changed, 13 insertions(+), 88 deletions(-)

(limited to 'src/Common/libzip/zipconf.h')

diff --git a/src/Common/libzip/zipconf.h b/src/Common/libzip/zipconf.h
index 3c506aea..e4224da2 100644
--- a/src/Common/libzip/zipconf.h
+++ b/src/Common/libzip/zipconf.h
@@ -1,106 +1,30 @@
+/*
+   This file was generated automatically by C:\dev\prj\Github\VeraCrypt\src\Common\libzip\make_zip_err_str.sh
+   from C:\dev\libraries\libzip\build\config.h; make changes there.
+ */
+
 #ifndef _HAD_ZIPCONF_H
 #define _HAD_ZIPCONF_H
 
-/*
-   zipconf.h -- platform specific include file
+extern const char * const _zip_err_str[];
 
-   This file was generated automatically by CMake
-   based on ../cmake-zipconf.h.in.
- */
+extern const int _zip_nerr_str;
+
+#define N ZIP_ET_NONE
+#define S ZIP_ET_SYS
+#define Z ZIP_ET_ZLIB
 
-/* #undef HAVE_INTTYPES_H_LIBZIP */
-#define HAVE_STDINT_H_LIBZIP
-#define HAVE_SYS_TYPES_H_LIBZIP
-#define HAVE___INT8_LIBZIP
-#define HAVE_INT8_T_LIBZIP
-#define HAVE_UINT8_T_LIBZIP
-#define HAVE___INT16_LIBZIP
-#define HAVE_INT16_T_LIBZIP
-#define HAVE_UINT16_T_LIBZIP
-#define HAVE___INT32_LIBZIP
-#define HAVE_INT32_T_LIBZIP
-#define HAVE_UINT32_T_LIBZIP
-#define HAVE___INT64_LIBZIP
-#define HAVE_INT64_T_LIBZIP
-#define HAVE_UINT64_T_LIBZIP
-/* #undef HAVE_SSIZE_T_LIBZIP */
-#define SHORT_LIBZIP 2
-#define INT_LIBZIP 4
-#define LONG_LIBZIP 4
-#define LONG_LONG_LIBZIP 8
+extern const int _zip_err_type[];
 
-#if defined(HAVE_STDINT_H_LIBZIP)
-#include <stdint.h>
-#elif defined(HAVE_INTTYPES_H_LIBZIP)
-#include <inttypes.h>
-#elif defined(HAVE_SYS_TYPES_H_LIBZIP)
-#include <sys/types.h>
-#endif
 
-#if defined(HAVE_INT8_T_LIBZIP)
-typedef int8_t zip_int8_t;
-#elif defined(HAVE___INT8_LIBZIP)
-typedef __int8 zip_int8_t;
-#else
 typedef signed char zip_int8_t;
-#endif
-#if defined(HAVE_UINT8_T_LIBZIP)
-typedef uint8_t zip_uint8_t;
-#elif defined(HAVE___INT8_LIBZIP)
-typedef unsigned __int8 zip_uint8_t;
-#else
 typedef unsigned char zip_uint8_t;
-#endif
-#if defined(HAVE_INT16_T_LIBZIP)
-typedef int16_t zip_int16_t;
-#elif defined(HAVE___INT16_LIBZIP)
-typedef __int16 zip_int16_t;
-#elif defined(SHORT_LIBZIP) && SHORT_LIBZIP == 2
 typedef signed short zip_int16_t;
-#endif
-#if defined(HAVE_UINT16_T_LIBZIP)
-typedef uint16_t zip_uint16_t;
-#elif defined(HAVE___INT16_LIBZIP)
-typedef unsigned __int16 zip_uint16_t;
-#elif defined(SHORT_LIBZIP) && SHORT_LIBZIP == 2
 typedef unsigned short zip_uint16_t;
-#endif
-#if defined(HAVE_INT32_T_LIBZIP)
-typedef int32_t zip_int32_t;
-#elif defined(HAVE___INT32_LIBZIP)
-typedef __int32 zip_int32_t;
-#elif defined(INT_LIBZIP) && INT_LIBZIP == 4
 typedef signed int zip_int32_t;
-#elif defined(LONG_LIBZIP) && LONG_LIBZIP == 4
-typedef signed long zip_int32_t;
-#endif
-#if defined(HAVE_UINT32_T_LIBZIP)
-typedef uint32_t zip_uint32_t;
-#elif defined(HAVE___INT32_LIBZIP)
-typedef unsigned __int32 zip_uint32_t;
-#elif defined(INT_LIBZIP) && INT_LIBZIP == 4
 typedef unsigned int zip_uint32_t;
-#elif defined(LONG_LIBZIP) && LONG_LIBZIP == 4
-typedef unsigned long zip_uint32_t;
-#endif
-#if defined(HAVE_INT64_T_LIBZIP)
-typedef int64_t zip_int64_t;
-#elif defined(HAVE___INT64_LIBZIP)
-typedef __int64 zip_int64_t;
-#elif defined(LONG_LIBZIP) && LONG_LIBZIP == 8
-typedef signed long zip_int64_t;
-#elif defined(LONG_LONG_LIBZIP) && LONG_LONG_LIBZIP == 8
 typedef signed long long zip_int64_t;
-#endif
-#if defined(HAVE_UINT64_T_LIBZIP)
-typedef uint64_t zip_uint64_t;
-#elif defined(HAVE___INT64_LIBZIP)
-typedef unsigned __int64 zip_uint64_t;
-#elif defined(LONG_LIBZIP) && LONG_LONG_LIBZIP == 8
-typedef unsigned long zip_uint64_t;
-#elif defined(LONG_LONG_LIBZIP) && LONG_LONG_LIBZIP == 8
 typedef unsigned long long zip_uint64_t;
-#endif
 
 #define ZIP_INT8_MIN	-0x80
 #define ZIP_INT8_MAX	 0x7f
@@ -119,3 +43,4 @@ typedef unsigned long long zip_uint64_t;
 #define ZIP_UINT64_MAX	 0xffffffffffffffffULL
 
 #endif /* zipconf.h */
+
-- 
cgit v1.2.3