Skip to content

Commit f2fa737

Browse files
committed
Update to 7-Zip Version 24.09
Merge branch 24.09-zstd-br; closes gh-387 - renormalized merge (strategy recursive renormalized); - conflicts resolved; - registration of several (canonical) hashes changed in favor of 7-zip implementation: * removed registration of canonical hashes for `MD5`, `SHA384` and `SHA3-256` (back to 7zip implementation, `SHA384` registering now in `Sha512Reg.cpp`, `SHA3-256` in `Sha3Reg.cpp`); * renamed files with header and implementation of canonical hashes (to avoid name conflicts with 7zip own implementations): - `C/hashes/md5.* => C/hashes/md5c.*` - `C/hashes/Sha3.* => C/hashes/Sha3c.*` - `C/hashes/sha512c.* => C/hashes/sha512c.*` - renumerated IDs by register hashes (uniqueness), the list `DOC/Hashes.txt` is adjusted (matching current source code);
2 parents a7872f0 + 449b815 commit f2fa737

File tree

136 files changed

+5274
-1998
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+5274
-1998
lines changed

.github/workflows/do-release.cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ REM Build some release of 7-Zip ZS
44
SET COPYCMD=/Y /B
55
SET COPTS=-m0=lzma -mx9 -ms=on -mf=bcj2
66
SET URL=https://www.7-zip.org/a/7z2201.exe
7-
SET VERSION=24.08
7+
SET VERSION=24.09
88
SET SZIP="C:\Program Files\7-Zip\7z.exe"
99
SET LURL=https://raw.githubusercontent.com/mcmilk/7-Zip-zstd/master/CPP/7zip/Bundles
1010

C/7zDec.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* 7zDec.c -- Decoding from 7z folder
2-
2024-03-01 : Igor Pavlov : Public domain */
2+
: Igor Pavlov : Public domain */
33

44
#include "Precomp.h"
55

@@ -312,8 +312,9 @@ static BoolInt IS_MAIN_METHOD(UInt32 m)
312312
case k_PPMD:
313313
#endif
314314
return True;
315+
default:
316+
return False;
315317
}
316-
return False;
317318
}
318319

319320
static BoolInt IS_SUPPORTED_CODER(const CSzCoderInfo *c)

C/7zVersion.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#define MY_VER_MAJOR 24
2-
#define MY_VER_MINOR 8
2+
#define MY_VER_MINOR 9
33
#define MY_VER_BUILD 0
4-
#define MY_VERSION_NUMBERS "24.08 ZS v1.5.6"
4+
#define MY_VERSION_NUMBERS "24.09 ZS v1.5.6"
55
#define MY_VERSION MY_VERSION_NUMBERS
66

77
#ifdef MY_CPU_NAME
@@ -10,7 +10,7 @@
1010
#define MY_VERSION_CPU MY_VERSION
1111
#endif
1212

13-
#define MY_DATE "2024-08-11"
13+
#define MY_DATE "2024-11-29"
1414
#undef MY_COPYRIGHT
1515
#undef MY_VERSION_COPYRIGHT_DATE
1616
#define MY_AUTHOR_NAME "Igor Pavlov, Tino Reichardt, Sergey G. Brester"

0 commit comments

Comments
 (0)