Skip to content

Commit d94e717

Browse files
CoeurCoeur
committed
updated copyright
1 parent 5666c74 commit d94e717

File tree

19 files changed

+128
-98
lines changed

19 files changed

+128
-98
lines changed

‎SSZipArchive/SSZipArchive.m‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -913,12 +913,9 @@ + (NSCalendar *)_gregorian
913913
+ (NSDate *)_dateWithMSDOSFormat:(UInt32)msdosDateTime
914914
{
915915
/*
916-
// the whole `_dateWithMSDOSFormat:` method is equivalent but faster than those four lines,
916+
// the whole `_dateWithMSDOSFormat:` method is equivalent but faster than this one line,
917917
// essentially because `mktime` is slow:
918-
struct tm ptm;
919-
dosdate_to_tm(msdosDateTime, &ptm);
920-
ptm.tm_year -= 1900;
921-
NSDate *date = [NSDate dateWithTimeIntervalSince1970:mktime(&ptm)];
918+
NSDate *date = [NSDate dateWithTimeIntervalSince1970:dosdate_to_time_t(msdosDateTime)];
922919
*/
923920
static const UInt32 kYearMask = 0xFE000000;
924921
static const UInt32 kMonthMask = 0x1E00000;

‎SSZipArchive/minizip/aes/brg_endian.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ Issue Date: 20/12/2007
3030
#elif defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __NetBSD__ )
3131
# include <sys/endian.h>
3232
#elif defined( BSD ) && ( BSD >= 199103 ) || defined( __APPLE__ ) || \
33-
defined( __CYGWIN32__ ) || defined( __DJGPP__ ) || defined( __osf__ )
33+
defined( __CYGWIN32__ ) || defined( __DJGPP__ ) || defined( __osf__ ) || \
34+
defined(__pnacl__)
3435
# include <machine/endian.h>
3536
#elif defined( __linux__ ) || defined( __GNUC__ ) || defined( __GNU_LIBRARY__ )
3637
# if !defined( __MINGW32__ ) && !defined( _AIX )

‎SSZipArchive/minizip/aes/fileenc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
3737
*/
3838

39-
#include <memory.h>
39+
#include <string.h>
4040

4141
#include "fileenc.h"
4242

‎SSZipArchive/minizip/aes/hmac.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ This is an implementation of HMAC, the FIPS standard keyed hash function
2424
#define _HMAC2_H
2525

2626
#include <stdlib.h>
27-
#include <memory.h>
27+
#include <string.h>
2828

2929
#if defined(__cplusplus)
3030
extern "C"

‎SSZipArchive/minizip/aes/prng.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
its location in memory.
3939
*/
4040

41-
#include <memory.h>
41+
#include <string.h>
4242
#include "prng.h"
4343

4444
#if defined(__cplusplus)

‎SSZipArchive/minizip/aes/pwd2key.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ This is an implementation of RFC2898, which specifies key derivation from
2121
a password and a salt value.
2222
*/
2323

24-
#include <memory.h>
24+
#include <string.h>
2525
#include "hmac.h"
2626

2727
#if defined(__cplusplus)

‎SSZipArchive/minizip/crypt.c‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
/* crypt.c -- base code for traditional PKWARE encryption
2-
Version 1.01e, February 12th, 2005
2+
Version 1.2.0, September 16th, 2017
33
4+
Copyright (C) 2012-2017 Nathan Moinvaziri
5+
https://github.com/nmoinvaz/minizip
46
Copyright (C) 1998-2005 Gilles Vollant
5-
Modifications for Info-ZIP crypting
6-
Copyright (C) 2003 Terry Thorsen
7+
Modifications for Info-ZIP crypting
8+
http://www.winimage.com/zLibDll/minizip.html
9+
Copyright (C) 2003 Terry Thorsen
710
811
This code is a modified version of crypting code in Info-ZIP distribution
912
@@ -129,7 +132,7 @@ int cryptrand(unsigned char *buf, unsigned int len)
129132
return rlen;
130133
}
131134

132-
int crypthead(const char *passwd, uint8_t *buf, int buf_size, uint32_t *pkeys,
135+
int crypthead(const char *passwd, uint8_t *buf, int buf_size, uint32_t *pkeys,
133136
const z_crc_t *pcrc_32_tab, uint8_t verify1, uint8_t verify2)
134137
{
135138
uint8_t n = 0; /* index in random header */

‎SSZipArchive/minizip/crypt.h‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
/* crypt.h -- base code for traditional PKWARE encryption
2-
Version 1.01e, February 12th, 2005
2+
Version 1.2.0, September 16th, 2017
33
4+
Copyright (C) 2012-2017 Nathan Moinvaziri
5+
https://github.com/nmoinvaz/minizip
46
Copyright (C) 1998-2005 Gilles Vollant
5-
Modifications for Info-ZIP crypting
6-
Copyright (C) 2003 Terry Thorsen
7+
Modifications for Info-ZIP crypting
8+
http://www.winimage.com/zLibDll/minizip.html
9+
Copyright (C) 2003 Terry Thorsen
710
811
This code is a modified version of crypting code in Info-ZIP distribution
912
@@ -49,7 +52,7 @@ void init_keys(const char *passwd, uint32_t *pkeys, const z_crc_t *pcrc_32_tab);
4952
int cryptrand(unsigned char *buf, unsigned int len);
5053

5154
/* Create encryption header */
52-
int crypthead(const char *passwd, uint8_t *buf, int buf_size, uint32_t *pkeys,
55+
int crypthead(const char *passwd, uint8_t *buf, int buf_size, uint32_t *pkeys,
5356
const z_crc_t *pcrc_32_tab, uint8_t verify1, uint8_t verify2);
5457

5558
/***************************************************************************/

‎SSZipArchive/minizip/ioapi.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
/* ioapi.c -- IO base function header for compress/uncompress .zip
22
part of the MiniZip project
33
4-
Copyright (C) 1998-2010 Gilles Vollant
5-
http://www.winimage.com/zLibDll/minizip.html
4+
Copyright (C) 2012-2017 Nathan Moinvaziri
5+
https://github.com/nmoinvaz/minizip
66
Modifications for Zip64 support
77
Copyright (C) 2009-2010 Mathias Svensson
88
http://result42.com
9+
Copyright (C) 1998-2010 Gilles Vollant
10+
http://www.winimage.com/zLibDll/minizip.html
911
1012
This program is distributed under the terms of the same license as zlib.
1113
See the accompanying LICENSE file for the full text of the license.

‎SSZipArchive/minizip/ioapi.h‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
/* ioapi.h -- IO base function header for compress/uncompress .zip
22
part of the MiniZip project
33
4+
Copyright (C) 2012-2017 Nathan Moinvaziri
5+
https://github.com/nmoinvaz/minizip
6+
Copyright (C) 2009-2010 Mathias Svensson
7+
Modifications for Zip64 support
8+
http://result42.com
49
Copyright (C) 1998-2010 Gilles Vollant
510
http://www.winimage.com/zLibDll/minizip.html
6-
Modifications for Zip64 support
7-
Copyright (C) 2009-2010 Mathias Svensson
8-
http://result42.com
911
1012
This program is distributed under the terms of the same license as zlib.
1113
See the accompanying LICENSE file for the full text of the license.
@@ -25,7 +27,7 @@
2527
# define ftello64 ftell
2628
# define fseeko64 fseek
2729
#else
28-
# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__APPLE__)
30+
# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__ANDROID__)
2931
# define fopen64 fopen
3032
# define ftello64 ftello
3133
# define fseeko64 fseeko

0 commit comments

Comments
 (0)