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

change aes include paths to work with xcode (thx dale jefferson)

Browse Source 
fixed via ace is not possible on apple and causes a crash (thx dale jefferson)
moved entropy function into aes library with untested entropy function for linux/apple
added aes files to miniunz.vcproj and minizip.vcproj
This commit is contained in:
Nathan Moinvaziri 2013-02-11 23:22:08 -07:00
parent 8628204eaf
commit 887bf5f676
6 changed files with 248 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
aes/aesopt.h
View File

@ -165,7 +165,8 @@ Issue Date: 20/12/2007
#if defined( __GNUC__ ) && defined( __i386__ ) \
|| defined( _WIN32 ) && defined( _M_IX86 ) \
&& !(defined( _WIN64 ) || defined( _WIN32_WCE ) || defined( _MSC_VER ) && ( _MSC_VER <= 800 ))
&& !(defined( _WIN64 ) || defined( _WIN32_WCE ) || defined( _MSC_VER ) && ( _MSC_VER <= 800 )) \
&& !defined(__APPLE__)
# define VIA_ACE_POSSIBLE
#endif

50
aes/entropy.c Normal file
View File

@ -0,0 +1,50 @@
#ifdef _WIN32
#include <windows.h>
#endif
#if defined(__cplusplus)
extern "C"
{
#endif
#ifdef _WIN32
int entropy_fun(unsigned char buf[], unsigned int len)
{
HCRYPTPROV provider;
unsigned __int64 pentium_tsc[1];
unsigned int i;
int result = 0;
if (CryptAcquireContext(&provider, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT | CRYPT_SILENT))
{
result = CryptGenRandom(provider, len, buf);
CryptReleaseContext(provider, 0);
if (result)
return len;
}
QueryPerformanceCounter((LARGE_INTEGER *)pentium_tsc);
for(i = 0; i < 8 && i < len; ++i)
buf[i] = ((unsigned char*)pentium_tsc)[i];
return i;
}
#else
int entropy_fun(unsigned char buf[], unsigned int len)
{
int frand = open("/dev/random", O_RDONLY);
int rlen = 0;
if (frand != -1)
{
rlen = read(frand, buf, len);
close(frand);
}
return rlen;
}
#endif
#if defined(__cplusplus)
}
#endif

16
aes/entropy.h Normal file
View File

@ -0,0 +1,16 @@
#ifndef _ENTROPY_FUN_H
#define _ENTROPY_FUN_H
#if defined(__cplusplus)
extern "C"
{
#endif
int entropy_fun(unsigned char buf[], unsigned int len);
#if defined(__cplusplus)
}
#endif
#endif

88
miniunz.vcproj
View File

@ -296,6 +296,94 @@
>
</File>
</Filter>
<Filter
Name="AES"
>
<File
RelativePath=".\aes\aes.h"
>
</File>
<File
RelativePath=".\aes\aes_via_ace.h"
>
</File>
<File
RelativePath=".\aes\aescrypt.c"
>
</File>
<File
RelativePath=".\aes\aeskey.c"
>
</File>
<File
RelativePath=".\aes\aesopt.h"
>
</File>
<File
RelativePath=".\aes\aestab.c"
>
</File>
<File
RelativePath=".\aes\aestab.h"
>
</File>
<File
RelativePath=".\aes\brg_endian.h"
>
</File>
<File
RelativePath=".\aes\brg_types.h"
>
</File>
<File
RelativePath=".\aes\entropy.c"
>
</File>
<File
RelativePath=".\aes\entropy.h"
>
</File>
<File
RelativePath=".\aes\fileenc.c"
>
</File>
<File
RelativePath=".\aes\fileenc.h"
>
</File>
<File
RelativePath=".\aes\hmac.c"
>
</File>
<File
RelativePath=".\aes\hmac.h"
>
</File>
<File
RelativePath=".\aes\prng.c"
>
</File>
<File
RelativePath=".\aes\prng.h"
>
</File>
<File
RelativePath=".\aes\pwd2key.c"
>
</File>
<File
RelativePath=".\aes\pwd2key.h"
>
</File>
<File
RelativePath=".\aes\sha1.c"
>
</File>
<File
RelativePath=".\aes\sha1.h"
>
</File>
</Filter>
</Files>
<Globals>
</Globals>

88
minizip.vcproj
View File

@ -296,6 +296,94 @@
>
</File>
</Filter>
<Filter
Name="AES"
>
<File
RelativePath=".\aes\aes.h"
>
</File>
<File
RelativePath=".\aes\aes_via_ace.h"
>
</File>
<File
RelativePath=".\aes\aescrypt.c"
>
</File>
<File
RelativePath=".\aes\aeskey.c"
>
</File>
<File
RelativePath=".\aes\aesopt.h"
>
</File>
<File
RelativePath=".\aes\aestab.c"
>
</File>
<File
RelativePath=".\aes\aestab.h"
>
</File>
<File
RelativePath=".\aes\brg_endian.h"
>
</File>
<File
RelativePath=".\aes\brg_types.h"
>
</File>
<File
RelativePath=".\aes\entropy.c"
>
</File>
<File
RelativePath=".\aes\entropy.h"
>
</File>
<File
RelativePath=".\aes\fileenc.c"
>
</File>
<File
RelativePath=".\aes\fileenc.h"
>
</File>
<File
RelativePath=".\aes\hmac.c"
>
</File>
<File
RelativePath=".\aes\hmac.h"
>
</File>
<File
RelativePath=".\aes\prng.c"
>
</File>
<File
RelativePath=".\aes\prng.h"
>
</File>
<File
RelativePath=".\aes\pwd2key.c"
>
</File>
<File
RelativePath=".\aes\pwd2key.h"
>
</File>
<File
RelativePath=".\aes\sha1.c"
>
</File>
<File
RelativePath=".\aes\sha1.h"
>
</File>
</Filter>
</Files>
<Globals>
</Globals>

22
zip.c
View File

@ -55,9 +55,10 @@
#define AES_VERSION (0x0001)
#define AES_ENCRYPTIONMODE (0x03)
#include "aes\\aes.h"
#include "aes\\fileenc.h"
#include "aes\\prng.h"
#include "aes/aes.h"
#include "aes/fileenc.h"
#include "aes/prng.h"
#include "aes/entropy.h"
#endif
#ifndef NOCRYPT
@ -196,21 +197,6 @@ typedef struct
#endif
} zip64_internal;
#ifdef HAVE_AES
#ifdef _WIN32
#include <windows.h>
int entropy_fun(unsigned char buf[], unsigned int len)
{ unsigned __int64 pentium_tsc[1];
unsigned int i;
QueryPerformanceCounter((LARGE_INTEGER *)pentium_tsc);
for(i = 0; i < 8 && i < len; ++i)
buf[i] = ((unsigned char*)pentium_tsc)[i];
return i;
}
#endif
#endif
/* Allocate a new data block */
local linkedlist_datablock_internal* allocate_new_datablock OF(());
local linkedlist_datablock_internal* allocate_new_datablock()