c/minizip-ng
1
0
Fork 0
mirror of https://github.com/zlib-ng/minizip-ng synced 2025-03-28 21:13:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modified pkcrypt to use crc32 table from zlib or lzma.

Browse Source
This commit is contained in:
Nathan Moinvaziri 2018-05-23 20:39:12 -07:00
parent b07ab3e9b9
commit 5b204622cc
6 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -14,7 +14,8 @@ To generate the project files for your platform and IDE download and run cmake i
```
cmake .
cmake --build . -DBUILD_TEST=ON
cmake . -DBUILD_TEST=ON
cmake --build .
```
## Build Options

6
mz_strm_lzma.c
View File

@ -407,6 +407,12 @@ static int32_t mz_stream_lzma_crc32(int32_t value, const void *buf, int32_t size
return lzma_crc32(buf, size, value);
}
void *mz_stream_lzma_get_crc32_table(void)
{
extern const uint32_t lzma_crc32_table;
return (void *)lzma_crc32_table;
}
void *mz_stream_lzma_get_crc32_update(void)
{
return (void *)mz_stream_lzma_crc32;

1
mz_strm_lzma.h
View File

@ -36,6 +36,7 @@ void* mz_stream_lzma_create(void **stream);
void mz_stream_lzma_delete(void **stream);
void* mz_stream_lzma_get_interface(void);
void* mz_stream_lzma_get_crc32_table(void);
void* mz_stream_lzma_get_crc32_update(void);
/***************************************************************************/

23
mz_strm_pkcrypt.c
View File

@ -27,12 +27,20 @@
#include <stdlib.h>
#include <string.h>
#ifdef HAVE_ZLIB
#include "zlib.h"
#endif
#include "mz.h"
#include "mz_os.h"
#include "mz_strm.h"
#ifdef HAVE_LZMA
#include "mz_strm_lzma.h"
#endif
#include "mz_strm_pkcrypt.h"
#ifdef HAVE_ZLIB
#include "mz_strm_zlib.h"
#endif
/***************************************************************************/
@ -41,8 +49,12 @@
/***************************************************************************/
// Define z_crc_t in zlib 1.2.5 and less or if using zlib-ng
#if (ZLIB_VERNUM < 0x1270) || defined(ZLIBNG_VERNUM)
#if (ZLIB_VERNUM < 0x1270) || defined(ZLIBNG_VERNUM) || !defined(HAVE_ZLIB)
#ifdef HAVE_ZLIB
typedef unsigned long z_crc_t;
#else
typedef uint32_t z_crc_t;
#endif
#endif
/***************************************************************************/
@ -149,7 +161,14 @@ int32_t mz_stream_pkcrypt_open(void *stream, const char *path, int32_t mode)
if (password == NULL)
return MZ_STREAM_ERROR;
pkcrypt->crc_32_tab = get_crc_table();
#ifdef HAVE_ZLIB
pkcrypt->crc_32_tab = (z_crc_t *)mz_stream_zlib_get_crc32_table();
#elif defined(HAVE_LZMA)
pkcrypt->crc_32_tab = (z_crc_t *)mz_stream_lzma_get_crc32_table();
#else
#error ZLIB or LZMA required for CRC32
#endif
if (pkcrypt->crc_32_tab == NULL)
return MZ_STREAM_ERROR;

5
mz_strm_zlib.c
View File

@ -383,6 +383,11 @@ static int32_t mz_stream_zlib_crc32(int32_t value, const void *buf, int32_t size
return crc32(value, buf, size);
}
void *mz_stream_zlib_get_crc32_table(void)
{
return (void *)get_crc_table();
}
void *mz_stream_zlib_get_crc32_update(void)
{
return (void *)mz_stream_zlib_crc32;

1
mz_strm_zlib.h
View File

@ -36,6 +36,7 @@ void* mz_stream_zlib_create(void **stream);
void mz_stream_zlib_delete(void **stream);
void* mz_stream_zlib_get_interface(void);
void* mz_stream_zlib_get_crc32_table(void);
void* mz_stream_zlib_get_crc32_update(void);
/***************************************************************************/