Add files via upload

peazip · Aug 3, 2024 · b810f06 · b810f06
1 parent 223e64d
commit b810f06
Show file tree

Hide file tree

Showing 26 changed files with 20,844 additions and 19,583 deletions.
diff --git a/peazip-sources/dev/fcaes256.pas b/peazip-sources/dev/fcaes256.pas
@@ -102,7 +102,7 @@ TFCA_HMAC256_Context = record
 
 
 function FCA_EAX256_init(var cx: TAES_EAXContext; pPW: pointer; pLen: word; var hdr: TFCA256Hdr): integer;
-function FCA_EAX256_initP(var cx: TAES_EAXContext; pPW: pointer; pLen: word; var hdr: TFCA256Hdr): integer;//50x iterations
+function FCA_EAX256_initP(var cx: TAES_EAXContext; pPW: pointer; pLen: word; var hdr: TFCA256Hdr; niter:byte): integer;
  {-Initialize crypt context using password pointer pPW and hdr.salt}
 
 function FCA_EAX256_initS(var cx: TAES_EAXContext; sPW: Str255; var hdr: TFCA256Hdr): integer;
@@ -246,15 +246,18 @@ function FCA_EAX256_init(var cx: TAES_EAXContext; pPW: pointer; pLen: word; var
  fillchar(XKey, sizeof(XKey),0);
 end;
 
-function FCA_EAX256_initP(var cx: TAES_EAXContext; pPW: pointer; pLen: word; var hdr: TFCA256Hdr): integer;
+function FCA_EAX256_initP(var cx: TAES_EAXContext; pPW: pointer; pLen: word; var hdr: TFCA256Hdr; niter:byte): integer;
  {-Initialize crypt context using password pointer pPW and hdr.salt}
 var
  XKey: TX256Key;
  Err : integer;
+ intiter:longint;
 begin
 
+ intiter:=(niter*100000)+25000;
+
  {derive the EAX key / nonce and pw verifier}
- Err := pbkdf2(FindHash_by_ID(_Whirlpool), pPW, pLen, @hdr.salt, sizeof(TFCA256Salt), 25000, XKey, sizeof(XKey));
+ Err := pbkdf2(FindHash_by_ID(_Whirlpool), pPW, pLen, @hdr.salt, sizeof(TFCA256Salt), intiter, XKey, sizeof(XKey));
 
  {init AES EAX mode with ak/hk}
  if Err=0 then Err := AES_EAX_Init(XKey.ak, 8*sizeof(XKey.ak), xkey.hk, sizeof(XKey.hk), cx);;

diff --git a/peazip-sources/dev/fcsp256.pas b/peazip-sources/dev/fcsp256.pas
@@ -91,7 +91,7 @@ TFCS_HMAC256_Context = record
 
 
 function FCS_EAX256_init(var cx: TSP_EAXContext; pPW: pointer; pLen: word; var hdr: TFCS256Hdr): integer;
-function FCS_EAX256_initP(var cx: TSP_EAXContext; pPW: pointer; pLen: word; var hdr: TFCS256Hdr): integer;
+function FCS_EAX256_initP(var cx: TSP_EAXContext; pPW: pointer; pLen: word; var hdr: TFCS256Hdr; niter:byte): integer;
  {-Initialize crypt context using password pointer pPW and hdr.salt}
 
 function FCS_EAX256_initS(var cx: TSP_EAXContext; sPW: Str255; var hdr: TFCS256Hdr): integer;
@@ -235,15 +235,18 @@ function FCS_EAX256_init(var cx: TSP_EAXContext; pPW: pointer; pLen: word; var h
  fillchar(XKey, sizeof(XKey),0);
 end;
 
-function FCS_EAX256_initP(var cx: TSP_EAXContext; pPW: pointer; pLen: word; var hdr: TFCS256Hdr): integer;
+function FCS_EAX256_initP(var cx: TSP_EAXContext; pPW: pointer; pLen: word; var hdr: TFCS256Hdr; niter:byte): integer;
  {-Initialize crypt context using password pointer pPW and hdr.salt}
 var
  XKey: TX256Key;
  Err : integer;
+ intiter:longint;
 begin
 
+ intiter:=(niter*100000)+75000;
+
  {derive the EAX key / nonce and pw verifier}
- Err := pbkdf2(FindHash_by_ID(_SHA3_512), pPW, pLen, @hdr.salt, sizeof(TFCS256Salt), 75000, XKey, sizeof(XKey));
+ Err := pbkdf2(FindHash_by_ID(_SHA3_512), pPW, pLen, @hdr.salt, sizeof(TFCS256Salt), intiter, XKey, sizeof(XKey));
 
  {init SP EAX mode with ak/hk}
  if Err=0 then Err := SP_EAX_Init(XKey.ak, 8*sizeof(XKey.ak), xkey.hk, sizeof(XKey.hk), cx);;

diff --git a/peazip-sources/dev/fctf256.pas b/peazip-sources/dev/fctf256.pas
@@ -91,7 +91,7 @@ TFCF_HMAC256_Context = record
 
 
 function FCF_EAX256_init(var cx: TTF_EAXContext; pPW: pointer; pLen: word; var hdr: TFCF256Hdr): integer;
-function FCF_EAX256_initP(var cx: TTF_EAXContext; pPW: pointer; pLen: word; var hdr: TFCF256Hdr): integer;
+function FCF_EAX256_initP(var cx: TTF_EAXContext; pPW: pointer; pLen: word; var hdr: TFCF256Hdr; niter:byte): integer;
  {-Initialize crypt context using password pointer pPW and hdr.salt}
 
 function FCF_EAX256_initS(var cx: TTF_EAXContext; sPW: Str255; var hdr: TFCF256Hdr): integer;
@@ -235,15 +235,18 @@ function FCF_EAX256_init(var cx: TTF_EAXContext; pPW: pointer; pLen: word; var h
  fillchar(XKey, sizeof(XKey),0);
 end;
 
-function FCF_EAX256_initP(var cx: TTF_EAXContext; pPW: pointer; pLen: word; var hdr: TFCF256Hdr): integer;
+function FCF_EAX256_initP(var cx: TTF_EAXContext; pPW: pointer; pLen: word; var hdr: TFCF256Hdr; niter:byte): integer;
  {-Initialize crypt context using password pointer pPW and hdr.salt}
 var
  XKey: TX256Key;
  Err : integer;
+ intiter:longint;
 begin
 
+ intiter:=(niter*100000)+50000;
+
  {derive the EAX key / nonce and pw verifier}
- Err := pbkdf2(FindHash_by_ID(_SHA512), pPW, pLen, @hdr.salt, sizeof(TFCF256Salt), 50000, XKey, sizeof(XKey));
+ Err := pbkdf2(FindHash_by_ID(_SHA512), pPW, pLen, @hdr.salt, sizeof(TFCF256Salt), intiter, XKey, sizeof(XKey));
 
  {init TF EAX mode with ak/hk}
  if Err=0 then Err := TF_EAX_Init(XKey.ak, 8*sizeof(XKey.ak), xkey.hk, sizeof(XKey.hk), cx);;

diff --git a/peazip-sources/dev/pea.rc b/peazip-sources/dev/pea.rc
@@ -1,22 +1,22 @@
 MAINICON ICON "peazip.ico"
 // Version Info 
 1 VERSIONINFO 
-FILEVERSION 1,1,8,0 
-PRODUCTVERSION 1,1,8,0 
+FILEVERSION 1,1,9,0 
+PRODUCTVERSION 1,1,9,0 
 { 
  BLOCK "StringFileInfo" 
  { 
  BLOCK "040904E4" 
  { 
 VALUE "CompanyName", "Giorgio Tani" 
-VALUE "FileVersion", "1.1.8" 
+VALUE "FileVersion", "1.1.9" 
 VALUE "FileDescription", "Pea: pack, encrypt, authenticate" 
 VALUE "InternalName", "Pea" 
 VALUE "LegalCopyright", "Giorgio Tani, LGPLv3" 
 VALUE "LegalTrademarks", "none" 
 VALUE "OriginalFilename", "Pea" 
 VALUE "ProductName", "Pea" 
-VALUE "ProductVersion", "1.1.8" 
+VALUE "ProductVersion", "1.1.9" 
  } 
  } 
  BLOCK "VarFileInfo" 

diff --git a/peazip-sources/dev/pea.res b/peazip-sources/dev/pea.res