Add encryption algorithm and key derivation algorithm to the 7z format.

Author: fzxx

C/7zVersion.h

@@ -10,12 +10,12 @@
   #define MY_VERSION_CPU MY_VERSION
 #endif
 
-#define MY_DATE "2026-04-27"
+#define MY_DATE "2026-06-12"
 #undef MY_COPYRIGHT
 #undef MY_VERSION_COPYRIGHT_DATE
-#define MY_AUTHOR_NAME "Igor Pavlov, Tino Reichardt, Sergey G. Brester"
+#define MY_AUTHOR_NAME "Igor Pavlov, Tino Reichardt, Sergey G. Brester, fzxx"
 #define MY_COPYRIGHT_PD "Igor Pavlov : Public domain"
-#define MY_COPYRIGHT_CR "Copyright (c) 1999- Igor Pavlov, 2016- Tino Reichardt, 2022- Sergey G. Brester"
+#define MY_COPYRIGHT_CR "Copyright (c) 1999- Igor Pavlov, 2016- Tino Reichardt, 2022- Sergey G. Brester, 2026- fzxx"
 
 #ifdef USE_COPYRIGHT_CR
   #define MY_COPYRIGHT MY_COPYRIGHT_CR

C/7zVersion.rc

@@ -34,7 +34,7 @@ BEGIN \
     BEGIN  \
         BLOCK "040904b0" \
         BEGIN \
-            VALUE "CompanyName", "Igor Pavlov, Tino Reichardt" \
+            VALUE "CompanyName", "Igor Pavlov, Tino Reichardt, Sergey G. Brester, fzxx" \
             VALUE "FileDescription", descr \
             VALUE "FileVersion", MY_VERSION  \
             VALUE "InternalName", intName \

CPP/7zip/7zip.mak

@@ -283,7 +283,7 @@ $(FASTLZMA2_OBJS): ../../../../C/fast-lzma2/$(*B).c
 {../../Compress}.cpp{$O}.obj::
 	$(COMPLB)
 {../../Crypto}.cpp{$O}.obj::
-	$(CCOMPLB)
+	$(COMPLB_O2)
 {../../../../C}.c{$O}.obj::
 	$(CCOMPLB)
 {../../../../C/brotli}.c{$O}.obj::

CPP/7zip/7zip_gcc.mak

@@ -828,16 +828,30 @@ $O/7zAes.o: ../../Crypto/7zAes.cpp
 	$(CXX) $(CXXFLAGS) $<
 $O/7zAesRegister.o: ../../Crypto/7zAesRegister.cpp
 	$(CXX) $(CXXFLAGS) $<
+$O/7zKeyDerivation.o: ../../Crypto/7zKeyDerivation.cpp
+	$(CXX) $(CXXFLAGS) $<
+$O/Ascon.o: ../../Crypto/Ascon.cpp
+	$(CXX) $(CXXFLAGS) $<
+$O/Cascade.o: ../../Crypto/Cascade.cpp
+	$(CXX) $(CXXFLAGS) $<
+$O/CascadeRegister.o: ../../Crypto/CascadeRegister.cpp
+	$(CXX) $(CXXFLAGS) $<
+$O/HkdfBlake2sp.o: ../../Crypto/HkdfBlake2sp.cpp
+	$(CXX) $(CXXFLAGS) $<
 $O/HmacSha1.o: ../../Crypto/HmacSha1.cpp
 	$(CXX) $(CXXFLAGS) $<
 $O/HmacSha256.o: ../../Crypto/HmacSha256.cpp
 	$(CXX) $(CXXFLAGS) $<
+$O/HmacSha512.o: ../../Crypto/HmacSha512.cpp
+	$(CXX) $(CXXFLAGS) $<
 $O/MyAes.o: ../../Crypto/MyAes.cpp
 	$(CXX) $(CXXFLAGS) $<
 $O/MyAesReg.o: ../../Crypto/MyAesReg.cpp
 	$(CXX) $(CXXFLAGS) $<
 $O/Pbkdf2HmacSha1.o: ../../Crypto/Pbkdf2HmacSha1.cpp
 	$(CXX) $(CXXFLAGS) $<
+$O/Pbkdf2HmacSha512.o: ../../Crypto/Pbkdf2HmacSha512.cpp
+	$(CXX) $(CXXFLAGS) $<
 $O/RandGen.o: ../../Crypto/RandGen.cpp
 	$(CXX) $(CXXFLAGS) $<
 $O/Rar20Crypto.o: ../../Crypto/Rar20Crypto.cpp
@@ -848,6 +862,14 @@ $O/RarAes.o: ../../Crypto/RarAes.cpp
 	$(CXX) $(CXXFLAGS) $<
 $O/WzAes.o: ../../Crypto/WzAes.cpp
 	$(CXX) $(CXXFLAGS) $<
+$O/XChaCha20.o: ../../Crypto/XChaCha20.cpp
+	$(CXX) $(CXXFLAGS) $<
+$O/XChaCha20Register.o: ../../Crypto/XChaCha20Register.cpp
+	$(CXX) $(CXXFLAGS) $<
+$O/XChaCha20Poly1305.o: ../../Crypto/XChaCha20Poly1305.cpp
+	$(CXX) $(CXXFLAGS) $<
+$O/XChaCha20Poly1305Register.o: ../../Crypto/XChaCha20Poly1305Register.cpp
+	$(CXX) $(CXXFLAGS) $<
 $O/ZipCrypto.o: ../../Crypto/ZipCrypto.cpp
 	$(CXX) $(CXXFLAGS) $<
 $O/ZipStrong.o: ../../Crypto/ZipStrong.cpp

CPP/7zip/Archive/7z/7zCompressionMode.h

@@ -6,6 +6,8 @@
 #include "../../Common/MethodId.h"
 #include "../../Common/MethodProps.h"
 
+#include "7zHeader.h"
+
 namespace NArchive {
 namespace N7z {
 
@@ -64,6 +66,7 @@ struct CCompressionMethodMode
 
   UString Password; // _Wipe
   UInt64 MemoryUsageLimit;
+  CMethodId EncryptionMethodId;
 
   bool IsEmpty() const { return (Methods.IsEmpty() && !PasswordIsDefined); }
   CCompressionMethodMode():
@@ -78,6 +81,7 @@ struct CCompressionMethodMode
       , NumThreadGroups(0)
       #endif
       , MemoryUsageLimit((UInt64)1 << 30)
+      , EncryptionMethodId(k_AES)
   {}
 
 #ifdef Z7_CPP_IS_SUPPORTED_default

CPP/7zip/Archive/7z/7zDecode.cpp

@@ -584,9 +584,27 @@ HRESULT CDecoder::Decode(
       progress2 = new CDecProgress(compressProgress);
 
     ISequentialOutStream *outStreamPointer = outStream;
-    return _mixer->Code(inStreamPointers, &outStreamPointer,
+    const HRESULT codeResult = _mixer->Code(inStreamPointers, &outStreamPointer,
         progress2 ? (ICompressProgressInfo *)progress2 : compressProgress,
         dataAfterEnd_Error);
+
+    if (codeResult == S_OK)
+    {
+      for (i = 0; i < folderInfo.Coders.Size(); i++)
+      {
+        Z7_DECL_CMyComPtr_QI_FROM(
+            ICryptoAuthVerify,
+            authVerify, _mixer->GetCoder(i).GetUnknown())
+        if (authVerify)
+        {
+          Int32 authResult = 0;
+          RINOK(authVerify->CryptoAuthVerify(&authResult))
+          if (authResult != 0)
+            return E_FAIL;
+        }
+      }
+    }
+    return codeResult;
   }
 
   #ifdef USE_MIXER_ST

CPP/7zip/Archive/7z/7zEncode.cpp

@@ -562,7 +562,7 @@ HRESULT CEncoder::EncoderConstr()
       throw 1;
 
     CMethodFull method;
-    method.Id = k_AES;
+    method.Id = _options.EncryptionMethodId;
     method.NumStreams = 1;
     _options.Methods.Add(method);
 
@@ -687,7 +687,7 @@ HRESULT CEncoder::EncoderConstr()
     {
       CMethodFull method;
       method.NumStreams = 1;
-      method.Id = k_AES;
+      method.Id = _options.EncryptionMethodId;
       _options.Methods.Add(method);
 
       NCoderMixer2::CCoderStreamsInfo cod;

CPP/7zip/Archive/7z/7zHandler.cpp

@@ -307,7 +307,11 @@ bool CHandler::IsFolderEncrypted(CNum folderIndex) const
     for (unsigned j = 0; j < idSize; j++)
       id64 = ((id64 << 8) | longID[j]);
     inByte.SkipDataNoCheck(idSize);
-    if (id64 == k_AES)
+    if (id64 == k_AES
+        || id64 == k_XCHACHA20
+        || id64 == k_XCHACHA20_POLY1305
+        || id64 == k_AES_XCHACHA20_POLY1305
+        || id64 == k_AES_XCHACHA20_ASCON)
       return true;
     if ((mainByte & 0x20) != 0)
       inByte.SkipDataNoCheck(inByte.ReadNum());
@@ -706,6 +710,46 @@ HRESULT CHandler::ObtainBlockMethods(CNum folderIndex, PROPVARIANT *prop, CHandl
           ConvertUInt32ToString(numCyclesPower, s);
         }
         break;
+      case k_XCHACHA20:
+        if (info) continue;
+        name = "XChaCha20";
+        if (propsSize >= 1)
+        {
+          const Byte firstByte = props[0];
+          const UInt32 numCyclesPower = firstByte & 0x3F;
+          ConvertUInt32ToString(numCyclesPower, s);
+        }
+        break;
+      case k_XCHACHA20_POLY1305:
+        if (info) continue;
+        name = "XChaCha20-Poly1305";
+        if (propsSize >= 1)
+        {
+          const Byte firstByte = props[0];
+          const UInt32 numCyclesPower = firstByte & 0x3F;
+          ConvertUInt32ToString(numCyclesPower, s);
+        }
+        break;
+      case k_AES_XCHACHA20_ASCON:
+        if (info) continue;
+        name = "AES+XChaCha20+Ascon";
+        if (propsSize >= 1)
+        {
+          const Byte firstByte = props[0];
+          const UInt32 numCyclesPower = firstByte & 0x3F;
+          ConvertUInt32ToString(numCyclesPower, s);
+        }
+        break;
+      case k_AES_XCHACHA20_POLY1305:
+        if (info) continue;
+        name = "AES+XChaCha20-Poly1305";
+        if (propsSize >= 1)
+        {
+          const Byte firstByte = props[0];
+          const UInt32 numCyclesPower = firstByte & 0x3F;
+          ConvertUInt32ToString(numCyclesPower, s);
+        }
+        break;
       }
     }
 

CPP/7zip/Archive/7z/7zHandler.h

@@ -60,6 +60,7 @@ class COutHandler: public CMultiMethodProps
   UInt32 _decoderCompatibilityVersion;
   CUIntVector _enabledFilters;
   CUIntVector _disabledFilters;
+  CMethodId _encryptionMethodId;
 
   void InitSolidFiles() { _numSolidFiles = (UInt64)(Int64)(-1); }
   void InitSolidSize()  { _numSolidBytes = (UInt64)(Int64)(-1); }

CPP/7zip/Archive/7z/7zHandlerOut.cpp

@@ -767,6 +767,7 @@ Z7_COM7F_IMF(CHandler::UpdateItems(ISequentialOutStream *outStream, UInt32 numIt
 
   if (methodMode.PasswordIsDefined)
   {
+    methodMode.EncryptionMethodId = _encryptionMethodId;
     if (_encryptHeadersSpecified)
       encryptHeaders = _encryptHeaders;
     #ifndef Z7_NO_CRYPTO
@@ -778,6 +779,7 @@ Z7_COM7F_IMF(CHandler::UpdateItems(ISequentialOutStream *outStream, UInt32 numIt
     {
       headerMethod.PasswordIsDefined = methodMode.PasswordIsDefined;
       headerMethod.Password = methodMode.Password;
+      headerMethod.EncryptionMethodId = _encryptionMethodId;
     }
   }
 
@@ -892,6 +894,7 @@ void COutHandler::InitProps7z()
   _decoderCompatibilityVersion = k_decoderCompatibilityVersion;
   _enabledFilters.Clear();
   _disabledFilters.Clear();
+  _encryptionMethodId = k_AES;
 }
 
 void COutHandler::InitProps()
@@ -1040,6 +1043,29 @@ HRESULT COutHandler::SetProperty(const wchar_t *nameSpec, const PROPVARIANT &val
       _encryptHeadersSpecified = true;
       return S_OK;
     }
+
+    if (name.IsEqualTo("em"))
+    {
+      if (value.vt != VT_BSTR)
+        return E_INVALIDARG;
+      UString m = value.bstrVal;
+      m.RemoveChar(L'-');
+      m.RemoveChar(L'+');
+      m.MakeLower_Ascii();
+      if (m.IsEqualTo("aes256"))
+        _encryptionMethodId = k_AES;
+      else if (m.IsEqualTo("xchacha20"))
+        _encryptionMethodId = k_XCHACHA20;
+      else if (m.IsEqualTo("xchacha20poly1305"))
+        _encryptionMethodId = k_XCHACHA20_POLY1305;
+      else if (m.IsEqualTo("axa") || m.IsEqualTo("aesxchacha20ascon"))
+        _encryptionMethodId = k_AES_XCHACHA20_ASCON;
+      else if (m.IsEqualTo("axp") || m.IsEqualTo("aesxchacha20poly1305"))
+        _encryptionMethodId = k_AES_XCHACHA20_POLY1305;
+      else
+        return E_INVALIDARG;
+      return S_OK;
+    }
 
     {
       bool processed;