Skip to content

Commit

Permalink
Update to 7-Zip Version 24.09
Browse files Browse the repository at this point in the history
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);
  • Loading branch information
sebres committed Feb 17, 2025
2 parents a7872f0 + 449b815 commit f2fa737
Show file tree
Hide file tree
Showing 136 changed files with 5,274 additions and 1,998 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/do-release.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ REM Build some release of 7-Zip ZS
SET COPYCMD=/Y /B
SET COPTS=-m0=lzma -mx9 -ms=on -mf=bcj2
SET URL=https://www.7-zip.org/a/7z2201.exe
SET VERSION=24.08
SET VERSION=24.09
SET SZIP="C:\Program Files\7-Zip\7z.exe"
SET LURL=https://raw.githubusercontent.com/mcmilk/7-Zip-zstd/master/CPP/7zip/Bundles

Expand Down
5 changes: 3 additions & 2 deletions C/7zDec.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* 7zDec.c -- Decoding from 7z folder
2024-03-01 : Igor Pavlov : Public domain */
: Igor Pavlov : Public domain */

#include "Precomp.h"

Expand Down Expand Up @@ -312,8 +312,9 @@ static BoolInt IS_MAIN_METHOD(UInt32 m)
case k_PPMD:
#endif
return True;
default:
return False;
}
return False;
}

static BoolInt IS_SUPPORTED_CODER(const CSzCoderInfo *c)
Expand Down
6 changes: 3 additions & 3 deletions C/7zVersion.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#define MY_VER_MAJOR 24
#define MY_VER_MINOR 8
#define MY_VER_MINOR 9
#define MY_VER_BUILD 0
#define MY_VERSION_NUMBERS "24.08 ZS v1.5.6"
#define MY_VERSION_NUMBERS "24.09 ZS v1.5.6"
#define MY_VERSION MY_VERSION_NUMBERS

#ifdef MY_CPU_NAME
Expand All @@ -10,7 +10,7 @@
#define MY_VERSION_CPU MY_VERSION
#endif

#define MY_DATE "2024-08-11"
#define MY_DATE "2024-11-29"
#undef MY_COPYRIGHT
#undef MY_VERSION_COPYRIGHT_DATE
#define MY_AUTHOR_NAME "Igor Pavlov, Tino Reichardt, Sergey G. Brester"
Expand Down
Loading

0 comments on commit f2fa737

Please sign in to comment.