Menu
▾
▴
[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1534] trunk/lvzip
|
From: <lab...@us...> - 2015-05-27 18:39:29
|
Revision: 1534
http://sourceforge.net/p/opengtoolkit/svn/1534
Author: labviewer
Date: 2015-05-27 18:39:26 +0000 (Wed, 27 May 2015)
Log Message:
-----------
Add AES and BZIP2 files to project
Modified Paths:
--------------
trunk/lvzip/c_source/aes/entropy.c
trunk/lvzip/c_source/aes/pwd2key.c
trunk/lvzip/c_source/bzip2/bzlib.c
trunk/lvzip/c_source/lvutil.c
trunk/lvzip/c_source/lvzip.xcodeproj/project.pbxproj
trunk/lvzip/c_source/mztools.c
trunk/lvzip/c_source/mztools.h
trunk/lvzip/c_source/unzip.c
trunk/lvzip/c_source/zip.c
trunk/lvzip/source/lvzlib.framework.zip
Modified: trunk/lvzip/c_source/aes/entropy.c
===================================================================
--- trunk/lvzip/c_source/aes/entropy.c 2015-05-27 17:17:08 UTC (rev 1533)
+++ trunk/lvzip/c_source/aes/entropy.c 2015-05-27 18:39:26 UTC (rev 1534)
@@ -4,6 +4,7 @@
#include <stdio.h>
#include <fcntl.h>
#endif
+#include "entropy.h"
#if defined(__cplusplus)
extern "C"
Modified: trunk/lvzip/c_source/aes/pwd2key.c
===================================================================
--- trunk/lvzip/c_source/aes/pwd2key.c 2015-05-27 17:17:08 UTC (rev 1533)
+++ trunk/lvzip/c_source/aes/pwd2key.c 2015-05-27 18:39:26 UTC (rev 1534)
@@ -35,6 +35,7 @@
#include <memory.h>
#include "hmac.h"
+#include "pwd2key.h"
#if defined(__cplusplus)
extern "C"
Modified: trunk/lvzip/c_source/bzip2/bzlib.c
===================================================================
--- trunk/lvzip/c_source/bzip2/bzlib.c 2015-05-27 17:17:08 UTC (rev 1533)
+++ trunk/lvzip/c_source/bzip2/bzlib.c 2015-05-27 18:39:26 UTC (rev 1534)
@@ -99,14 +99,14 @@
/*---------------------------------------------------*/
static
-void* default_bzalloc ( void* opaque, Int32 items, Int32 size )
+void* default_bzalloc(void* opaque, Int32 items, Int32 size)
{
- void* v = malloc ( items * size );
+ void* v = malloc (items * size);
return v;
}
static
-void default_bzfree ( void* opaque, void* addr )
+void default_bzfree(void* opaque, void* addr)
{
if (addr != NULL) free ( addr );
}
Modified: trunk/lvzip/c_source/lvutil.c
===================================================================
--- trunk/lvzip/c_source/lvutil.c 2015-05-27 17:17:08 UTC (rev 1533)
+++ trunk/lvzip/c_source/lvutil.c 2015-05-27 18:39:26 UTC (rev 1534)
@@ -111,11 +111,14 @@
#endif
#if HAVE_BZIP2
+void bz_internal_error(int errcode);
void bz_internal_error(int errcode)
{
// if we have a debug build then print the error in the LabVIEW debug console
#if DEBUG
- DbgPrintf("BZIP2 internal error %ld occurred!!", errcode);
+ DbgPrintf((CStr)"BZIP2 internal error %ld occurred!!", errcode);
+#else
+ Unused(errcode);
#endif
}
#endif
@@ -1820,7 +1823,7 @@
#endif
if (!err)
{
- err = FNewRefNum(path, (File)ioRefNum, refnum);
+ err = FNewRefNum(path, (File)(ioRefNum), refnum);
}
if (err)
{
Modified: trunk/lvzip/c_source/lvzip.xcodeproj/project.pbxproj
===================================================================
--- trunk/lvzip/c_source/lvzip.xcodeproj/project.pbxproj 2015-05-27 17:17:08 UTC (rev 1533)
+++ trunk/lvzip/c_source/lvzip.xcodeproj/project.pbxproj 2015-05-27 18:39:26 UTC (rev 1534)
@@ -42,6 +42,36 @@
839542EF0894F2490020C3E2 /* gvmat32c.c in Sources */ = {isa = PBXBuildFile; fileRef = 839542B80894F2490020C3E2 /* gvmat32c.c */; };
839542F10894F2490020C3E2 /* adler32.c in Sources */ = {isa = PBXBuildFile; fileRef = 839542BA0894F2490020C3E2 /* adler32.c */; };
83D3E26D080D117700DE332C /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 83D3E26C080D117700DE332C /* Carbon.framework */; };
+ 8832627B1B163FAF003BB2F4 /* aes_via_ace.h in Headers */ = {isa = PBXBuildFile; fileRef = 883262661B163FAF003BB2F4 /* aes_via_ace.h */; };
+ 8832627C1B163FAF003BB2F4 /* aes.h in Headers */ = {isa = PBXBuildFile; fileRef = 883262671B163FAF003BB2F4 /* aes.h */; };
+ 8832627D1B163FAF003BB2F4 /* aescrypt.c in Sources */ = {isa = PBXBuildFile; fileRef = 883262681B163FAF003BB2F4 /* aescrypt.c */; };
+ 8832627E1B163FAF003BB2F4 /* aeskey.c in Sources */ = {isa = PBXBuildFile; fileRef = 883262691B163FAF003BB2F4 /* aeskey.c */; };
+ 8832627F1B163FAF003BB2F4 /* aesopt.h in Headers */ = {isa = PBXBuildFile; fileRef = 8832626A1B163FAF003BB2F4 /* aesopt.h */; };
+ 883262801B163FAF003BB2F4 /* aestab.c in Sources */ = {isa = PBXBuildFile; fileRef = 8832626B1B163FAF003BB2F4 /* aestab.c */; };
+ 883262811B163FAF003BB2F4 /* aestab.h in Headers */ = {isa = PBXBuildFile; fileRef = 8832626C1B163FAF003BB2F4 /* aestab.h */; };
+ 883262821B163FAF003BB2F4 /* brg_endian.h in Headers */ = {isa = PBXBuildFile; fileRef = 8832626D1B163FAF003BB2F4 /* brg_endian.h */; };
+ 883262831B163FAF003BB2F4 /* brg_types.h in Headers */ = {isa = PBXBuildFile; fileRef = 8832626E1B163FAF003BB2F4 /* brg_types.h */; };
+ 883262841B163FAF003BB2F4 /* entropy.c in Sources */ = {isa = PBXBuildFile; fileRef = 8832626F1B163FAF003BB2F4 /* entropy.c */; };
+ 883262851B163FAF003BB2F4 /* entropy.h in Headers */ = {isa = PBXBuildFile; fileRef = 883262701B163FAF003BB2F4 /* entropy.h */; };
+ 883262861B163FAF003BB2F4 /* fileenc.c in Sources */ = {isa = PBXBuildFile; fileRef = 883262711B163FAF003BB2F4 /* fileenc.c */; };
+ 883262871B163FAF003BB2F4 /* fileenc.h in Headers */ = {isa = PBXBuildFile; fileRef = 883262721B163FAF003BB2F4 /* fileenc.h */; };
+ 883262881B163FAF003BB2F4 /* hmac.c in Sources */ = {isa = PBXBuildFile; fileRef = 883262731B163FAF003BB2F4 /* hmac.c */; };
+ 883262891B163FAF003BB2F4 /* hmac.h in Headers */ = {isa = PBXBuildFile; fileRef = 883262741B163FAF003BB2F4 /* hmac.h */; };
+ 8832628A1B163FAF003BB2F4 /* prng.c in Sources */ = {isa = PBXBuildFile; fileRef = 883262751B163FAF003BB2F4 /* prng.c */; };
+ 8832628B1B163FAF003BB2F4 /* prng.h in Headers */ = {isa = PBXBuildFile; fileRef = 883262761B163FAF003BB2F4 /* prng.h */; };
+ 8832628C1B163FAF003BB2F4 /* pwd2key.c in Sources */ = {isa = PBXBuildFile; fileRef = 883262771B163FAF003BB2F4 /* pwd2key.c */; };
+ 8832628D1B163FAF003BB2F4 /* pwd2key.h in Headers */ = {isa = PBXBuildFile; fileRef = 883262781B163FAF003BB2F4 /* pwd2key.h */; };
+ 8832628E1B163FAF003BB2F4 /* sha1.c in Sources */ = {isa = PBXBuildFile; fileRef = 883262791B163FAF003BB2F4 /* sha1.c */; };
+ 8832628F1B163FAF003BB2F4 /* sha1.h in Headers */ = {isa = PBXBuildFile; fileRef = 8832627A1B163FAF003BB2F4 /* sha1.h */; };
+ 883262991B163FD6003BB2F4 /* blocksort.c in Sources */ = {isa = PBXBuildFile; fileRef = 883262901B163FD6003BB2F4 /* blocksort.c */; };
+ 8832629A1B163FD6003BB2F4 /* bzlib_private.h in Headers */ = {isa = PBXBuildFile; fileRef = 883262911B163FD6003BB2F4 /* bzlib_private.h */; };
+ 8832629B1B163FD6003BB2F4 /* bzlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 883262921B163FD6003BB2F4 /* bzlib.c */; };
+ 8832629C1B163FD6003BB2F4 /* bzlib.h in Headers */ = {isa = PBXBuildFile; fileRef = 883262931B163FD6003BB2F4 /* bzlib.h */; };
+ 8832629D1B163FD6003BB2F4 /* compress.c in Sources */ = {isa = PBXBuildFile; fileRef = 883262941B163FD6003BB2F4 /* compress.c */; };
+ 8832629E1B163FD6003BB2F4 /* crctable.c in Sources */ = {isa = PBXBuildFile; fileRef = 883262951B163FD6003BB2F4 /* crctable.c */; };
+ 8832629F1B163FD6003BB2F4 /* decompress.c in Sources */ = {isa = PBXBuildFile; fileRef = 883262961B163FD6003BB2F4 /* decompress.c */; };
+ 883262A01B163FD6003BB2F4 /* huffman.c in Sources */ = {isa = PBXBuildFile; fileRef = 883262971B163FD6003BB2F4 /* huffman.c */; };
+ 883262A11B163FD6003BB2F4 /* randtable.c in Sources */ = {isa = PBXBuildFile; fileRef = 883262981B163FD6003BB2F4 /* randtable.c */; };
888E743A1ADD96A900C5AEFE /* utf.c in Sources */ = {isa = PBXBuildFile; fileRef = 888E74391ADD96A900C5AEFE /* utf.c */; };
888E743C1ADD96C200C5AEFE /* utf.h in Headers */ = {isa = PBXBuildFile; fileRef = 888E743B1ADD96C200C5AEFE /* utf.h */; };
888E743E1ADD96D700C5AEFE /* lvapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 888E743D1ADD96D700C5AEFE /* lvapi.c */; };
@@ -86,6 +116,36 @@
839542BA0894F2490020C3E2 /* adler32.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = adler32.c; sourceTree = "<group>"; };
83D3E1AF080D116E00DE332C /* lvzlib.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = lvzlib.framework; sourceTree = BUILT_PRODUCTS_DIR; };
83D3E26C080D117700DE332C /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
+ 883262661B163FAF003BB2F4 /* aes_via_ace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = aes_via_ace.h; path = aes/aes_via_ace.h; sourceTree = "<group>"; };
+ 883262671B163FAF003BB2F4 /* aes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = aes.h; path = aes/aes.h; sourceTree = "<group>"; };
+ 883262681B163FAF003BB2F4 /* aescrypt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = aescrypt.c; path = aes/aescrypt.c; sourceTree = "<group>"; };
+ 883262691B163FAF003BB2F4 /* aeskey.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = aeskey.c; path = aes/aeskey.c; sourceTree = "<group>"; };
+ 8832626A1B163FAF003BB2F4 /* aesopt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = aesopt.h; path = aes/aesopt.h; sourceTree = "<group>"; };
+ 8832626B1B163FAF003BB2F4 /* aestab.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = aestab.c; path = aes/aestab.c; sourceTree = "<group>"; };
+ 8832626C1B163FAF003BB2F4 /* aestab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = aestab.h; path = aes/aestab.h; sourceTree = "<group>"; };
+ 8832626D1B163FAF003BB2F4 /* brg_endian.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = brg_endian.h; path = aes/brg_endian.h; sourceTree = "<group>"; };
+ 8832626E1B163FAF003BB2F4 /* brg_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = brg_types.h; path = aes/brg_types.h; sourceTree = "<group>"; };
+ 8832626F1B163FAF003BB2F4 /* entropy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = entropy.c; path = aes/entropy.c; sourceTree = "<group>"; };
+ 883262701B163FAF003BB2F4 /* entropy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = entropy.h; path = aes/entropy.h; sourceTree = "<group>"; };
+ 883262711B163FAF003BB2F4 /* fileenc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = fileenc.c; path = aes/fileenc.c; sourceTree = "<group>"; };
+ 883262721B163FAF003BB2F4 /* fileenc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fileenc.h; path = aes/fileenc.h; sourceTree = "<group>"; };
+ 883262731B163FAF003BB2F4 /* hmac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = hmac.c; path = aes/hmac.c; sourceTree = "<group>"; };
+ 883262741B163FAF003BB2F4 /* hmac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = hmac.h; path = aes/hmac.h; sourceTree = "<group>"; };
+ 883262751B163FAF003BB2F4 /* prng.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = prng.c; path = aes/prng.c; sourceTree = "<group>"; };
+ 883262761B163FAF003BB2F4 /* prng.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = prng.h; path = aes/prng.h; sourceTree = "<group>"; };
+ 883262771B163FAF003BB2F4 /* pwd2key.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pwd2key.c; path = aes/pwd2key.c; sourceTree = "<group>"; };
+ 883262781B163FAF003BB2F4 /* pwd2key.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pwd2key.h; path = aes/pwd2key.h; sourceTree = "<group>"; };
+ 883262791B163FAF003BB2F4 /* sha1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sha1.c; path = aes/sha1.c; sourceTree = "<group>"; };
+ 8832627A1B163FAF003BB2F4 /* sha1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sha1.h; path = aes/sha1.h; sourceTree = "<group>"; };
+ 883262901B163FD6003BB2F4 /* blocksort.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = blocksort.c; path = bzip2/blocksort.c; sourceTree = "<group>"; };
+ 883262911B163FD6003BB2F4 /* bzlib_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bzlib_private.h; path = bzip2/bzlib_private.h; sourceTree = "<group>"; };
+ 883262921B163FD6003BB2F4 /* bzlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bzlib.c; path = bzip2/bzlib.c; sourceTree = "<group>"; };
+ 883262931B163FD6003BB2F4 /* bzlib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bzlib.h; path = bzip2/bzlib.h; sourceTree = "<group>"; };
+ 883262941B163FD6003BB2F4 /* compress.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = compress.c; path = bzip2/compress.c; sourceTree = "<group>"; };
+ 883262951B163FD6003BB2F4 /* crctable.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = crctable.c; path = bzip2/crctable.c; sourceTree = "<group>"; };
+ 883262961B163FD6003BB2F4 /* decompress.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = decompress.c; path = bzip2/decompress.c; sourceTree = "<group>"; };
+ 883262971B163FD6003BB2F4 /* huffman.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = huffman.c; path = bzip2/huffman.c; sourceTree = "<group>"; };
+ 883262981B163FD6003BB2F4 /* randtable.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = randtable.c; path = bzip2/randtable.c; sourceTree = "<group>"; };
88521A381AF4145000A9CDF7 /* lvapi.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = lvapi.h; sourceTree = "<group>"; };
888E74391ADD96A900C5AEFE /* utf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = utf.c; sourceTree = "<group>"; };
888E743B1ADD96C200C5AEFE /* utf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf.h; sourceTree = "<group>"; };
@@ -110,8 +170,8 @@
83D3E18C080D116E00DE332C = {
isa = PBXGroup;
children = (
- C79368AA0C9ED687006083BF /* iomem.c */,
- C79368AB0C9ED687006083BF /* iomem.h */,
+ 883262651B163F70003BB2F4 /* bzip2 */,
+ 883262641B163F5C003BB2F4 /* aes */,
83D3E1B5080D116E00DE332C /* zlib Sources */,
83D3E26B080D117700DE332C /* Frameworks */,
83D3E19A080D116E00DE332C /* Products */,
@@ -129,6 +189,8 @@
83D3E1B5080D116E00DE332C /* zlib Sources */ = {
isa = PBXGroup;
children = (
+ C79368AB0C9ED687006083BF /* iomem.h */,
+ C79368AA0C9ED687006083BF /* iomem.c */,
88521A381AF4145000A9CDF7 /* lvapi.h */,
888E743D1ADD96D700C5AEFE /* lvapi.c */,
888E743B1ADD96C200C5AEFE /* utf.h */,
@@ -179,6 +241,50 @@
name = Frameworks;
sourceTree = "<group>";
};
+ 883262641B163F5C003BB2F4 /* aes */ = {
+ isa = PBXGroup;
+ children = (
+ 883262661B163FAF003BB2F4 /* aes_via_ace.h */,
+ 883262671B163FAF003BB2F4 /* aes.h */,
+ 883262681B163FAF003BB2F4 /* aescrypt.c */,
+ 883262691B163FAF003BB2F4 /* aeskey.c */,
+ 8832626A1B163FAF003BB2F4 /* aesopt.h */,
+ 8832626B1B163FAF003BB2F4 /* aestab.c */,
+ 8832626C1B163FAF003BB2F4 /* aestab.h */,
+ 8832626D1B163FAF003BB2F4 /* brg_endian.h */,
+ 8832626E1B163FAF003BB2F4 /* brg_types.h */,
+ 8832626F1B163FAF003BB2F4 /* entropy.c */,
+ 883262701B163FAF003BB2F4 /* entropy.h */,
+ 883262711B163FAF003BB2F4 /* fileenc.c */,
+ 883262721B163FAF003BB2F4 /* fileenc.h */,
+ 883262731B163FAF003BB2F4 /* hmac.c */,
+ 883262741B163FAF003BB2F4 /* hmac.h */,
+ 883262751B163FAF003BB2F4 /* prng.c */,
+ 883262761B163FAF003BB2F4 /* prng.h */,
+ 883262771B163FAF003BB2F4 /* pwd2key.c */,
+ 883262781B163FAF003BB2F4 /* pwd2key.h */,
+ 883262791B163FAF003BB2F4 /* sha1.c */,
+ 8832627A1B163FAF003BB2F4 /* sha1.h */,
+ );
+ name = aes;
+ sourceTree = "<group>";
+ };
+ 883262651B163F70003BB2F4 /* bzip2 */ = {
+ isa = PBXGroup;
+ children = (
+ 883262901B163FD6003BB2F4 /* blocksort.c */,
+ 883262911B163FD6003BB2F4 /* bzlib_private.h */,
+ 883262921B163FD6003BB2F4 /* bzlib.c */,
+ 883262931B163FD6003BB2F4 /* bzlib.h */,
+ 883262941B163FD6003BB2F4 /* compress.c */,
+ 883262951B163FD6003BB2F4 /* crctable.c */,
+ 883262961B163FD6003BB2F4 /* decompress.c */,
+ 883262971B163FD6003BB2F4 /* huffman.c */,
+ 883262981B163FD6003BB2F4 /* randtable.c */,
+ );
+ name = bzip2;
+ sourceTree = "<group>";
+ };
/* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
@@ -187,22 +293,36 @@
buildActionMask = 2147483647;
files = (
839542C00894F2490020C3E2 /* lvutil.h in Headers */,
+ 8832627B1B163FAF003BB2F4 /* aes_via_ace.h in Headers */,
839542C60894F2490020C3E2 /* inffast.h in Headers */,
839542C90894F2490020C3E2 /* crc32.h in Headers */,
839542CB0894F2490020C3E2 /* crypt.h in Headers */,
+ 8832627F1B163FAF003BB2F4 /* aesopt.h in Headers */,
839542CD0894F2490020C3E2 /* inflate.h in Headers */,
839542CE0894F2490020C3E2 /* deflate.h in Headers */,
+ 883262831B163FAF003BB2F4 /* brg_types.h in Headers */,
888E743C1ADD96C200C5AEFE /* utf.h in Headers */,
+ 8832627C1B163FAF003BB2F4 /* aes.h in Headers */,
839542CF0894F2490020C3E2 /* zutil.h in Headers */,
839542D90894F2490020C3E2 /* ioapi.h in Headers */,
839542DB0894F2490020C3E2 /* inftrees.h in Headers */,
839542DD0894F2490020C3E2 /* zlib.h in Headers */,
+ 8832628B1B163FAF003BB2F4 /* prng.h in Headers */,
+ 8832629C1B163FD6003BB2F4 /* bzlib.h in Headers */,
839542DF0894F2490020C3E2 /* zip.h in Headers */,
+ 883262821B163FAF003BB2F4 /* brg_endian.h in Headers */,
+ 8832628D1B163FAF003BB2F4 /* pwd2key.h in Headers */,
839542E20894F2490020C3E2 /* zconf.h in Headers */,
+ 883262851B163FAF003BB2F4 /* entropy.h in Headers */,
839542E30894F2490020C3E2 /* unzip.h in Headers */,
839542E60894F2490020C3E2 /* trees.h in Headers */,
839542E80894F2490020C3E2 /* mztools.h in Headers */,
839542EC0894F2490020C3E2 /* inffixed.h in Headers */,
+ 8832628F1B163FAF003BB2F4 /* sha1.h in Headers */,
+ 883262871B163FAF003BB2F4 /* fileenc.h in Headers */,
+ 883262811B163FAF003BB2F4 /* aestab.h in Headers */,
+ 883262891B163FAF003BB2F4 /* hmac.h in Headers */,
+ 8832629A1B163FD6003BB2F4 /* bzlib_private.h in Headers */,
C79368AD0C9ED687006083BF /* iomem.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -267,25 +387,41 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
+ 8832628A1B163FAF003BB2F4 /* prng.c in Sources */,
+ 883262881B163FAF003BB2F4 /* hmac.c in Sources */,
839542C10894F2490020C3E2 /* lvutil.c in Sources */,
839542C30894F2490020C3E2 /* mztools.c in Sources */,
+ 8832629F1B163FD6003BB2F4 /* decompress.c in Sources */,
839542C70894F2490020C3E2 /* inffast.c in Sources */,
839542C80894F2490020C3E2 /* crc32.c in Sources */,
839542CA0894F2490020C3E2 /* deflate.c in Sources */,
+ 8832629D1B163FD6003BB2F4 /* compress.c in Sources */,
839542CC0894F2490020C3E2 /* inftrees.c in Sources */,
+ 8832628E1B163FAF003BB2F4 /* sha1.c in Sources */,
839542D00894F2490020C3E2 /* zutil.c in Sources */,
839542D60894F2490020C3E2 /* compress.c in Sources */,
+ 883262861B163FAF003BB2F4 /* fileenc.c in Sources */,
888E743E1ADD96D700C5AEFE /* lvapi.c in Sources */,
+ 883262A01B163FD6003BB2F4 /* huffman.c in Sources */,
+ 8832628C1B163FAF003BB2F4 /* pwd2key.c in Sources */,
839542DA0894F2490020C3E2 /* ioapi.c in Sources */,
839542E00894F2490020C3E2 /* zip.c in Sources */,
+ 883262841B163FAF003BB2F4 /* entropy.c in Sources */,
839542E40894F2490020C3E2 /* unzip.c in Sources */,
839542E50894F2490020C3E2 /* uncompr.c in Sources */,
+ 8832627E1B163FAF003BB2F4 /* aeskey.c in Sources */,
888E743A1ADD96A900C5AEFE /* utf.c in Sources */,
839542E70894F2490020C3E2 /* trees.c in Sources */,
839542EB0894F2490020C3E2 /* inflate.c in Sources */,
839542ED0894F2490020C3E2 /* infback.c in Sources */,
839542EF0894F2490020C3E2 /* gvmat32c.c in Sources */,
839542F10894F2490020C3E2 /* adler32.c in Sources */,
+ 8832629B1B163FD6003BB2F4 /* bzlib.c in Sources */,
+ 8832627D1B163FAF003BB2F4 /* aescrypt.c in Sources */,
+ 883262991B163FD6003BB2F4 /* blocksort.c in Sources */,
+ 8832629E1B163FD6003BB2F4 /* crctable.c in Sources */,
+ 883262A11B163FD6003BB2F4 /* randtable.c in Sources */,
+ 883262801B163FAF003BB2F4 /* aestab.c in Sources */,
C79368AC0C9ED687006083BF /* iomem.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -306,7 +442,11 @@
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
- GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ HAVE_AES,
+ HAVE_BZIP2,
+ DEBUG,
+ );
GCC_REUSE_STRINGS = NO;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO;
@@ -350,7 +490,11 @@
GCC_ENABLE_CPP_EXCEPTIONS = NO;
GCC_ENABLE_CPP_RTTI = NO;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
- GCC_OPTIMIZATION_LEVEL = 0;
+ GCC_OPTIMIZATION_LEVEL = 3;
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ HAVE_AES,
+ HAVE_BZIP2,
+ );
GCC_REUSE_STRINGS = NO;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO;
@@ -393,6 +537,10 @@
GCC_ENABLE_CPP_EXCEPTIONS = NO;
GCC_ENABLE_CPP_RTTI = NO;
GCC_OPTIMIZATION_LEVEL = 0;
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ HAVE_AES,
+ HAVE_BZIP2,
+ );
GCC_REUSE_STRINGS = NO;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO;
@@ -431,6 +579,7 @@
"ADDITIONAL_SDKS[arch=i386]" = "";
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
GCC_CHAR_IS_UNSIGNED_CHAR = YES;
+ GCC_SYMBOLS_PRIVATE_EXTERN = YES;
HEADER_SEARCH_PATHS = (
"$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
@@ -441,6 +590,7 @@
MACH_O_TYPE = mh_dylib;
MACOSX_DEPLOYMENT_TARGET = 10.7;
ONLY_ACTIVE_ARCH = NO;
+ OTHER_CFLAGS = "";
SDKROOT = macosx10.8;
};
name = Development;
@@ -450,6 +600,7 @@
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
GCC_CHAR_IS_UNSIGNED_CHAR = YES;
+ GCC_SYMBOLS_PRIVATE_EXTERN = YES;
HEADER_SEARCH_PATHS = (
"$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
@@ -460,6 +611,7 @@
MACH_O_TYPE = mh_dylib;
MACOSX_DEPLOYMENT_TARGET = 10.7;
ONLY_ACTIVE_ARCH = NO;
+ OTHER_CFLAGS = "";
SDKROOT = macosx10.8;
};
name = Deployment;
@@ -470,6 +622,7 @@
"ADDITIONAL_SDKS[arch=*]" = "";
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
GCC_CHAR_IS_UNSIGNED_CHAR = YES;
+ GCC_SYMBOLS_PRIVATE_EXTERN = YES;
HEADER_SEARCH_PATHS = (
"$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
@@ -480,6 +633,7 @@
MACH_O_TYPE = mh_dylib;
MACOSX_DEPLOYMENT_TARGET = 10.7;
ONLY_ACTIVE_ARCH = NO;
+ OTHER_CFLAGS = "";
SDKROOT = macosx10.8;
};
name = Default;
Modified: trunk/lvzip/c_source/mztools.c
===================================================================
--- trunk/lvzip/c_source/mztools.c 2015-05-27 17:17:08 UTC (rev 1533)
+++ trunk/lvzip/c_source/mztools.c 2015-05-27 18:39:26 UTC (rev 1534)
@@ -10,6 +10,7 @@
#include <string.h>
#include "zlib.h"
#include "unzip.h"
+#include "mztools.h"
#define READ_8(adr) ((unsigned char)*(adr))
#define READ_16(adr) ( READ_8(adr) | (READ_8(adr+1) << 8) )
@@ -27,12 +28,7 @@
WRITE_16((unsigned char*)(buff) + 2, (n) >> 16); \
} while(0)
-ZEXTERN int ZEXPORT unzRepair(file, fileOut, fileOutTmp, nRecovered, bytesRecovered)
-const char* file;
-const char* fileOut;
-const char* fileOutTmp;
-uLong* nRecovered;
-uLong* bytesRecovered;
+ZEXTERN int ZEXPORT unzRepair(const char* file, const char* fileOut, const char* fileOutTmp, uLong* nRecovered, uLong* bytesRecovered)
{
int err = Z_OK;
FILE* fpZip = fopen(file, "rb");
Modified: trunk/lvzip/c_source/mztools.h
===================================================================
--- trunk/lvzip/c_source/mztools.h 2015-05-27 17:17:08 UTC (rev 1533)
+++ trunk/lvzip/c_source/mztools.h 2015-05-27 18:39:26 UTC (rev 1534)
@@ -22,11 +22,7 @@
fileOut: output file after recovery
fileOutTmp: temporary file name used for recovery
*/
-extern int ZEXPORT unzRepair(const char* file,
- const char* fileOut,
- const char* fileOutTmp,
- uLong* nRecovered,
- uLong* bytesRecovered);
+ZEXTERN int ZEXPORT unzRepair OF((const char* file, const char* fileOut, const char* fileOutTmp, uLong* nRecovered, uLong* bytesRecovered));
#ifdef __cplusplus
Modified: trunk/lvzip/c_source/unzip.c
===================================================================
--- trunk/lvzip/c_source/unzip.c 2015-05-27 17:17:08 UTC (rev 1533)
+++ trunk/lvzip/c_source/unzip.c 2015-05-27 18:39:26 UTC (rev 1534)
@@ -227,15 +227,15 @@
local int unz64local_getByte OF((
const zlib_filefunc64_32_def* pzlib_filefunc_def,
voidpf filestream,
- int *pi));
+ uLong *pi));
-local int unz64local_getByte(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, int *pi)
+local int unz64local_getByte(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong *pi)
{
unsigned char c;
- int err = (int)ZREAD64(*pzlib_filefunc_def,filestream,&c,1);
- if (err==1)
+ int err = (int)ZREAD64(*pzlib_filefunc_def, filestream, &c,1 );
+ if (err == 1)
{
- *pi = (int)c;
+ *pi = (uLong)c;
return UNZ_OK;
}
else
@@ -260,18 +260,17 @@
voidpf filestream,
uLong *pX)
{
- uLong x ;
- int i = 0;
+ uLong x, i = 0 ;
int err;
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+ err = unz64local_getByte(pzlib_filefunc_def, filestream, &i);
x = (uLong)i;
if (err==UNZ_OK)
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x |= ((uLong)i)<<8;
+ err = unz64local_getByte(pzlib_filefunc_def, filestream, &i);
+ x |= ((uLong)i) << 8;
- if (err==UNZ_OK)
+ if (err == UNZ_OK)
*pX = x;
else
*pX = 0;
@@ -287,26 +286,25 @@
voidpf filestream,
uLong *pX)
{
- uLong x ;
- int i = 0;
+ uLong x, i = 0 ;
int err;
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x = (uLong)i;
+ err = unz64local_getByte(pzlib_filefunc_def, filestream,&i);
+ x = i;
- if (err==UNZ_OK)
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x |= ((uLong)i)<<8;
+ if (err == UNZ_OK)
+ err = unz64local_getByte(pzlib_filefunc_def, filestream, &i);
+ x |= i << 8;
- if (err==UNZ_OK)
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x |= ((uLong)i)<<16;
+ if (err == UNZ_OK)
+ err = unz64local_getByte(pzlib_filefunc_def, filestream, &i);
+ x |= i << 16;
- if (err==UNZ_OK)
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x += ((uLong)i)<<24;
+ if (err == UNZ_OK)
+ err = unz64local_getByte(pzlib_filefunc_def, filestream, &i);
+ x |= i << 24;
- if (err==UNZ_OK)
+ if (err == UNZ_OK)
*pX = x;
else
*pX = 0;
@@ -324,41 +322,41 @@
ZPOS64_T *pX)
{
ZPOS64_T x ;
- int i = 0;
+ uLong i = 0;
int err;
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+ err = unz64local_getByte(pzlib_filefunc_def, filestream, &i);
x = (ZPOS64_T)i;
- if (err==UNZ_OK)
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x |= ((ZPOS64_T)i)<<8;
+ if (err == UNZ_OK)
+ err = unz64local_getByte(pzlib_filefunc_def, filestream, &i);
+ x |= ((ZPOS64_T)i) << 8;
- if (err==UNZ_OK)
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x |= ((ZPOS64_T)i)<<16;
+ if (err == UNZ_OK)
+ err = unz64local_getByte(pzlib_filefunc_def, filestream, &i);
+ x |= ((ZPOS64_T)i) << 16;
- if (err==UNZ_OK)
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x |= ((ZPOS64_T)i)<<24;
+ if (err == UNZ_OK)
+ err = unz64local_getByte(pzlib_filefunc_def, filestream, &i);
+ x |= ((ZPOS64_T)i) << 24;
- if (err==UNZ_OK)
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x |= ((ZPOS64_T)i)<<32;
+ if (err == UNZ_OK)
+ err = unz64local_getByte(pzlib_filefunc_def, filestream, &i);
+ x |= ((ZPOS64_T)i) << 32;
- if (err==UNZ_OK)
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x |= ((ZPOS64_T)i)<<40;
+ if (err == UNZ_OK)
+ err = unz64local_getByte(pzlib_filefunc_def, filestream, &i);
+ x |= ((ZPOS64_T)i) << 40;
- if (err==UNZ_OK)
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x |= ((ZPOS64_T)i)<<48;
+ if (err == UNZ_OK)
+ err = unz64local_getByte(pzlib_filefunc_def, filestream, &i);
+ x |= ((ZPOS64_T)i) << 48;
- if (err==UNZ_OK)
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x |= ((ZPOS64_T)i)<<56;
+ if (err == UNZ_OK)
+ err = unz64local_getByte(pzlib_filefunc_def, filestream, &i);
+ x |= ((ZPOS64_T)i) << 56;
- if (err==UNZ_OK)
+ if (err == UNZ_OK)
*pX = x;
else
*pX = 0;
@@ -370,19 +368,19 @@
{
for (;;)
{
- char c1=*(fileName1++);
- char c2=*(fileName2++);
- if ((c1>='a') && (c1<='z'))
+ char c1 = *(fileName1++);
+ char c2 = *(fileName2++);
+ if ((c1 >= 'a') && (c1 <= 'z'))
c1 -= 0x20;
- if ((c2>='a') && (c2<='z'))
+ if ((c2 >= 'a') && (c2 <= 'z'))
c2 -= 0x20;
- if (c1=='\0')
+ if (c1 == '\0')
return ((c2=='\0') ? 0 : -1);
- if (c2=='\0')
+ if (c2 == '\0')
return 1;
- if (c1<c2)
+ if (c1 < c2)
return -1;
- if (c1>c2)
+ if (c1 > c2)
return 1;
}
}
@@ -1762,7 +1760,7 @@
if (ZREAD64(s->z_filefunc, s->filestream, passverify, AES_PWVERIFYSIZE) != AES_PWVERIFYSIZE)
return UNZ_INTERNALERROR;
- fcrypt_init(s->cur_file_info_internal.aes_encryption_mode, password, (unsigned long)strlen(password), saltvalue,
+ fcrypt_init(s->cur_file_info_internal.aes_encryption_mode, (const unsigned char)password, (unsigned long)strlen(password), saltvalue,
passverify, &s->pfile_in_zip_read->aes_ctx);
pfile_in_zip_read_info->rest_read_compressed -= saltlength + AES_PWVERIFYSIZE;
@@ -1894,7 +1892,7 @@
#ifdef HAVE_AES
if (s->cur_file_info.compression_method == AES_METHOD)
{
- fcrypt_decrypt(pfile_in_zip_read_info->read_buffer, uReadThis, &s->pfile_in_zip_read->aes_ctx);
+ fcrypt_decrypt((const unsigned char)pfile_in_zip_read_info->read_buffer, uReadThis, &s->pfile_in_zip_read->aes_ctx);
}
else
#endif
Modified: trunk/lvzip/c_source/zip.c
===================================================================
--- trunk/lvzip/c_source/zip.c 2015-05-27 17:17:08 UTC (rev 1533)
+++ trunk/lvzip/c_source/zip.c 2015-05-27 18:39:26 UTC (rev 1534)
@@ -1446,7 +1446,7 @@
prng_rand(saltvalue, saltlength, zi->ci.aes_rng);
prng_end(zi->ci.aes_rng);
- fcrypt_init(AES_ENCRYPTIONMODE, password, (unsigned long)strlen(password), saltvalue, passverify, &zi->ci.aes_ctx);
+ fcrypt_init(AES_ENCRYPTIONMODE, (const unsigned char)password, (unsigned long)strlen(password), saltvalue, passverify, &zi->ci.aes_ctx);
if (ZWRITE64(zi->z_filefunc, zi->filestream, saltvalue, saltlength) != saltlength)
err = ZIP_ERRNO;
@@ -1860,10 +1860,10 @@
zi->ci.stream_initialised = 0;
}
#ifdef HAVE_BZIP2
- else if((zi->ci.compression_method == Z_BZIP2ED))
+ else if (zi->ci.compression_method == Z_BZIP2ED)
{
int tmperr = BZ2_bzCompressEnd(&zi->ci.bstream);
- if (err==ZIP_OK)
+ if (err == ZIP_OK)
err = tmperr;
zi->ci.stream_initialised = 0;
}
Modified: trunk/lvzip/source/lvzlib.framework.zip
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
