Add files via upload

peazip · Jan 1, 2025 · b1df7a0 · b1df7a0
1 parent 5363fc9
commit b1df7a0
Show file tree

Hide file tree

Showing 57 changed files with 16,535 additions and 17,102 deletions.
diff --git a/peazip-sources/dev/fcaes256.pas b/peazip-sources/dev/fcaes256.pas
@@ -274,6 +274,7 @@ function FCA_EAX256_initP(var cx: TAES_EAXContext; pPW: pointer; pLen: word; var
 
   {derive the EAX key / nonce and pw verifier}
   case tkdf of
+  'hybrid': Err := scrypt_kdf(pPW, pLen, @hdr.salt, sizeof(TFCA256Salt), memiter, 8, piter, XKey, sizeof(XKey));
   'scrypt': Err := scrypt_kdf(pPW, pLen, @hdr.salt, sizeof(TFCA256Salt), memiter, 8, piter, XKey, sizeof(XKey));
   'pbkdf2': Err := pbkdf2(FindHash_by_ID(_Whirlpool), pPW, pLen, @hdr.salt, sizeof(TFCA256Salt), intiter, XKey, sizeof(XKey));
   else

diff --git a/peazip-sources/dev/fcsp256.pas b/peazip-sources/dev/fcsp256.pas
@@ -261,8 +261,21 @@ function FCS_EAX256_initP(var cx: TSP_EAXContext; pPW: pointer; pLen: word; var
   else piter:=1;
   end;
 
+  if tkdf='hybrid' then
+  case niter of
+  1: intiter:=200000+75000;
+  2: intiter:=500000+75000;
+  3: intiter:=1000000+75000;
+  4: intiter:=2000000+75000;
+  5: intiter:=5000000+75000;
+  6: intiter:=10000000+75000;
+  7: intiter:=25000000+75000;
+  else intiter:=75000;
+  end;
+
   {derive the EAX key / nonce and pw verifier}
-    case tkdf of
+  case tkdf of
+  'hybrid': Err := pbkdf2(FindHash_by_ID(_SHA3_512), pPW, pLen, @hdr.salt, sizeof(TFCS256Salt), intiter, XKey, sizeof(XKey));
   'scrypt': Err := scrypt_kdf(pPW, pLen, @hdr.salt, sizeof(TFCS256Salt), memiter, 8, piter, XKey, sizeof(XKey));
   'pbkdf2': Err := pbkdf2(FindHash_by_ID(_SHA3_512), pPW, pLen, @hdr.salt, sizeof(TFCS256Salt), intiter, XKey, sizeof(XKey));
   else

diff --git a/peazip-sources/dev/fctf256.pas b/peazip-sources/dev/fctf256.pas
@@ -263,6 +263,7 @@ function FCF_EAX256_initP(var cx: TTF_EAXContext; pPW: pointer; pLen: word; var
 
   {derive the EAX key / nonce and pw verifier}
   case tkdf of
+  'hybrid': Err := scrypt_kdf(pPW, pLen, @hdr.salt, sizeof(TFCF256Salt), memiter div 2, 16, piter, XKey, sizeof(XKey));
   'scrypt': Err := scrypt_kdf(pPW, pLen, @hdr.salt, sizeof(TFCF256Salt), memiter, 8, piter, XKey, sizeof(XKey));
   'pbkdf2': Err := pbkdf2(FindHash_by_ID(_SHA512), pPW, pLen, @hdr.salt, sizeof(TFCF256Salt), intiter, XKey, sizeof(XKey));
   else

diff --git a/peazip-sources/dev/list_utils.pas b/peazip-sources/dev/list_utils.pas
@@ -1798,7 +1798,7 @@ procedure cp_search_linuxlike(desk_env: byte);
   P := TProcessUTF8.Create(nil);
   P.Options := [poWaitOnExit];
   case desk_env of
-     1: P.Executable := 'gnome-search-tool';
+     1: P.CommandLine := 'xdg-open /';//'gnome-search-tool';
      2: P.Executable := 'kfind';
      20: P.CommandLine := 'open /';
      end;

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,2,1,0 
-PRODUCTVERSION 1,2,1,0 
+FILEVERSION 1,2,2,0 
+PRODUCTVERSION 1,2,2,0 
 { 
  BLOCK "StringFileInfo" 
   { 
   BLOCK "040904E4" 
    { 
 VALUE "CompanyName", "Giorgio Tani" 
-VALUE "FileVersion", "1.2.1" 
+VALUE "FileVersion", "1.2.2" 
 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.2.1" 
+VALUE "ProductVersion", "1.2.2" 
    } 
   } 
  BLOCK "VarFileInfo" 

diff --git a/peazip-sources/dev/pea.res b/peazip-sources/dev/pea.res
diff --git a/peazip-sources/dev/pea_utils.pas b/peazip-sources/dev/pea_utils.pas
@@ -108,7 +108,7 @@ interface
 
 const
 PEA_FILEFORMAT_VER = 1;
-PEA_FILEFORMAT_REV = 5; //version and revision declared to be implemented must match with the ones in unit_pea, otherwise a warning will be raised (unit_pea)
+PEA_FILEFORMAT_REV = 6; //version and revision declared to be implemented must match with the ones in unit_pea, otherwise a warning will be raised (unit_pea)
 SUCCESS = 0;
 INCOMPLETE_FUNCTION = 1;
 NOT_PEA_HEADER = 2;
@@ -1185,6 +1185,9 @@ function pea_parse_stream_header ( read_data:array of byte;
   71: algo:='SRIATS'; //hex 47
   72: algo:='SRITSA'; //hex 48
   73: algo:='SRISAT'; //hex 49
+  74: algo:='HRIATS'; //hex 4A
+  75: algo:='HRITSA'; //hex 4B
+  76: algo:='HRISAT'; //hex 4C
    else
       begin
       pea_parse_stream_header:=UNKNOWN_CONTROL_ALGORITHM;
@@ -1428,7 +1431,7 @@ function decode_control_algo ( var algo:ansistring;
          try niter:=strtoint(copy((algo),7,length(algo)-6)) except end;
       end;
    case nalgo of
-      'TRIATS','TRITSA','TRISAT','SRIATS','SRITSA','SRISAT':
+      'TRIATS','TRITSA','TRISAT','SRIATS','SRITSA','SRISAT','HRIATS','HRITSA','HRISAT':
       begin
       algo:=nalgo;
       headersize:=10+16+16+16;
@@ -1542,6 +1545,9 @@ function encode_algo_stream ( stream_control_algorithm:ansistring;
    'SRIATS': code:=$47;
    'SRITSA': code:=$48;
    'SRISAT': code:=$49;
+   'HRIATS': code:=$4A;
+   'HRITSA': code:=$4B;
+   'HRISAT': code:=$4C;
    else encode_algo_stream:=UNKNOWN_CONTROL_ALGORITHM;
    end;
 if encode_algo_stream=INCOMPLETE_FUNCTION then encode_algo_stream:=SUCCESS;