Remove SM4 support!

Translations/Language.ar.xml

@@ -1644,7 +1644,6 @@
     <entry lang="ar" key="MOUNTPOINT_BLOCKED">خطأ: نقطة تركيب الحجم محظورة لأنها تحل محل دليل نظام محمي.\n\nيرجى اختيار نقطة تركيب مختلفة.</entry>
     <entry lang="ar" key="MOUNTPOINT_NOTALLOWED">خطأ: نقطة تركيب الحجم غير مسموح بها لأنها تحل محل دليل مدرج ضمن متغير البيئة PATH.\n\nيرجى اختيار نقطة تركيب مختلفة.</entry>
     <entry lang="ar" key="INSECURE_MODE">[وضع غير آمن]</entry>
-    <entry lang="en" key="SM4_HELP">SM4 is a block cipher standard published by the Chinese National Cryptography Administration in 2006 as part of the GB/T 32907-2016 standard. 128-bit key, 128-bit block. Mode of operation is XTS. It is widely used in Chinese national standards and commercial applications.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.be.xml

@@ -1644,7 +1644,6 @@
     <entry lang="en" key="MOUNTPOINT_BLOCKED">ERROR: The volume mount point is blocked because it overrides a protected system directory.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="MOUNTPOINT_NOTALLOWED">ERROR: The volume mount point is not allowed because it overrides a directory that is part of the PATH environment variable.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="INSECURE_MODE">[INSECURE MODE]</entry>
-    <entry lang="en" key="SM4_HELP">SM4 is a block cipher standard published by the Chinese National Cryptography Administration in 2006 as part of the GB/T 32907-2016 standard. 128-bit key, 128-bit block. Mode of operation is XTS. It is widely used in Chinese national standards and commercial applications.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.bg.xml

@@ -1644,7 +1644,6 @@
     <entry lang="en" key="MOUNTPOINT_BLOCKED">ERROR: The volume mount point is blocked because it overrides a protected system directory.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="MOUNTPOINT_NOTALLOWED">ERROR: The volume mount point is not allowed because it overrides a directory that is part of the PATH environment variable.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="INSECURE_MODE">[INSECURE MODE]</entry>
-    <entry lang="en" key="SM4_HELP">SM4 is a block cipher standard published by the Chinese National Cryptography Administration in 2006 as part of the GB/T 32907-2016 standard. 128-bit key, 128-bit block. Mode of operation is XTS. It is widely used in Chinese national standards and commercial applications.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.ca.xml

@@ -1644,7 +1644,6 @@
     <entry lang="en" key="MOUNTPOINT_BLOCKED">ERROR: The volume mount point is blocked because it overrides a protected system directory.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="MOUNTPOINT_NOTALLOWED">ERROR: The volume mount point is not allowed because it overrides a directory that is part of the PATH environment variable.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="INSECURE_MODE">[INSECURE MODE]</entry>
-    <entry lang="en" key="SM4_HELP">SM4 is a block cipher standard published by the Chinese National Cryptography Administration in 2006 as part of the GB/T 32907-2016 standard. 128-bit key, 128-bit block. Mode of operation is XTS. It is widely used in Chinese national standards and commercial applications.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.co.xml

@@ -1663,7 +1663,6 @@ Information about Corsican localization:
 	    <entry lang="co" key="MOUNTPOINT_BLOCKED">SBAGLIU : U puntu du muntatura di u vulume hè bluccatu perchè ellu rimpiazzeghja un cartulare prutettu di u sistema.\n\nCi vole à sceglie un puntu du muntatura sfarente.</entry>
 	    <entry lang="co" key="MOUNTPOINT_NOTALLOWED">SBAGLIU : U puntu du muntatura di u vulume ùn hè micca permessu perchè ellu rimpiazzeghja un cartulare chì face parte di a variabile d’ambiente PATH.\n\nCi vole à sceglie un puntu du muntatura sfarente.</entry>
 	    <entry lang="co" key="INSECURE_MODE">[MODU NONSICURU]</entry>
-	    <entry lang="co" key="SM4_HELP">SM4 hè una norma di ciframentu à u bloccu, publicata da l'Amministrazione naziunale chinese di crittografia in u 2006, chì face parte di a norma GB/T 32907-2016. Chjave di 128 bit è bloccu di 128 bit. U modu d’operazione hè XTS. SM4 hè impiegata assai in e norme naziunale chinese è in l’appiecazioni cummerciale.</entry>
 	</localization>
 	<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 		<xs:element name="VeraCrypt">

Translations/Language.cs.xml

@@ -1644,7 +1644,6 @@
     <entry lang="cs" key="MOUNTPOINT_BLOCKED">CHYBA: Připojovací bod svazku je blokován, jelikož je nadřazen chráněnému systémovému adresáři.\n\nProsím, zvolte jiný přípojovací bod.</entry>
     <entry lang="cs" key="MOUNTPOINT_NOTALLOWED">CHYBA: Připojovací bod svazku není povolen, jelikož přepisuje adresář, jenž je součástí proměnného prostředí PATH.\n\nProsím, vyberte jiný připojovací bod.</entry>
     <entry lang="cs" key="INSECURE_MODE">[NEZABEZPEČENÝ REŽIM]</entry>
-    <entry lang="en" key="SM4_HELP">SM4 is a block cipher standard published by the Chinese National Cryptography Administration in 2006 as part of the GB/T 32907-2016 standard. 128-bit key, 128-bit block. Mode of operation is XTS. It is widely used in Chinese national standards and commercial applications.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.da.xml

@@ -1644,7 +1644,6 @@
     <entry lang="en" key="MOUNTPOINT_BLOCKED">ERROR: The volume mount point is blocked because it overrides a protected system directory.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="MOUNTPOINT_NOTALLOWED">ERROR: The volume mount point is not allowed because it overrides a directory that is part of the PATH environment variable.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="INSECURE_MODE">[INSECURE MODE]</entry>
-    <entry lang="en" key="SM4_HELP">SM4 is a block cipher standard published by the Chinese National Cryptography Administration in 2006 as part of the GB/T 32907-2016 standard. 128-bit key, 128-bit block. Mode of operation is XTS. It is widely used in Chinese national standards and commercial applications.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.de.xml

@@ -1647,7 +1647,6 @@
     <entry lang="de" key="MOUNTPOINT_BLOCKED">FEHLER: Der Einhängepunkt ist blockiert, da er ein geschütztes Systemverzeichnis überschreibt.\n\nBitte wählen Sie einen anderen Einhängepunkt.</entry>
     <entry lang="de" key="MOUNTPOINT_NOTALLOWED">FEHLER: Der Einhängepunkt ist unzulässig, da er ein Verzeichnis überschreibt, das zur PATH-Umgebungsvariable gehört.\n\nBitte wählen Sie einen anderen Einhängepunkt.</entry>
     <entry lang="de" key="INSECURE_MODE">[UNSICHERER MODUS]</entry>
-    <entry lang="de" key="SM4_HELP">SM4 ist ein Blockchiffre-Standard, der 2006 von der nationalen chinesischen Behörde für Kryptografie im Rahmen des Standards GB/T 32907-2016 veröffentlicht wurde. 128 Bit Schlüssellänge, 128 Bit Blockgröße.\nArbeitet im XTS-Modus. Findet breite Anwendung in chinesischen nationalen Standards und kommerziellen Anwendungen.</entry>
   </localization>
   <!-- XML-Schema -->
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Translations/Language.el.xml

@@ -1644,7 +1644,6 @@
     <entry lang="en" key="MOUNTPOINT_BLOCKED">ERROR: The volume mount point is blocked because it overrides a protected system directory.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="MOUNTPOINT_NOTALLOWED">ERROR: The volume mount point is not allowed because it overrides a directory that is part of the PATH environment variable.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="INSECURE_MODE">[INSECURE MODE]</entry>
-    <entry lang="en" key="SM4_HELP">SM4 is a block cipher standard published by the Chinese National Cryptography Administration in 2006 as part of the GB/T 32907-2016 standard. 128-bit key, 128-bit block. Mode of operation is XTS. It is widely used in Chinese national standards and commercial applications.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.es.xml

@@ -1644,7 +1644,6 @@
     <entry lang="es" key="MOUNTPOINT_BLOCKED">ERROR: El punto de montaje del volumen está bloqueado porque sobrescribe un directorio protegido del sistema.\n\nElija un punto de montaje diferente.</entry>
     <entry lang="es" key="MOUNTPOINT_NOTALLOWED">ERROR: No se permite el punto de montaje del volumen porque sobrescribe un directorio que forma parte de la ruta PATH.\n\nElija un punto de montaje diferente.</entry>
     <entry lang="es" key="INSECURE_MODE">[MODO INSEGURO]</entry>
-    <entry lang="en" key="SM4_HELP">SM4 is a block cipher standard published by the Chinese National Cryptography Administration in 2006 as part of the GB/T 32907-2016 standard. 128-bit key, 128-bit block. Mode of operation is XTS. It is widely used in Chinese national standards and commercial applications.</entry>
 </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.et.xml

@@ -1644,7 +1644,6 @@
     <entry lang="en" key="MOUNTPOINT_BLOCKED">ERROR: The volume mount point is blocked because it overrides a protected system directory.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="MOUNTPOINT_NOTALLOWED">ERROR: The volume mount point is not allowed because it overrides a directory that is part of the PATH environment variable.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="INSECURE_MODE">[INSECURE MODE]</entry>
-    <entry lang="en" key="SM4_HELP">SM4 is a block cipher standard published by the Chinese National Cryptography Administration in 2006 as part of the GB/T 32907-2016 standard. 128-bit key, 128-bit block. Mode of operation is XTS. It is widely used in Chinese national standards and commercial applications.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.eu.xml

@@ -1644,7 +1644,6 @@
     <entry lang="en" key="MOUNTPOINT_BLOCKED">ERROR: The volume mount point is blocked because it overrides a protected system directory.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="MOUNTPOINT_NOTALLOWED">ERROR: The volume mount point is not allowed because it overrides a directory that is part of the PATH environment variable.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="INSECURE_MODE">[INSECURE MODE]</entry>
-    <entry lang="en" key="SM4_HELP">SM4 is a block cipher standard published by the Chinese National Cryptography Administration in 2006 as part of the GB/T 32907-2016 standard. 128-bit key, 128-bit block. Mode of operation is XTS. It is widely used in Chinese national standards and commercial applications.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.fa.xml

@@ -1644,7 +1644,6 @@
     <entry lang="en" key="MOUNTPOINT_BLOCKED">ERROR: The volume mount point is blocked because it overrides a protected system directory.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="MOUNTPOINT_NOTALLOWED">ERROR: The volume mount point is not allowed because it overrides a directory that is part of the PATH environment variable.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="INSECURE_MODE">[INSECURE MODE]</entry>
-    <entry lang="en" key="SM4_HELP">SM4 is a block cipher standard published by the Chinese National Cryptography Administration in 2006 as part of the GB/T 32907-2016 standard. 128-bit key, 128-bit block. Mode of operation is XTS. It is widely used in Chinese national standards and commercial applications.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.fi.xml

@@ -1644,7 +1644,6 @@
     <entry lang="fi" key="MOUNTPOINT_BLOCKED">VIRHE: Taltion liitoskohta on estetty, koska se korvaa suojatun järjestelmäkansion.\n\nValitse toinen liitoskohta.</entry>
     <entry lang="fi" key="MOUNTPOINT_NOTALLOWED">VIRHE: Taltion liitoskohta ei ole sallittu, koska se korvaa PATH-ympäristömuuttujaan kuuluvan sijainnin.\n\nValitse toinen liitoskohta.</entry>
     <entry lang="fi" key="INSECURE_MODE">[EPÄTURVALLINEN TILA]</entry>
-    <entry lang="en" key="SM4_HELP">SM4 is a block cipher standard published by the Chinese National Cryptography Administration in 2006 as part of the GB/T 32907-2016 standard. 128-bit key, 128-bit block. Mode of operation is XTS. It is widely used in Chinese national standards and commercial applications.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.fr.xml

@@ -1644,7 +1644,6 @@
     <entry lang="fr" key="MOUNTPOINT_BLOCKED">ERREUR : Le point de montage du volume est bloqué car il remplace un répertoire système protégé.\n\nVeuillez choisir un autre point de montage.</entry>
     <entry lang="fr" key="MOUNTPOINT_NOTALLOWED">ERREUR : Le point de montage du volume n'est pas autorisé car il remplace un répertoire faisant partie de la variable d'environnement PATH.\n\nVeuillez choisir un autre point de montage.</entry>
     <entry lang="fr" key="INSECURE_MODE">[MODE NON SÉCURISÉ]</entry>
-    <entry lang="fr" key="SM4_HELP">SM4 est un standard de chiffrement par blocs publié en 2006 par l’Administration nationale de la cryptographie de Chine, dans le cadre de la norme GB/T 32907-2016. Clé de 128 bits et bloc de 128 bits. Le mode opératoire est XTS. Il a été largement adopté dans les normes nationales chinoises et dans des applications commerciales.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.he.xml

@@ -1645,7 +1645,6 @@
     <entry lang="en" key="MOUNTPOINT_BLOCKED">ERROR: The volume mount point is blocked because it overrides a protected system directory.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="MOUNTPOINT_NOTALLOWED">ERROR: The volume mount point is not allowed because it overrides a directory that is part of the PATH environment variable.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="INSECURE_MODE">[INSECURE MODE]</entry>
-    <entry lang="en" key="SM4_HELP">SM4 is a block cipher standard published by the Chinese National Cryptography Administration in 2006 as part of the GB/T 32907-2016 standard. 128-bit key, 128-bit block. Mode of operation is XTS. It is widely used in Chinese national standards and commercial applications.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified">
     <xs:element name="VeraCrypt">

Translations/Language.hu.xml

@@ -1644,7 +1644,6 @@
     <entry lang="en" key="MOUNTPOINT_BLOCKED">ERROR: The volume mount point is blocked because it overrides a protected system directory.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="MOUNTPOINT_NOTALLOWED">ERROR: The volume mount point is not allowed because it overrides a directory that is part of the PATH environment variable.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="INSECURE_MODE">[INSECURE MODE]</entry>
-    <entry lang="en" key="SM4_HELP">SM4 is a block cipher standard published by the Chinese National Cryptography Administration in 2006 as part of the GB/T 32907-2016 standard. 128-bit key, 128-bit block. Mode of operation is XTS. It is widely used in Chinese national standards and commercial applications.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.id.xml

@@ -1644,7 +1644,6 @@
     <entry lang="en" key="MOUNTPOINT_BLOCKED">ERROR: The volume mount point is blocked because it overrides a protected system directory.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="MOUNTPOINT_NOTALLOWED">ERROR: The volume mount point is not allowed because it overrides a directory that is part of the PATH environment variable.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="INSECURE_MODE">[INSECURE MODE]</entry>
-    <entry lang="en" key="SM4_HELP">SM4 is a block cipher standard published by the Chinese National Cryptography Administration in 2006 as part of the GB/T 32907-2016 standard. 128-bit key, 128-bit block. Mode of operation is XTS. It is widely used in Chinese national standards and commercial applications.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.it.xml

@@ -1644,7 +1644,6 @@
     <entry lang="it" key="MOUNTPOINT_BLOCKED">ERRORE: Il punto di montaggio del volume è bloccato perché sovrascrive una directory di sistema protetta.\n\nScegli un punto di montaggio diverso.</entry>
     <entry lang="it" key="MOUNTPOINT_NOTALLOWED">ERRORE: Il punto di montaggio del volume non è consentito perché sovrascrive una directory che fa parte della variabile d'ambiente PATH.\n\nScegli un punto di montaggio diverso.</entry>
     <entry lang="it" key="INSECURE_MODE">[MODALITÀ NON SICURA]</entry>
-    <entry lang="it" key="SM4_HELP">SM4 è uno standard di cifratura a blocchi pubblicato dall'Amministrazione Cinese per la Crittografia Nazionale nel 2006 come parte dello standard GB/T 32907-2016. Chiave a 128 bit, blocco a 128 bit. La modalità operativa è XTS. È ampiamente utilizzato negli standard nazionali cinesi e nelle applicazioni commerciali.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.ja.xml

@@ -1644,7 +1644,6 @@
     <entry lang="ja" key="MOUNTPOINT_BLOCKED">エラー: ボリュームのマウントポイントは、保護されたシステムディレクトリと競合するためブロックされました。\n\n別のマウントポイントを選択してください。</entry>
     <entry lang="ja" key="MOUNTPOINT_NOTALLOWED">エラー: ボリュームのマウントポイントは、PATH環境変数に含まれるディレクトリを上書きするため使用できません。\n\n別のマウントポイントを選択してください。</entry>
     <entry lang="ja" key="INSECURE_MODE">[非セキュアモード]</entry>
-    <entry lang="ja" key="SM4_HELP">SM4（エスエムフォー）とは、2006年に中国国家暗号管理局によって発表されたブロック暗号規格であり、GB/T 32907-2016標準の一部を成しています。128ビットキー、128ビットブロックを使用します。動作モードはXTSです。SM4は中国の国家標準および商用アプリケーションに広く使用されています。</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.ka.xml

@@ -1644,7 +1644,6 @@
     <entry lang="en" key="MOUNTPOINT_BLOCKED">ERROR: The volume mount point is blocked because it overrides a protected system directory.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="MOUNTPOINT_NOTALLOWED">ERROR: The volume mount point is not allowed because it overrides a directory that is part of the PATH environment variable.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="INSECURE_MODE">[INSECURE MODE]</entry>
-    <entry lang="en" key="SM4_HELP">SM4 is a block cipher standard published by the Chinese National Cryptography Administration in 2006 as part of the GB/T 32907-2016 standard. 128-bit key, 128-bit block. Mode of operation is XTS. It is widely used in Chinese national standards and commercial applications.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.ko.xml

@@ -1644,7 +1644,6 @@
     <entry lang="ko" key="MOUNTPOINT_BLOCKED">오류: 볼륨 마운트 위치가 보호된 시스템 디렉터리를 덮어쓰기 때문에 차단되었습니다.\n\n다른 마운트 위치를 선택하세요.</entry>
     <entry lang="ko" key="MOUNTPOINT_NOTALLOWED">오류: 볼륨 마운트 위치가 PATH 환경 변수의 일부인 디렉터리를 덮어쓰기 때문에 허용되지 않습니다.\n\n다른 마운트 위치를 선택하세요.</entry>
     <entry lang="ko" key="INSECURE_MODE">[비보안 모드]</entry>
-    <entry lang="en" key="SM4_HELP">SM4 is a block cipher standard published by the Chinese National Cryptography Administration in 2006 as part of the GB/T 32907-2016 standard. 128-bit key, 128-bit block. Mode of operation is XTS. It is widely used in Chinese national standards and commercial applications.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.lv.xml

@@ -1644,7 +1644,6 @@
     <entry lang="en" key="MOUNTPOINT_BLOCKED">ERROR: The volume mount point is blocked because it overrides a protected system directory.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="MOUNTPOINT_NOTALLOWED">ERROR: The volume mount point is not allowed because it overrides a directory that is part of the PATH environment variable.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="INSECURE_MODE">[INSECURE MODE]</entry>
-    <entry lang="en" key="SM4_HELP">SM4 is a block cipher standard published by the Chinese National Cryptography Administration in 2006 as part of the GB/T 32907-2016 standard. 128-bit key, 128-bit block. Mode of operation is XTS. It is widely used in Chinese national standards and commercial applications.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.my.xml

@@ -1646,7 +1646,6 @@
     <entry lang="en" key="MOUNTPOINT_BLOCKED">ERROR: The volume mount point is blocked because it overrides a protected system directory.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="MOUNTPOINT_NOTALLOWED">ERROR: The volume mount point is not allowed because it overrides a directory that is part of the PATH environment variable.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="INSECURE_MODE">[INSECURE MODE]</entry>
-    <entry lang="en" key="SM4_HELP">SM4 is a block cipher standard published by the Chinese National Cryptography Administration in 2006 as part of the GB/T 32907-2016 standard. 128-bit key, 128-bit block. Mode of operation is XTS. It is widely used in Chinese national standards and commercial applications.</entry>
   </localization>
   <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="unqualified" elementFormDefault="qualified">
     <xs:element name="VeraCrypt">

Translations/Language.nb.xml

@@ -1644,7 +1644,6 @@
     <entry lang="nb" key="MOUNTPOINT_BLOCKED">FEIL: Volumets monteringspunkt er blokkert fordi det overstyrer en beskyttet systemkatalog.\n\nVennligst velg et annet monteringspunkt.</entry>
     <entry lang="nb" key="MOUNTPOINT_NOTALLOWED">FEIL: Volumets monteringspunkt er ikke tillatt fordi det overstyrer en katalog som er en del av PATH-miljøvariabelen.\n\nVennligst velg et annet monteringspunkt.</entry>
     <entry lang="nb" key="INSECURE_MODE">[USIKKER MODUS]</entry>
-    <entry lang="en" key="SM4_HELP">SM4 is a block cipher standard published by the Chinese National Cryptography Administration in 2006 as part of the GB/T 32907-2016 standard. 128-bit key, 128-bit block. Mode of operation is XTS. It is widely used in Chinese national standards and commercial applications.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.nl.xml

@@ -1644,7 +1644,6 @@
     <entry lang="nl" key="MOUNTPOINT_BLOCKED">FOUT: Het koppelpunt van het volume is geblokkeerd omdat het een beveiligde systeemmap overschrijft.\n\nKies een ander koppelpunt.</entry>
     <entry lang="nl" key="MOUNTPOINT_NOTALLOWED">FOUT: het koppelpunt voor het volume is niet toegestaan omdat het een map overschrijft die deel uitmaakt van de omgevingsvariabele PATH.\n\nKies een ander koppelpunt.</entry>
     <entry lang="nl" key="INSECURE_MODE">[ONVEILIGE MODUS]</entry>
-    <entry lang="nl" key="SM4_HELP">SM4 is een blokcijferstandaard die in 2006 werd gepubliceerd door de Chinese Nationale Cryptografieadministratie als onderdeel van de GB/T 32907-2016-standaard. 128-bit sleutel, 128-bit blok. Werkingswijze is XTS. Het wordt veel gebruikt in Chinese nationale standaarden en commerciële toepassingen.</entry>
   </localization>
   <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="unqualified" elementFormDefault="qualified">
     <xs:element name="VeraCrypt">

Translations/Language.nn.xml

@@ -1644,7 +1644,6 @@
     <entry lang="en" key="MOUNTPOINT_BLOCKED">ERROR: The volume mount point is blocked because it overrides a protected system directory.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="MOUNTPOINT_NOTALLOWED">ERROR: The volume mount point is not allowed because it overrides a directory that is part of the PATH environment variable.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="INSECURE_MODE">[INSECURE MODE]</entry>
-    <entry lang="en" key="SM4_HELP">SM4 is a block cipher standard published by the Chinese National Cryptography Administration in 2006 as part of the GB/T 32907-2016 standard. 128-bit key, 128-bit block. Mode of operation is XTS. It is widely used in Chinese national standards and commercial applications.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.pl.xml

@@ -1644,7 +1644,6 @@
     <entry lang="pl" key="MOUNTPOINT_BLOCKED">BŁĄD: Punkt podłączania wolumenu jest zablokowany, ponieważ nadpisuje chroniony katalog systemowy.\n\nWybierz inny punkt podłączania.</entry>
     <entry lang="pl" key="MOUNTPOINT_NOTALLOWED">BŁĄD: Punkt podłączania wolumenu nie jest dozwolony, ponieważ nadpisuje katalog, który jest częścią zmiennej środowiskowej PATH.\n\nWybierz inny punkt podłączania.</entry>
     <entry lang="pl" key="INSECURE_MODE">[TRYB NIEBEZPIECZNY]</entry>
-    <entry lang="en" key="SM4_HELP">SM4 is a block cipher standard published by the Chinese National Cryptography Administration in 2006 as part of the GB/T 32907-2016 standard. 128-bit key, 128-bit block. Mode of operation is XTS. It is widely used in Chinese national standards and commercial applications.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.pt-br.xml

@@ -1644,7 +1644,6 @@
     <entry lang="pt-br" key="MOUNTPOINT_BLOCKED">ERRO: O ponto de montagem do volume está bloqueado porque substitui um diretório protegido do sistema.\n\nPor favor, escolha um ponto de montagem diferente.</entry>
     <entry lang="pt-br" key="MOUNTPOINT_NOTALLOWED">ERRO: O ponto de montagem do volume não é permitido porque substitui um diretório que faz parte da variável de ambiente PATH.\n\nPor favor, escolha um ponto de montagem diferente.</entry>
     <entry lang="pt-br" key="INSECURE_MODE">[MODO INSEGURO]</entry>
-    <entry lang="en" key="SM4_HELP">SM4 is a block cipher standard published by the Chinese National Cryptography Administration in 2006 as part of the GB/T 32907-2016 standard. 128-bit key, 128-bit block. Mode of operation is XTS. It is widely used in Chinese national standards and commercial applications.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.ro.xml

@@ -1644,7 +1644,6 @@
     <entry lang="ro" key="MOUNTPOINT_BLOCKED">EROARE: Punctul de montare al volumului este blocat deoarece suprascrie un director de sistem protejat.\n\nVă rugăm să alegeți un alt punct de montare.</entry>
     <entry lang="ro" key="MOUNTPOINT_NOTALLOWED">EROARE: Punctul de montare al volumului nu este permis deoarece suprascrie un director care face parte din variabila de mediu PATH.\n\nVă rugăm să alegeți un alt punct de montare.</entry>
     <entry lang="ro" key="INSECURE_MODE">[MOD INSECURIZAT]</entry>
-    <entry lang="en" key="SM4_HELP">SM4 is a block cipher standard published by the Chinese National Cryptography Administration in 2006 as part of the GB/T 32907-2016 standard. 128-bit key, 128-bit block. Mode of operation is XTS. It is widely used in Chinese national standards and commercial applications.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.ru.xml

@@ -1644,7 +1644,6 @@
     <entry lang="ru" key="MOUNTPOINT_BLOCKED">ОШИБКА: Точка монтирования тома заблокирована, так как она переопределяет защищённую системную папку.\n\nВыберите другую точку монтирования.</entry>
     <entry lang="ru" key="MOUNTPOINT_NOTALLOWED">ОШИБКА: Точка монтирования тома не разрешена, так как она переопределяет папку, которая является частью переменной среды PATH.\n\nВыберите другую точку монтирования.</entry>
     <entry lang="ru" key="INSECURE_MODE">[НЕБЕЗОПАСНЫЙ РЕЖИМ]</entry>
-    <entry lang="ru" key="SM4_HELP">Стандарт блочного шифрования, опубликованный Китайским национальным управлением криптографии в 2006 г. в рамках стандарта GB/T 32907-2016. Ключ: 128 бит, блок: 128 бит. Режим работы: XTS. Широко используется в национальных стандартах Китая и в коммерческих приложениях.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.sk.xml

@@ -1644,7 +1644,6 @@
     <entry lang="en" key="MOUNTPOINT_BLOCKED">ERROR: The volume mount point is blocked because it overrides a protected system directory.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="MOUNTPOINT_NOTALLOWED">ERROR: The volume mount point is not allowed because it overrides a directory that is part of the PATH environment variable.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="INSECURE_MODE">[INSECURE MODE]</entry>
-    <entry lang="en" key="SM4_HELP">SM4 is a block cipher standard published by the Chinese National Cryptography Administration in 2006 as part of the GB/T 32907-2016 standard. 128-bit key, 128-bit block. Mode of operation is XTS. It is widely used in Chinese national standards and commercial applications.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.sl.xml

@@ -1644,7 +1644,6 @@
     <entry lang="sl" key="MOUNTPOINT_BLOCKED">NAPAKA: Tocka priklopa nosilca je blokirana, ker prekriva zašciteno sistemsko mapo.\n\nIzberite drugo tocko priklopa.</entry>
     <entry lang="sl" key="MOUNTPOINT_NOTALLOWED">NAPAKA: Tocka priklopa nosilca ni dovoljena, ker prekriva mapo, ki je del okoljske spremenljivke PATH.\n\nIzberite drugo tocko priklopa.</entry>
     <entry lang="sl" key="INSECURE_MODE">[NEVAREN NACIN]</entry>
-    <entry lang="en" key="SM4_HELP">SM4 is a block cipher standard published by the Chinese National Cryptography Administration in 2006 as part of the GB/T 32907-2016 standard. 128-bit key, 128-bit block. Mode of operation is XTS. It is widely used in Chinese national standards and commercial applications.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.sv.xml

@@ -1644,7 +1644,6 @@
     <entry lang="sv" key="MOUNTPOINT_BLOCKED">FEL: Volymens monteringspunkt är blockerad eftersom den skriver över en skyddad systemkatalog.\n\nVar god välj en annan monteringspunkt.</entry>
     <entry lang="sv" key="MOUNTPOINT_NOTALLOWED">FEL: Volymens monteringspunkt är inte tillåten eftersom den skriver över en katalog som är en del av miljövariabeln PATH.\n\nVar god välj en annan monteringspunkt.</entry>
     <entry lang="sv" key="INSECURE_MODE">[OSÄKERT]</entry>
-    <entry lang="en" key="SM4_HELP">SM4 is a block cipher standard published by the Chinese National Cryptography Administration in 2006 as part of the GB/T 32907-2016 standard. 128-bit key, 128-bit block. Mode of operation is XTS. It is widely used in Chinese national standards and commercial applications.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.th.xml

@@ -1645,7 +1645,6 @@
     <entry lang="th" key="MOUNTPOINT_BLOCKED">ข้อผิดพลาด: จุดเชื่อมต่อโวลุ่มถูกบล็อกเนื่องจากไปทับซ้อนกับไดเรกทอรีระบบที่ได้รับการป้องกัน\n\nกรุณาเลือกจุดเชื่อมต่ออื่น</entry>
     <entry lang="th" key="MOUNTPOINT_NOTALLOWED">ข้อผิดพลาด: จุดเชื่อมต่อโวลุ่มไม่ได้รับอนุญาตเนื่องจากไปทับซ้อนกับไดเรกทอรีที่เป็นส่วนหนึ่งของตัวแปร PATH\n\nกรุณาเลือกจุดเชื่อมต่ออื่น</entry>
     <entry lang="th" key="INSECURE_MODE">[โหมดไม่ปลอดภัย]</entry>
-    <entry lang="en" key="SM4_HELP">SM4 is a block cipher standard published by the Chinese National Cryptography Administration in 2006 as part of the GB/T 32907-2016 standard. 128-bit key, 128-bit block. Mode of operation is XTS. It is widely used in Chinese national standards and commercial applications.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.tr.xml

@@ -1644,7 +1644,6 @@
     <entry lang="tr" key="MOUNTPOINT_BLOCKED">HATA: Birim bağlama noktası, korunan bir sistem dizinini geçersiz kıldığı için engellendi.\n\nLütfen farklı bir bağlama noktası seçin.</entry>
     <entry lang="tr" key="MOUNTPOINT_NOTALLOWED">HATA: Birim bağlama noktası, PATH ortam değişkeninin bir parçası olan bir dizini geçersiz kıldığı için izin verilmiyor.\n\nLütfen farklı bir bağlama noktası seçin.</entry>
     <entry lang="tr" key="INSECURE_MODE">[GÜVENSİZ MOD]</entry>
-    <entry lang="en" key="SM4_HELP">SM4 is a block cipher standard published by the Chinese National Cryptography Administration in 2006 as part of the GB/T 32907-2016 standard. 128-bit key, 128-bit block. Mode of operation is XTS. It is widely used in Chinese national standards and commercial applications.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.uk.xml

@@ -1644,7 +1644,6 @@
     <entry lang="uk" key="MOUNTPOINT_BLOCKED">ПОМИЛКА: Точка монтування тому заблокована, оскільки вона заміщує захищений системний каталог.\n\nБудь ласка, оберіть іншу точку монтування.</entry>
     <entry lang="uk" key="MOUNTPOINT_NOTALLOWED">ПОМИЛКА: Точка монтування тому не дозволена, оскільки вона заміщує каталог, який є частиною змінної середовища PATH.\n\nБудь ласка, оберіть іншу точку монтування.</entry>
     <entry lang="uk" key="INSECURE_MODE">[НЕБЕЗПЕЧНИЙ РЕЖИМ]</entry>
-    <entry lang="en" key="SM4_HELP">SM4 is a block cipher standard published by the Chinese National Cryptography Administration in 2006 as part of the GB/T 32907-2016 standard. 128-bit key, 128-bit block. Mode of operation is XTS. It is widely used in Chinese national standards and commercial applications.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.uz.xml

@@ -1644,7 +1644,6 @@
     <entry lang="en" key="MOUNTPOINT_BLOCKED">ERROR: The volume mount point is blocked because it overrides a protected system directory.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="MOUNTPOINT_NOTALLOWED">ERROR: The volume mount point is not allowed because it overrides a directory that is part of the PATH environment variable.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="INSECURE_MODE">[INSECURE MODE]</entry>
-    <entry lang="en" key="SM4_HELP">SM4 is a block cipher standard published by the Chinese National Cryptography Administration in 2006 as part of the GB/T 32907-2016 standard. 128-bit key, 128-bit block. Mode of operation is XTS. It is widely used in Chinese national standards and commercial applications.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.vi.xml

@@ -1644,7 +1644,6 @@
     <entry lang="en" key="MOUNTPOINT_BLOCKED">ERROR: The volume mount point is blocked because it overrides a protected system directory.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="MOUNTPOINT_NOTALLOWED">ERROR: The volume mount point is not allowed because it overrides a directory that is part of the PATH environment variable.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="INSECURE_MODE">[INSECURE MODE]</entry>
-    <entry lang="en" key="SM4_HELP">SM4 is a block cipher standard published by the Chinese National Cryptography Administration in 2006 as part of the GB/T 32907-2016 standard. 128-bit key, 128-bit block. Mode of operation is XTS. It is widely used in Chinese national standards and commercial applications.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.zh-cn.xml

@@ -1645,7 +1645,6 @@
     <entry lang="zh-cn" key="MOUNTPOINT_BLOCKED">错误：卷挂载点被阻止，因为它覆盖了受保护的系统目录。\n\n请选择其他挂载点。</entry>
     <entry lang="zh-cn" key="MOUNTPOINT_NOTALLOWED">错误：卷挂载点不允许使用，因为它覆盖了 PATH 环境变量中的目录。\n\n请选择其他挂载点。</entry>
     <entry lang="zh-cn" key="INSECURE_MODE">[不安全模式]</entry>
-    <entry lang="zh-cn" key="SM4_HELP">SM4 是由中国国家密码管理局在 2006 年发布的分组密码标准，作为 GB/T 32907-2016 标准的一部分。128 位密钥，128 位块。操作方式 XTS。它在中国国家标准和商业应用中被广泛使用。</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.zh-hk.xml

@@ -1644,7 +1644,6 @@
     <entry lang="zh-hk" key="MOUNTPOINT_BLOCKED">錯誤：磁碟區掛載點因其覆寫系統受保護的路徑而被阻止。\n\n請選擇另一個掛載點。</entry>
     <entry lang="zh-hk" key="MOUNTPOINT_NOTALLOWED">錯誤： 磁碟區掛載點因其覆寫的路徑屬於 PATH 環境變數的一部份而不被接納。\n\n請選擇另一個掛載點。</entry>
     <entry lang="zh-hk" key="INSECURE_MODE">[不安全模式]</entry>
-    <entry lang="en" key="SM4_HELP">SM4 is a block cipher standard published by the Chinese National Cryptography Administration in 2006 as part of the GB/T 32907-2016 standard. 128-bit key, 128-bit block. Mode of operation is XTS. It is widely used in Chinese national standards and commercial applications.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.zh-tw.xml

@@ -1644,7 +1644,6 @@
     <entry lang="en" key="MOUNTPOINT_BLOCKED">ERROR: The volume mount point is blocked because it overrides a protected system directory.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="MOUNTPOINT_NOTALLOWED">ERROR: The volume mount point is not allowed because it overrides a directory that is part of the PATH environment variable.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="INSECURE_MODE">[INSECURE MODE]</entry>
-    <entry lang="en" key="SM4_HELP">SM4 is a block cipher standard published by the Chinese National Cryptography Administration in 2006 as part of the GB/T 32907-2016 standard. 128-bit key, 128-bit block. Mode of operation is XTS. It is widely used in Chinese national standards and commercial applications.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

doc/chm/en/VeraCrypt.hhc

@@ -172,10 +172,6 @@
 			<param name="Name" value="Serpent">
 			<param name="Local" value="Serpent.html">
 			</OBJECT>
-		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="SM4">
-			<param name="Local" value="SM4.html">
-			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="Twofish">
 			<param name="Local" value="Twofish.html">

doc/chm/en/VeraCrypt.hhp

@@ -143,7 +143,6 @@ Serpent.html
 SHA-256.html
 SHA-512.html
 Sharing over Network.html
-SM4.html
 Source Code.html
 Standard Compliance.html
 Streebog.html

doc/chm/ru/VeraCrypt.ru.hhc

@@ -172,10 +172,6 @@
             <param name="Name" value="Serpent">
             <param name="Local" value="Serpent.html">
             </OBJECT>
-		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="SM4">
-			<param name="Local" value="SM4.html">
-			</OBJECT>
         <LI> <OBJECT type="text/sitemap">
             <param name="Name" value="Twofish">
             <param name="Local" value="Twofish.html">

doc/chm/ru/VeraCrypt.ru.hhp

@@ -143,7 +143,6 @@ Serpent.html
 SHA-256.html
 SHA-512.html
 Sharing over Network.html
-SM4.html
 Source Code.html
 Standard Compliance.html
 Streebog.html

doc/chm/zh-cn/VeraCrypt.zh-cn.hhc

@@ -172,10 +172,6 @@
 			<param name="Name" value="Serpent">
 			<param name="Local" value="Serpent.html">
 			</OBJECT>
-		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="SM4">
-			<param name="Local" value="SM4.html">
-			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="Twofish">
 			<param name="Local" value="Twofish.html">

doc/chm/zh-cn/VeraCrypt.zh-cn.hhp

@@ -144,7 +144,6 @@ Security Tokens & Smart Cards.html
 Serpent.html
 SHA-256.html
 SHA-512.html
-SM4.html
 Sharing over Network.html
 Source Code.html
 Standard Compliance.html

doc/html/en/Acknowledgements.html

@@ -47,7 +47,7 @@
  Dobbertin, Antoon Bosselaers, Bart Preneel, Paulo S. L. M. Barreto.</p>
 <p>Andreas Becker for designing VeraCrypt logo and icons.</p>
 <p>Xavier de Carn&eacute; de Carnavalet who proposed a speed optimization for PBKDF2 that reduced mount/boot time by half.</p>
-<p>kerukuro for cppcrypto library (http://cppcrypto.sourceforge.net/) from which Kuznyechik and SM4 ciphers implementation was taken.</p>
+<p>kerukuro for cppcrypto library (http://cppcrypto.sourceforge.net/) from which Kuznyechik cipher implementation was taken.</p>
 <p><br>
 Dieter Baron and Thomas Klausner who wrote the libzip library.</p>
 <p><br>

doc/html/en/Cascades.html

@@ -87,33 +87,6 @@
 <em>Modes of Operation</em></a>). Each 128-bit block is first encrypted with Serpent (256-bit key) in XTS mode and then with Twofish (256-bit key) in XTS mode. Each of the cascaded ciphers uses its own key. All encryption keys are mutually independent (note
  that header keys are independent too, even though they are derived from a single password &ndash; see the section
 <a href="Header Key Derivation.html"><em>Header Key Derivation, Salt, and Iteration Count</em></a>). See above for information on the individual cascaded ciphers.</p>
-<h2>SM4-Kuznyechik</h2>
-<p>
-Two ciphers in a cascade [15, 16] operating in XTS mode (see the section
-<a href="Modes%20of%20Operation.html"><em>Modes of Operation</em></a>). Each 128-bit block is first encrypted with Kuznyechik (256-bit key) in XTS mode and then with SM4 (128-bit key) in XTS mode. Each of the cascaded ciphers uses its own key. All encryption keys are mutually independent (note that header keys are independent too, even though they are derived from a single password &ndash; see the section
-<a href="Header Key Derivation.html"><em>Header Key Derivation, Salt, and Iteration Count</em></a>). See above for information on the individual cascaded ciphers.
-</p>
-
-<h2>SM4-Serpent</h2>
-<p>
-Two ciphers in a cascade [15, 16] operating in XTS mode (see the section
-<a href="Modes%20of%20Operation.html"><em>Modes of Operation</em></a>). Each 128-bit block is first encrypted with Serpent (256-bit key) in XTS mode and then with SM4 (128-bit key) in XTS mode. Each of the cascaded ciphers uses its own key. All encryption keys are mutually independent (note that header keys are independent too, even though they are derived from a single password &ndash; see the section
-<a href="Header Key Derivation.html"><em>Header Key Derivation, Salt, and Iteration Count</em></a>). See above for information on the individual cascaded ciphers.
-</p>
-
-<h2>SM4-Twofish</h2>
-<p>
-Two ciphers in a cascade [15, 16] operating in XTS mode (see the section 
-<a href="Modes%20of%20Operation.html"><em>Modes of Operation</em></a>). Each 128-bit block is first encrypted with Twofish (256-bit key) in XTS mode and then with SM4 (128-bit key) in XTS mode. Each of the cascaded ciphers uses its own key. All encryption keys are mutually independent (note that header keys are independent too, even though they are derived from a single password &ndash; see the section 
-<a href="Header Key Derivation.html"><em>Header Key Derivation, Salt, and Iteration Count</em></a>). See above for information on the individual cascaded ciphers.
-</p>
-
-<h2>SM4-Twofish-Serpent</h2>
-<p>
-Three ciphers in a cascade [15, 16] operating in XTS mode (see the section
-<a href="Modes%20of%20Operation.html"><em>Modes of Operation</em></a>). Each 128-bit block is first encrypted with Serpent (256-bit key) in XTS mode, then with Twofish (256-bit key) in XTS mode, and finally with SM4 (128-bit key) in XTS mode. Each of the cascaded ciphers uses its own key. All encryption keys are mutually independent (note that header keys are independent too, even though they are derived from a single password &ndash; see the section
-<a href="Header Key Derivation.html"><em>Header Key Derivation, Salt, and Iteration Count</em></a>). See above for information on the individual cascaded ciphers.
-</p>
 
 </div>
 </body></html>

doc/html/en/Command Line Usage.html

@@ -245,16 +245,12 @@ It must be followed by a parameter indicating the PRF hash algorithm to use when
 <td>(Only with /create)<br>
 It must be followed by a parameter indicating the encryption algorithm to use. The default is AES if this switch is not specified. The parameter can have the following values (case insensitive):
 <ul>
-<li>AES </li><li>Serpent </li><li>Twofish </li><li>Camellia </li><li>Kuznyechik </li><li>SM4 </li><li>AES(Twofish) </li><li>AES(Twofish(Serpent)) </li><li>Serpent(AES) </li><li>Serpent(Twofish(AES)) </li><li>Twofish(Serpent) </li>
+<li>AES </li><li>Serpent </li><li>Twofish </li><li>Camellia </li><li>Kuznyechik </li><li>AES(Twofish) </li><li>AES(Twofish(Serpent)) </li><li>Serpent(AES) </li><li>Serpent(Twofish(AES)) </li><li>Twofish(Serpent) </li>
 <li>Camellia(Kuznyechik) </li>
 <li>Kuznyechik(Twofish) </li>
 <li>Camellia(Serpent) </li>
 <li>Kuznyechik(AES) </li>
 <li>Kuznyechik(Serpent(Camellia)) </li>
-<li>Kuznyechik(SM4) </li>
-<li>Serpent(SM4) </li>
-<li>SM4(Twofish) </li>
-<li>Twofish(Serpent(SM4)) </li>
 </ul>
 </td>
 </tr>
@@ -316,7 +312,7 @@ If it is followed by <strong>n</strong> or <strong>no</strong>: the password dia
 <h4>Syntax</h4>
 <p>VeraCrypt.exe [/tc] [/hash {sha256|sha-256|sha512|sha-512|whirlpool |blake2s|blake2s-256}][/a [devices|favorites]] [/b] [/c [y|n|f]] [/d [drive letter]] [/e] [/f] [/h [y|n]] [/k keyfile or search path] [tryemptypass [y|n]] [/l drive letter] [/m {bk|rm|recovery|ro|sm|ts|noattach}]
  [/p password] [/pim pimvalue] [/q [background|preferences]] [/s] [/tokenlib path] [/v volume] [/w]</p>
-<p>&quot;VeraCrypt Format.exe&quot; [/n] [/create] [/size number[{K|M|G|T}]] [/p password]&nbsp; [/encryption {AES | Serpent | Twofish | Camellia | Kuznyechik | SM4 | AES(Twofish) | AES(Twofish(Serpent)) | Serpent(AES) | Serpent(Twofish(AES)) | Twofish(Serpent) | Camellia(Kuznyechik) | Kuznyechik(Twofish) | Camellia(Serpent) | Kuznyechik(AES) | Kuznyechik(Serpent(Camellia)) | Kuznyechik(SM4) | Serpent(SM4) | SM4(Twofish) | Twofish(Serpent(SM4))}] [/hash {sha256|sha-256|sha512|sha-512|whirlpool|blake2s|blake2s-256}]
+<p>&quot;VeraCrypt Format.exe&quot; [/n] [/create] [/size number[{K|M|G|T}]] [/p password]&nbsp; [/encryption {AES | Serpent | Twofish | Camellia | Kuznyechik | AES(Twofish) | AES(Twofish(Serpent)) | Serpent(AES) | Serpent(Twofish(AES)) | Twofish(Serpent) | Camellia(Kuznyechik) | Kuznyechik(Twofish) | Camellia(Serpent) | Kuznyechik(AES) | Kuznyechik(Serpent(Camellia)))}] [/hash {sha256|sha-256|sha512|sha-512|whirlpool|blake2s|blake2s-256}]
  [/filesystem {None|FAT|NTFS|ExFAT|ReFS}] [/dynamic] [/force] [/silent] [/noisocheck] [FastCreateFile] [/quick]</p>
 <p>Note that the order in which options are specified does not matter.</p>
 <h4>Examples</h4>

doc/html/en/Documentation.html

@@ -78,7 +78,7 @@
 <ul>
 <li><a href="AES.html">AES</a> </li><li><a href="Camellia.html">Camellia</a>
 </li><li><a href="Kuznyechik.html">Kuznyechik</a>
-</li><li><a href="Serpent.html">Serpent</a> </li><li><a href="SM4.html">SM4</a> </li><li><a href="Twofish.html">Twofish</a> </li><li><a href="Cascades.html">Cascades of ciphers</a>
+</li><li><a href="Serpent.html">Serpent</a> </li><li><a href="Twofish.html">Twofish</a> </li><li><a href="Cascades.html">Cascades of ciphers</a>
 </li></ul>
 </li><li><strong><a href="Hash%20Algorithms.html">Hash Algorithms</a></strong>
 <ul>

doc/html/en/Encryption Algorithms.html

@@ -115,18 +115,6 @@ R. Anderson, E. Biham, L. Knudsen</td>
 <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
 XTS</td>
 </tr>
-<tr style="text-align:left">
-	<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-	<a href="SM4.html" style="color:#0080c0; text-decoration:none">SM4</a></td>
-	<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-	Data Assurance & Communication Security Center, Chinese Academy of Sciences<br>GB/T 32907-2016</td>
-	<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-	128</td>
-	<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-	128</td>
-	<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-	XTS</td>
-</tr>
 <tr style="text-align:left">
 <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
 <a href="Twofish.html" style="color:#0080c0; text-decoration:none">Twofish</a></td>
@@ -261,58 +249,6 @@ XTS</td>
 XTS</td>
 </tr>
 
-<tr style="text-align:left">
-	<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-	<a href="Cascades.html" style="color:#0080c0; text-decoration:none">SM4-Kuznyechik</a></td>
-	<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-	&nbsp;</td>
-	<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-	128; 256</td>
-	<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-	128</td>
-	<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-	XTS</td>
-</tr>
-
-<tr style="text-align:left">
-	<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-	<a href="Cascades.html" style="color:#0080c0; text-decoration:none">SM4-Serpent</a></td>
-	<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-	&nbsp;</td>
-	<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-	128; 256</td>
-	<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-	128</td>
-	<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-	XTS</td>
-</tr>
-
-<tr style="text-align:left">
-	<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-	<a href="Cascades.html" style="color:#0080c0; text-decoration:none">SM4-Twofish</a></td>
-	<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-	&nbsp;</td>
-	<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-	128; 256</td>
-	<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-	128</td>
-	<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-	XTS</td>
-</tr>
-
-<tr style="text-align:left">
-	<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-	<a href="Cascades.html" style="color:#0080c0; text-decoration:none">SM4-Twofish-Serpent</a></td>
-	<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-	&nbsp;</td>
-	<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-	128; 256; 256</td>
-	<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-	128</td>
-	<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-	XTS</td>
-</tr>
-
 
 <tr style="text-align:left">
 <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">

doc/html/en/FAQ.html

@@ -712,7 +712,7 @@ Windows built-in backup utility looks only for physical driver, that's why it do
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 VeraCrypt uses block ciphers (AES, Serpent, Twofish) for its encryption. Quantum attacks against these block ciphers are just a faster brute-force since the best know attack against these algorithms is exhaustive search (related keys attacks are irrelevant
  to our case because all keys are random and independent from each other).<br>
-Since VeraCrypt always uses 256-bit random and independent keys (except for SM4 cipher which uses 128-bit key by design), we are assured of a 128-bit security<br>
+Since VeraCrypt always uses 256-bit random and independent keys, we are assured of a 128-bit security<br>
 level against quantum algorithms which makes VeraCrypt encryption immune to such attacks.</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <strong>How to make a VeraCrypt volume available for Windows Search indexing?</strong></div>

doc/html/en/Release Notes.html

@@ -44,7 +44,6 @@
 <ul>
 <li><strong>All OSes:</strong>
 	<ul>
-	<li>Add support for the Chinese encryption algorithm SM4 (System encryption not supported yet).</li>
 	<li>Fix whirlpool implementation for big-endian platforms (GH #1529).</li>
 	<li>Rename "Dismount All" to "Unmount All" in UI. Use ALT+u as new accelerator key instead of ALT+s</li>
 	<li>Add contributed Chinese and Russian CHM documentation.</li>

doc/html/en/Serpent.html

@@ -49,6 +49,6 @@ In spite of these facts, Rijndael was considered an appropriate selection for th
  votes, Twofish got 31 votes, RC6 got 23 votes, and MARS got 13 votes [18, 19].*</p>
 <p>* These are positive votes. If negative votes are subtracted from the positive votes, the following results are obtained: Rijndael: 76 votes, Serpent: 52 votes, Twofish: 10 votes, RC6: -14 votes, MARS: -70 votes [19].</p>
 <p>&nbsp;</p>
-<p><a href="SM4.html" style="text-align:left; color:#0080c0; text-decoration:none; font-weight:bold.html">Next Section &gt;&gt;</a></p>
+<p><a href="Twofish.html" style="text-align:left; color:#0080c0; text-decoration:none; font-weight:bold.html">Next Section &gt;&gt;</a></p>
 </div>
 </div><div class="ClearBoth"></div></body></html>

doc/html/ru/Cascades.html

@@ -87,33 +87,6 @@
 <em>Режимы работы</em></a>). Каждый блок размером 128 бит сначала шифруется алгоритмом Serpent (с ключом размером 256 бит) в режиме XTS, а затем алгоритмом Twofish (с ключом размером 256 бит) в режиме XTS. Каждый из этих каскадных шифров использует свой собственный ключ. Все ключи шифрования не зависят друг от друга
  (обратите внимание, что ключи заголовка тоже независимы, хотя и получены в результате формирования одного пароля &ndash; см. раздел
 <a href="Header Key Derivation.html"><em>Формирование ключа заголовка, соль и количество итераций</em></a>). Информация о каждом отдельном шифре приведена выше.</p>
-<h2>SM4-Kuznyechik</h2>
-<p>
-Последовательно выполняемые (каскадом) [15, 16] два шифра, работающие в режиме XTS (см. раздел 
-<a href="Modes%20of%20Operation.html"><em>Режимы работы</em></a>). Каждый блок размером 128 бит сначала шифруется алгоритмом Kuznyechik (с ключом размером 256 бит) в режиме XTS, а затем алгоритмом SM4 (с ключом размером 128 бит) в режиме XTS. Каждый из этих каскадных шифров использует свой собственный ключ. Все ключи шифрования не зависят друг от друга (обратите внимание, что ключи заголовка тоже независимы, хотя и получены в результате формирования одного пароля &ndash; см. раздел 
-<a href="Header Key Derivation.html"><em>Формирование ключа заголовка, соль и количество итераций</em></a>). Информация о каждом отдельном шифре приведена выше.
-</p>
-
-<h2>SM4-Serpent</h2>
-<p>
-Последовательно выполняемые (каскадом) [15, 16] два шифра, работающие в режиме XTS (см. раздел 
-<a href="Modes%20of%20Operation.html"><em>Режимы работы</em></a>). Каждый блок размером 128 бит сначала шифруется алгоритмом Serpent (с ключом размером 256 бит) в режиме XTS, а затем алгоритмом SM4 (с ключом размером 128 бит) в режиме XTS. Каждый из этих каскадных шифров использует свой собственный ключ. Все ключи шифрования не зависят друг от друга (обратите внимание, что ключи заголовка тоже независимы, хотя и получены в результате формирования одного пароля &ndash; см. раздел 
-<a href="Header Key Derivation.html"><em>Формирование ключа заголовка, соль и количество итераций</em></a>). Информация о каждом отдельном шифре приведена выше.
-</p>
-
-<h2>SM4-Twofish</h2>
-<p>
-Последовательно выполняемые (каскадом) [15, 16] два шифра, работающие в режиме XTS (см. раздел 
-<a href="Modes%20of%20Operation.html"><em>Режимы работы</em></a>). Каждый блок размером 128 бит сначала шифруется алгоритмом Twofish (с ключом размером 256 бит) в режиме XTS, а затем алгоритмом SM4 (с ключом размером 128 бит) в режиме XTS. Каждый из этих каскадных шифров использует свой собственный ключ. Все ключи шифрования не зависят друг от друга (обратите внимание, что ключи заголовка тоже независимы, хотя и получены в результате формирования одного пароля &ndash; см. раздел 
-<a href="Header Key Derivation.html"><em>Формирование ключа заголовка, соль и количество итераций</em></a>). Информация о каждом отдельном шифре приведена выше.
-</p>
-
-<h2>SM4-Twofish-Serpent</h2>
-<p>
-Последовательно выполняемые (каскадом) [15, 16] три шифра, работающие в режиме XTS (см. раздел 
-<a href="Modes%20of%20Operation.html"><em>Режимы работы</em></a>). Каждый блок размером 128 бит сначала шифруется алгоритмом Serpent (с ключом размером 256 бит) в режиме XTS, затем алгоритмом Twofish (с ключом размером 256 бит) в режиме XTS, и, наконец, алгоритмом SM4 (с ключом размером 128 бит) в режиме XTS. Каждый из этих каскадных шифров использует свой собственный ключ. Все ключи шифрования не зависят друг от друга (обратите внимание, что ключи заголовка тоже независимы, хотя и получены в результате формирования одного пароля &ndash; см. раздел 
-<a href="Header Key Derivation.html"><em>Формирование ключа заголовка, соль и количество итераций</em></a>). Информация о каждом отдельном шифре приведена выше.
-</p>
 
 </div>
 </body></html>

doc/html/ru/Documentation.html

@@ -78,7 +78,7 @@
 <ul>
 <li><a href="AES.html">AES</a> </li><li><a href="Camellia.html">Camellia</a>
 </li><li><a href="Kuznyechik.html">Kuznyechik</a>
-</li><li><a href="Serpent.html">Serpent</a> </li><li><a href="SM4.html">SM4</a> </li><li><a href="Twofish.html">Twofish</a> </li><li><a href="Cascades.html">Каскады шифров</a>
+</li><li><a href="Serpent.html">Serpent</a> </li><li><a href="Twofish.html">Twofish</a> </li><li><a href="Cascades.html">Каскады шифров</a>
 </li></ul>
 </li><li><strong><a href="Hash%20Algorithms.html">Алгоритмы хеширования</a></strong>
 <ul>

doc/html/ru/Encryption Algorithms.html

@@ -115,18 +115,6 @@ XTS</td>
 	<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
 	XTS</td>
 	</tr>
-	<tr style="text-align:left">
-		<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-		<a href="SM4.html" style="color:#0080c0; text-decoration:none;">SM4</a></td>
-		<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-		Центр обеспечения безопасности данных и коммуникаций, Китайская академия наук<br>GB/T 32907-2016</td>
-		<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-		128</td>
-		<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-		128</td>
-		<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-		XTS</td>
-	</tr>		
 	
 	<tr style="text-align:left">
 	<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
@@ -262,57 +250,6 @@ XTS</td>
 	XTS</td>
 	</tr>
 
-	<tr style="text-align:left">
-		<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-		<a href="Cascades.html" style="color:#0080c0; text-decoration:none">SM4-Kuznyechik</a></td>
-		<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-		&nbsp;</td>
-		<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-		128; 256</td>
-		<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-		128</td>
-		<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-		XTS</td>
-	</tr>
-	
-	<tr style="text-align:left">
-		<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-		<a href="Cascades.html" style="color:#0080c0; text-decoration:none">SM4-Serpent</a></td>
-		<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-		&nbsp;</td>
-		<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-		128; 256</td>
-		<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-		128</td>
-		<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-		XTS</td>
-	</tr>
-	
-	<tr style="text-align:left">
-		<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-		<a href="Cascades.html" style="color:#0080c0; text-decoration:none">SM4-Twofish</a></td>
-		<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-		&nbsp;</td>
-		<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-		128; 256</td>
-		<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-		128</td>
-		<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-		XTS</td>
-	</tr>
-	
-	<tr style="text-align:left">
-		<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-		<a href="Cascades.html" style="color:#0080c0; text-decoration:none">SM4-Twofish-Serpent</a></td>
-		<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-		&nbsp;</td>
-		<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-		128; 256; 256</td>
-		<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-		128</td>
-		<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-		XTS</td>
-	</tr>
 <tr style="text-align:left">
 <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
 &nbsp;</td>

doc/html/ru/Release Notes.html

@@ -47,7 +47,6 @@ VeraCrypt старее, чем 1.18a.</span></li>
 <ul>
 <li><strong>Все ОС:</strong>
     <ul>
-        <li>Добавлена поддержка китайского алгоритма шифрования SM4 (системное шифрование пока не поддерживается).</li>
         <li>Исправлена реализация хэш-функции Whirlpool для платформ с прямым порядком байтов (big-endian) (GH #1529).</li>
         <li>В пользовательском интерфейсе "Dismount All" переименовано в "Unmount All". Новая комбинация клавиш: ALT+U вместо ALT+S.</li>
         <li>Добавлена документация в формате CHM на китайском и русском языках (предоставлена сообществом).</li>

doc/html/ru/Serpent.html

@@ -59,6 +59,6 @@
 <p>* Это положительные голоса. Если вычесть отрицательные голоса, то получаются следующие результаты:
 Rijndael: 76 голосов, Serpent: 52 голоса, Twofish: 10 голосов, RC6: -14 голосов, MARS: -70 голосов [19].</p>
 <p>&nbsp;</p>
-<p><a href="SM4.html" style="text-align:left; color:#0080c0; text-decoration:none; font-weight:bold.html">Следующий раздел &gt;&gt;</a></p>
+<p><a href="Twofish.html" style="text-align:left; color:#0080c0; text-decoration:none; font-weight:bold.html">Следующий раздел &gt;&gt;</a></p>
 </div>
 </div><div class="ClearBoth"></div></body></html>

doc/html/zh-cn/Cascades.html

@@ -57,14 +57,6 @@
 <p>级联中的三个密码算法 [15, 16] 以XTS模式运行（请参阅 <a href="Modes%20of%20Operation.html"><em>操作模式</em></a> 部分）。每个128位块首先使用AES（256位密钥）以XTS模式进行加密，然后使用Twofish（256位密钥）以XTS模式进行加密，最后使用Serpent（256位密钥）以XTS模式进行加密。级联中的每个密码算法使用其自己的密钥。所有加密密钥相互独立（请注意，即使头密钥是从单个密码派生而来，它们也是独立的 — 请参阅 <a href="Header Key Derivation.html"><em>头密钥派生、盐值和迭代次数</em></a>）。有关级联中各个密码算法的信息，请参阅上文。</p>
 <h2>Twofish - Serpent</h2>
 <p>级联中的两个密码算法 [15, 16] 以XTS模式运行（请参阅 <a href="Modes%20of%20Operation.html"><em>操作模式</em></a> 部分）。每个128位块首先使用Serpent（256位密钥）以XTS模式进行加密，然后使用Twofish（256位密钥）以XTS模式进行加密。级联中的每个密码算法使用其自己的密钥。所有加密密钥相互独立（请注意，即使头密钥是从单个密码派生而来，它们也是独立的 — 请参阅 <a href="Header Key Derivation.html"><em>头密钥派生、盐值和迭代次数</em></a>）。有关级联中各个密码算法的信息，请参阅上文。</p>
-<h2>SM4 - Kuznyechik</h2>
-<p>级联中的两个密码算法 [15, 16] 以XTS模式运行（请参阅 <a href="Modes%20of%20Operation.html"><em>操作模式</em></a> 部分）。每个128位块首先使用Kuznyechik（256位密钥）以XTS模式进行加密，然后使用SM4（128位密钥）以XTS模式进行加密。级联中的每个密码算法使用其自己的密钥。所有加密密钥相互独立（请注意，即使头密钥是从单个密码派生而来，它们也是独立的 — 请参阅 <a href="Header Key Derivation.html"><em>头密钥派生、盐值和迭代次数</em></a>）。有关级联中各个密码算法的信息，请参阅上文。</p>
-<h2>SM4 - Serpent</h2>
-<p>级联中的两个密码算法 [15, 16] 以XTS模式运行（请参阅 <a href="Modes%20of%20Operation.html"><em>操作模式</em></a> 部分）。每个128位块首先使用Serpent（256位密钥）以XTS模式进行加密，然后使用SM4（128位密钥）以XTS模式进行加密。级联中的每个密码算法使用其自己的密钥。所有加密密钥相互独立（请注意，即使头密钥是从单个密码派生而来，它们也是独立的 — 请参阅 <a href="Header Key Derivation.html"><em>头密钥派生、盐值和迭代次数</em></a>）。有关级联中各个密码算法的信息，请参阅上文。</p>
-<h2>SM4 - Twofish</h2>
-<p>级联中的两个密码算法 [15, 16] 以XTS模式运行（请参阅 <a href="Modes%20of%20Operation.html"><em>操作模式</em></a> 部分）。每个128位块首先使用Twofish（256位密钥）以XTS模式进行加密，然后使用SM4（128位密钥）以XTS模式进行加密。级联中的每个密码算法使用其自己的密钥。所有加密密钥相互独立（请注意，即使头密钥是从单个密码派生而来，它们也是独立的 — 请参阅 <a href="Header Key Derivation.html"><em>头密钥派生、盐值和迭代次数</em></a>）。有关级联中各个密码算法的信息，请参阅上文。</p>
-<h2>SM4 - Twofish - Serpent</h2>
-<p>级联中的三个密码算法 [15, 16] 以XTS模式运行（请参阅 <a href="Modes%20of%20Operation.html"><em>操作模式</em></a> 部分）。每个128位块首先使用Serpent（256位密钥）以XTS模式进行加密，然后使用Twofish（256位密钥）以XTS模式进行加密，最后使用SM4（128位密钥）以XTS模式进行加密。级联中的每个密码算法使用其自己的密钥。所有加密密钥相互独立（请注意，即使头密钥是从单个密码派生而来，它们也是独立的 — 请参阅 <a href="Header Key Derivation.html"><em>头密钥派生、盐值和迭代次数</em></a>）。有关级联中各个密码算法的信息，请参阅上文。</p>
 
 </div>
 </body></html>

doc/html/zh-cn/Documentation.html

@@ -78,7 +78,7 @@
 <ul>
 <li><a href="AES.html">AES</a> </li><li><a href="Camellia.html">Camellia</a>
 </li><li><a href="Kuznyechik.html">Kuznyechik</a>
-</li><li><a href="Serpent.html">Serpent</a> </li><li><a href="SM4.html">SM4</a> </li><li><a href="Twofish.html">Twofish</a> </li><li><a href="Cascades.html">密码级联</a>
+</li><li><a href="Serpent.html">Serpent</a> </li><li><a href="Twofish.html">Twofish</a> </li><li><a href="Cascades.html">密码级联</a>
 </li></ul>
 </li><li><strong><a href="Hash%20Algorithms.html">哈希算法</a></strong>
 <ul>

doc/html/zh-cn/Encryption Algorithms.html

@@ -115,18 +115,6 @@ GOST R 34.12-2015</font></font></p>
   <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
   XTS</td>
   </tr>
-	<tr style="text-align:left">
-		<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-		<a href="SM4.html" style="color:#0080c0; text-decoration:none">SM4</a></td>
-		<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-		数据保障与通信安全中心，中国科学院<br>国家标准 GB/T 32907-2016</td>
-		<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-		128</td>
-		<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-		128</td>
-		<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-		XTS</td>
-	</tr>
   <tr style="text-align:left">
   <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
   <a href="Twofish.html" style="color:#0080c0; text-decoration:none">Twofish</a></td>
@@ -261,57 +249,6 @@ GOST R 34.12-2015</font></font></p>
   XTS</td>
   </tr>
 
-  <tr style="text-align:left">
-    <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-    <a href="Cascades.html" style="color:#0080c0; text-decoration:none">SM4-Kuznyechik</a></td>
-    <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-    &nbsp;</td>
-    <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-    128; 256</td>
-    <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-    128</td>
-    <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-    XTS</td>
-  </tr>
-  
-  <tr style="text-align:left">
-    <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-    <a href="Cascades.html" style="color:#0080c0; text-decoration:none">SM4-Serpent</a></td>
-    <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-    &nbsp;</td>
-    <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-    128; 256</td>
-    <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-    128</td>
-    <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-    XTS</td>
-  </tr>
-  
-  <tr style="text-align:left">
-    <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-    <a href="Cascades.html" style="color:#0080c0; text-decoration:none">SM4-Twofish</a></td>
-    <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-    &nbsp;</td>
-    <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-    128; 256</td>
-    <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-    128</td>
-    <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-    XTS</td>
-  </tr>
-  
-  <tr style="text-align:left">
-    <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-    <a href="Cascades.html" style="color:#0080c0; text-decoration:none">SM4-Twofish-Serpent</a></td>
-    <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-    &nbsp;</td>
-    <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-    128; 256; 256</td>
-    <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-    128</td>
-    <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
-    XTS</td>
-  </tr>
 <tr style="text-align:left">
 <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
 &nbsp;</td>

doc/html/zh-cn/Release Notes.html

@@ -44,7 +44,6 @@
 <ul>
 <li><strong>所有操作系统:</strong>
     <ul>
-    <li>新增对中国加密算法SM4（国密算法）的支持（暂不支持系统加密）。</li>
     <li>修复Whirlpool算法在大端平台上的实现问题（GH #1529）。</li>
     <li>将用户界面中的“Dismount All”重命名为“Unmount All”，并将快捷键由ALT+s更改为ALT+u。</li>
     <li>新增用户贡献的中文和俄文CHM格式帮助文档。</li>

doc/html/zh-cn/Serpent.html

@@ -44,6 +44,6 @@
 尽管有这些情况，但由于Rijndael在安全性、性能、效率、可实现性和灵活性方面的综合表现，它被认为是AES的合适选择[4]。在最后一届AES候选算法会议上，Rijndael获得了86票，Serpent获得了59票，Twofish获得了31票，RC6获得了23票，MARS获得了13票[18, 19]。*</p>
 <p>* 这些是赞成票。如果从赞成票中减去反对票，得到以下结果：Rijndael：76票，Serpent：52票，Twofish：10票，RC6： - 14票，MARS： - 70票[19]。</p>
 <p>&nbsp;</p>
-<p><a href="SM4.html" style="text-align:left; color:#0080c0; text-decoration:none; font-weight:bold.html">下一部分 &gt;&gt;</a></p>
+<p><a href="Twofish.html" style="text-align:left; color:#0080c0; text-decoration:none; font-weight:bold.html">下一部分 &gt;&gt;</a></p>
 </div>
 </div><div class="ClearBoth"></div></body></html>

src/Common/Crypto.c

@@ -69,7 +69,6 @@ static Cipher Ciphers[] =
 	{ TWOFISH,	L"Twofish",		16,			32,			TWOFISH_KS			},
 	{ CAMELLIA,	L"Camellia",	16,			32,			CAMELLIA_KS			},
 	{ KUZNYECHIK,	L"Kuznyechik",16,		32,			KUZNYECHIK_KS },
-	{ SM4, 	L"SM4",		16,			16,			SM4_KS				},
 #endif
 #endif
 	{ 0,		0,				0,			0,			0					}
@@ -90,7 +89,6 @@ static EncryptionAlgorithm EncryptionAlgorithms[] =
 	{ { TWOFISH,					0 }, { XTS, 0 },	1, 1 },
 	{ { CAMELLIA,					0 }, { XTS, 0 },	1, 1 },
 	{ { KUZNYECHIK,				0 }, { XTS, 0 },	0, 1 },
-	{ { SM4,						0 }, { XTS, 0 },	0, 1 },
 	{ { TWOFISH, AES,				0 }, { XTS, 0 },	1, 1 },
 	{ { SERPENT, TWOFISH, AES,	0 }, { XTS, 0 },	1, 1 },
 	{ { AES, SERPENT,				0 }, { XTS, 0 },	1, 1 },
@@ -98,13 +96,9 @@ static EncryptionAlgorithm EncryptionAlgorithms[] =
 	{ { SERPENT, TWOFISH,		0 }, { XTS, 0 },	1, 1 },
 	{ { KUZNYECHIK, CAMELLIA,		0 }, { XTS, 0 },	0, 1 },
 	{ { TWOFISH, KUZNYECHIK,		0 }, { XTS, 0 },	0, 1 },
-	{ { KUZNYECHIK,	SM4,			0 }, { XTS, 0 },	0, 1 },
-	{ { SERPENT, SM4,				0 }, { XTS, 0 },	0, 1 },
-	{ { TWOFISH, SM4,			0 }, { XTS, 0 },	0, 1 },
 	{ { SERPENT, CAMELLIA,		0 }, { XTS, 0 },	0, 1 },
 	{ { AES, KUZNYECHIK,		0 }, { XTS, 0 },	0, 1 },
 	{ { CAMELLIA, SERPENT, KUZNYECHIK,	0 }, { XTS, 0 },	0, 1 },
-	{ { SERPENT, TWOFISH, SM4,	0 }, { XTS, 0 },	0, 1 },
 #endif
 	{ { 0,							0 }, { 0,    0},	0, 0 }		// Must be all-zero
 
@@ -183,9 +177,6 @@ int CipherInit (int cipher, unsigned char *key, unsigned __int8 *ks)
 	case KUZNYECHIK:
 		kuznyechik_set_key(key, (kuznyechik_kds*)ks);
 		break;
-	case SM4:
-		sm4_set_key(key, (sm4_kds*)ks);
-		break;
 #endif // !defined(TC_WINDOWS_BOOT)
 
 #endif
@@ -218,7 +209,6 @@ void EncipherBlock(int cipher, void *data, void *ks)
 #endif
 #if !defined(TC_WINDOWS_BOOT)
 	case KUZNYECHIK:		kuznyechik_encrypt_block(data, data, ks); break;
-	case SM4:				sm4_encrypt_block(data, data, ks); break;
 #endif // !defined(TC_WINDOWS_BOOT) 
 #endif
 	default:			TC_THROW_FATAL_EXCEPTION;	// Unknown/wrong ID
@@ -270,12 +260,6 @@ void EncipherBlocks (int cipher, void *dataPtr, void *ks, size_t blockCount)
 	{
 		kuznyechik_encrypt_blocks (data, data, blockCount, ks);
 	}
-	else if (cipher == SM4
-		&& HasSSE41() && HasAESNI()
-		)
-	{
-		sm4_encrypt_blocks(data, data, blockCount, ks);
-	}
 #endif
 #endif
 	else
@@ -303,7 +287,6 @@ void DecipherBlock(int cipher, void *data, void *ks)
 #endif
 #if !defined(TC_WINDOWS_BOOT)
 	case KUZNYECHIK:	kuznyechik_decrypt_block(data, data, ks); break;
-	case SM4:			sm4_decrypt_block(data, data, ks); break;
 #endif // !defined(TC_WINDOWS_BOOT)
 #endif
 
@@ -369,12 +352,6 @@ void DecipherBlocks (int cipher, void *dataPtr, void *ks, size_t blockCount)
 	{
 		kuznyechik_decrypt_blocks (data, data, blockCount, ks);
 	}
-	else if (cipher == SM4
-		&& HasSSE41() && HasAESNI()
-		)
-	{
-		sm4_decrypt_blocks(data, data, blockCount, ks);
-	}
 #endif
 #endif
 	else
@@ -445,7 +422,6 @@ BOOL CipherSupportsIntraDataUnitParallelization (int cipher)
 #if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE && !defined (_UEFI)
 		|| (cipher == SERPENT && HasSSE2())
 		|| (cipher == KUZNYECHIK && HasSSE2())
-		|| (cipher == SM4 && HasSSE41() && HasAESNI())
 #endif
 #if CRYPTOPP_BOOL_X64 && !defined(CRYPTOPP_DISABLE_ASM)
 		|| (cipher == TWOFISH)

src/Common/Crypto.h

@@ -112,8 +112,7 @@ enum
 	SERPENT,			
 	TWOFISH,
 	CAMELLIA,
-	KUZNYECHIK,
+	KUZNYECHIK
-	SM4
 };
 
 typedef struct
@@ -173,7 +172,7 @@ typedef struct
 #ifdef TC_WINDOWS_BOOT
 #define MAX_EXPANDED_KEY	VC_MAX((AES_KS + SERPENT_KS + TWOFISH_KS), CAMELLIA_KS)
 #else
-#define MAX_EXPANDED_KEY    VC_MAX(VC_MAX(VC_MAX(VC_MAX(VC_MAX((AES_KS + SERPENT_KS + TWOFISH_KS), CAMELLIA_KS + KUZNYECHIK_KS + SERPENT_KS), KUZNYECHIK_KS + TWOFISH_KS), AES_KS + KUZNYECHIK_KS), SM4_KS + SERPENT_KS + TWOFISH_KS), SM4_KS + KUZNYECHIK_KS)
+#define MAX_EXPANDED_KEY    VC_MAX(VC_MAX(VC_MAX((AES_KS + SERPENT_KS + TWOFISH_KS), CAMELLIA_KS + KUZNYECHIK_KS + SERPENT_KS), KUZNYECHIK_KS + TWOFISH_KS), AES_KS + KUZNYECHIK_KS)
 #endif
 #endif
 
@@ -207,7 +206,6 @@ typedef struct
 #	include "Streebog.h"
 #	include "kuznyechik.h"
 #	include "Camellia.h"
-#	include "sm4.h"
 #if !defined (_UEFI)
 #   include "chachaRng.h"
 #   include "t1ha.h"

src/Common/Dlgcode.c

@@ -7812,23 +7812,13 @@ ResetCipherTest(HWND hwndDlg, int idTestCipher)
 	SetWindowText(GetDlgItem(hwndDlg, IDC_CIPHERTEXT), L"0000000000000000");
 
 	if (idTestCipher == AES || idTestCipher == SERPENT || idTestCipher == TWOFISH || idTestCipher == CAMELLIA
-		|| idTestCipher == KUZNYECHIK || idTestCipher == SM4
+		|| idTestCipher == KUZNYECHIK
 		)
-	{
-		if (idTestCipher == SM4) // SM4 key size is 128 bits
-		{
-			ndx = (int) SendMessage (GetDlgItem(hwndDlg, IDC_KEY_SIZE), CB_ADDSTRING, 0,(LPARAM) L"128");
-			SendMessage(GetDlgItem(hwndDlg, IDC_KEY_SIZE), CB_SETITEMDATA, ndx, (LPARAM)16);
-			SetWindowText(GetDlgItem(hwndDlg, IDC_KEY), L"00000000000000000000000000000000");
-			SetWindowText(GetDlgItem(hwndDlg, IDC_SECONDARY_KEY), L"00000000000000000000000000000000");
-		}
-		else
 	{
 		ndx = (int)SendMessage(GetDlgItem(hwndDlg, IDC_KEY_SIZE), CB_ADDSTRING, 0, (LPARAM)L"256");
 		SendMessage(GetDlgItem(hwndDlg, IDC_KEY_SIZE), CB_SETITEMDATA, ndx, (LPARAM)32);
 		SetWindowText(GetDlgItem(hwndDlg, IDC_KEY), L"0000000000000000000000000000000000000000000000000000000000000000");
 		SetWindowText(GetDlgItem(hwndDlg, IDC_SECONDARY_KEY), L"0000000000000000000000000000000000000000000000000000000000000000");
-		}
 		SendMessage(GetDlgItem(hwndDlg, IDC_KEY_SIZE), CB_SETCURSEL, ndx,0);
 
 		SendMessage (GetDlgItem(hwndDlg, IDC_PLAINTEXT_SIZE), CB_RESETCONTENT, 0,0);
@@ -11351,10 +11341,6 @@ void Applink (const char *dest)
 	{
 		StringCbCopyW (page, sizeof (page),L"Camellia.html");
 	}
-	else if (strcmp(dest, "sm4") == 0)
-	{
-		StringCbCopyW (page, sizeof (page),L"SM4.html");
-	}
 	else if (strcmp(dest, "cascades") == 0)
 	{
 		StringCbCopyW (page, sizeof (page),L"Cascades.html");

src/Common/Language.xml

@@ -1644,7 +1644,6 @@
     <entry lang="en" key="MOUNTPOINT_BLOCKED">ERROR: The volume mount point is blocked because it overrides a protected system directory.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="MOUNTPOINT_NOTALLOWED">ERROR: The volume mount point is not allowed because it overrides a directory that is part of the PATH environment variable.\n\nPlease choose a different mount point.</entry>
     <entry lang="en" key="INSECURE_MODE">[INSECURE MODE]</entry>
-    <entry lang="en" key="SM4_HELP">SM4 is a block cipher standard published by the Chinese National Cryptography Administration in 2006 as part of the GB/T 32907-2016 standard. 128-bit key, 128-bit block. Mode of operation is XTS. It is widely used in Chinese national standards and commercial applications.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

src/Common/Tests.c

@@ -422,78 +422,6 @@ KUZNYECHIK_TEST kuznyechik_vectors[KUZNYECHIK_TEST_COUNT] = {
 }
 };
 
-// SM4 ECB test vectors
-#define SM4_TEST_COUNT 11
-
-typedef struct {
-	unsigned char key[16];
-	unsigned char plaintext[16];
-	unsigned char ciphertext[16];
-} SM4_TEST;
-
-// Based on test vector fron cppcrypto (cppcrypto/testvectors/block_cipher/sm4.txt)
-SM4_TEST sm4_vectors[SM4_TEST_COUNT] = {
-{
-	// KEY 0
-	{ 0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef,0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10 },
-	{ 0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef,0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10 },
-	{ 0x68,0x1e,0xdf,0x34,0xd2,0x06,0x96,0x5e,0x86,0xb3,0xe9,0x4f,0x53,0x6e,0x42,0x46 }
-},
-{
-	// KEY 1
-	{ 0x68,0x1e,0xdf,0x34,0xd2,0x06,0x96,0x5e,0x86,0xb3,0xe9,0x4f,0x53,0x6e,0x42,0x46 },
-	{ 0xf4,0x21,0x31,0xb0,0x02,0x42,0x5b,0x6f,0x5c,0xf5,0x2a,0x81,0x06,0x82,0xa0,0x9d },
-	{ 0xec,0x4b,0x7b,0x17,0x57,0xfe,0xe9,0xce,0x45,0x51,0x97,0xe5,0xbf,0x9c,0x3a,0x90 }
-},
-{
-	// After KEY 1, PT/CT pairs
-	{ 0x68,0x1e,0xdf,0x34,0xd2,0x06,0x96,0x5e,0x86,0xb3,0xe9,0x4f,0x53,0x6e,0x42,0x46 },
-	{ 0x07,0xbc,0xae,0x6a,0x83,0x88,0xe1,0x46,0x51,0xfe,0xd8,0x4b,0x37,0x49,0xd3,0x86 },
-	{ 0x89,0xf2,0xc4,0x1e,0xd9,0x7d,0xbb,0x1b,0x74,0xa2,0xad,0x93,0xb9,0x03,0xbb,0xc9 }
-},
-{
-	{ 0x68,0x1e,0xdf,0x34,0xd2,0x06,0x96,0x5e,0x86,0xb3,0xe9,0x4f,0x53,0x6e,0x42,0x46 },
-	{ 0xf4,0x76,0x26,0x15,0xb3,0x2c,0x00,0x0a,0x16,0x5e,0x1d,0x72,0x2d,0x70,0x80,0x52 },
-	{ 0xf4,0x5a,0x41,0x05,0x2f,0x9b,0xf3,0xd5,0xb6,0x5d,0xf8,0xcc,0x1c,0x75,0xb4,0xcf }
-},
-{
-	{ 0x68,0x1e,0xdf,0x34,0xd2,0x06,0x96,0x5e,0x86,0xb3,0xe9,0x4f,0x53,0x6e,0x42,0x46 },
-	{ 0xba,0x3c,0x19,0xd8,0x92,0x63,0x56,0xed,0x14,0x91,0xc6,0xe4,0xe5,0x28,0x78,0x2f },
-	{ 0x3e,0x1f,0x30,0xd5,0x7d,0xf4,0xb6,0x06,0x94,0xf5,0x66,0xde,0x44,0x48,0x4f,0xaf }
-},
-{
-	// KEY 2
-	{ 0x78,0x1e,0xdf,0x34,0xd2,0x06,0x96,0x5e,0x86,0xb3,0xe9,0x4f,0x53,0x6e,0x42,0x47 },
-	{ 0x91,0x08,0x95,0x7f,0xf9,0x17,0xe3,0xd6,0x1c,0x4e,0xa3,0x3e,0x53,0xdb,0x6e,0xf3 },
-	{ 0x6a,0x52,0x9a,0xc0,0x93,0xa5,0xf3,0x04,0x5a,0xed,0x78,0x7f,0x70,0xcc,0xb7,0xf5 }
-},
-{
-	{ 0x78,0x1e,0xdf,0x34,0xd2,0x06,0x96,0x5e,0x86,0xb3,0xe9,0x4f,0x53,0x6e,0x42,0x47 },
-	{ 0xcb,0xa0,0xf0,0x56,0x75,0x35,0xd6,0x61,0x48,0xb3,0x5a,0x92,0x58,0x72,0x9c,0x23 },
-	{ 0x63,0x46,0xf0,0xe4,0xc5,0x95,0x32,0xd4,0x18,0xce,0x31,0x5b,0x9f,0x22,0xa0,0xf4 }
-},
-{
-	{ 0x78,0x1e,0xdf,0x34,0xd2,0x06,0x96,0x5e,0x86,0xb3,0xe9,0x4f,0x53,0x6e,0x42,0x47 },
-	{ 0xfa,0x59,0x80,0x11,0xf7,0xc2,0x10,0x07,0x99,0x45,0x1e,0x62,0xf3,0xb5,0xcf,0x09 },
-	{ 0x62,0x55,0x45,0x91,0x00,0x95,0x8f,0x4d,0x95,0x3a,0x9d,0x56,0x67,0x69,0x2d,0x6d }
-},
-{
-	{ 0x78,0x1e,0xdf,0x34,0xd2,0x06,0x96,0x5e,0x86,0xb3,0xe9,0x4f,0x53,0x6e,0x42,0x47 },
-	{ 0xba,0x1f,0x85,0x55,0xb2,0xdd,0xab,0x0e,0x4e,0x4d,0x80,0x26,0xb0,0x5a,0xf3,0x89 },
-	{ 0x37,0x6f,0xeb,0x09,0x78,0xb5,0x2a,0xb9,0xc9,0x84,0xa1,0x4d,0x7e,0x66,0xf6,0x71 }
-},
-{
-	{ 0x78,0x1e,0xdf,0x34,0xd2,0x06,0x96,0x5e,0x86,0xb3,0xe9,0x4f,0x53,0x6e,0x42,0x47 },
-	{ 0x50,0xc6,0x3c,0xe2,0x55,0x82,0x57,0x1a,0xa5,0xd8,0xee,0x22,0x08,0x9c,0x1b,0x59 },
-	{ 0x31,0xff,0xaf,0x2c,0xad,0x65,0x49,0xf3,0xd9,0xfc,0xd7,0xf0,0x2d,0xf5,0x81,0x24 }
-},
-{
-	{ 0x78,0x1e,0xdf,0x34,0xd2,0x06,0x96,0x5e,0x86,0xb3,0xe9,0x4f,0x53,0x6e,0x42,0x47 },
-	{ 0x22,0x9a,0xd7,0xa8,0xa8,0x3c,0x5e,0x23,0x84,0xb4,0x08,0x2e,0x50,0xd0,0x6e,0xbf },
-	{ 0x76,0xf2,0x9e,0x93,0xdd,0xf5,0x79,0x32,0xa4,0x1e,0x83,0xbb,0x7b,0x61,0xa4,0x06 }
-}
-};
-
 #endif
 
 /* Test vectors from FIPS 198a, RFC 4231, RFC 2104, RFC 2202, and other sources. */
@@ -722,7 +650,6 @@ void CipherInit2(int cipher, void* key, void* ks)
 	case TWOFISH:
 	case CAMELLIA:
 	case KUZNYECHIK:
-	case SM4:
 		CipherInit(cipher,key,ks);
 		break;
 	default:
@@ -942,32 +869,6 @@ BOOL TestSectorBufEncryption (PCRYPTO_INFO ci)
 					break;
 				}
 			}   
-			else if (wcscmp (name, L"SM4") == 0)
-			{
-				switch (testCase)
-				{
-				case 0:
-					if (crc != 0x561b1367)
-						return FALSE;
-					nTestsPerformed++;
-					break;
-				case 1:
-					if (crc != 0x8f72e14d)
-						return FALSE;
-					nTestsPerformed++;
-					break;
-				case 2:
-					if (crc != 0xf96df16f)
-						return FALSE;
-					nTestsPerformed++;
-					break;
-				case 3:
-					if (crc != 0x8997e6eb)
-						return FALSE;
-					nTestsPerformed++;
-					break;
-				}
-			}       
 			else if (wcscmp (name, L"AES-Twofish") == 0)
 			{
 				switch (testCase)
@@ -1202,84 +1103,6 @@ BOOL TestSectorBufEncryption (PCRYPTO_INFO ci)
 					break;
 				}
 			}
-			else if (wcscmp (name, L"SM4-Kuznyechik") == 0)
-			{
-				switch (testCase)
-				{
-				case 0:
-					if (crc != 0xa8179f71)
-						return FALSE;
-					nTestsPerformed++;
-					break;
-				case 1:
-					if (crc != 0xaa372193)
-						return FALSE;
-					nTestsPerformed++;
-					break;
-				case 2:
-					if (crc != 0x49b78057)
-						return FALSE;
-					nTestsPerformed++;
-					break;
-				case 3:
-					if (crc != 0x80718fd2)
-						return FALSE;
-					nTestsPerformed++;
-					break;
-				}
-			}
-			else if (wcscmp (name, L"SM4-Serpent") == 0)
-			{
-				switch (testCase)
-				{
-				case 0:
-					if (crc != 0x77cd332a)
-						return FALSE;
-					nTestsPerformed++;
-					break;
-				case 1:
-					if (crc != 0x3a2be34b)
-						return FALSE;
-					nTestsPerformed++;
-					break;
-				case 2:
-					if (crc != 0xfc1a6d4c)
-						return FALSE;
-					nTestsPerformed++;
-					break;
-				case 3:
-					if (crc != 0xf9b54baf)
-						return FALSE;
-					nTestsPerformed++;
-					break;
-				}
-			}
-			else if (wcscmp (name, L"SM4-Twofish") == 0)
-			{
-				switch (testCase)
-				{
-				case 0:
-					if (crc != 0xd9a46a64)
-						return FALSE;
-					nTestsPerformed++;
-					break;
-				case 1:
-					if (crc != 0x371fdc08)
-						return FALSE;
-					nTestsPerformed++;
-					break;
-				case 2:
-					if (crc != 0x231c5104)
-						return FALSE;
-					nTestsPerformed++;
-					break;
-				case 3:
-					if (crc != 0xa920424b)
-						return FALSE;
-					nTestsPerformed++;
-					break;
-				}
-			}
 			else if (wcscmp (name, L"Kuznyechik-Serpent-Camellia") == 0)
 			{
 				switch (testCase)
@@ -1306,32 +1129,6 @@ BOOL TestSectorBufEncryption (PCRYPTO_INFO ci)
 					break;
 				}
 			}
-			else if (wcscmp (name, L"SM4-Twofish-Serpent") == 0)
-			{
-				switch (testCase)
-				{
-				case 0:
-					if (crc != 0x3ef6c86f)
-						return FALSE;
-					nTestsPerformed++;
-					break;
-				case 1:
-					if (crc != 0xe5202d6c)
-						return FALSE;
-					nTestsPerformed++;
-					break;
-				case 2:
-					if (crc != 0xa3acb43b)
-						return FALSE;
-					nTestsPerformed++;
-					break;
-				case 3:
-					if (crc != 0xe9d64477)
-						return FALSE;
-					nTestsPerformed++;
-					break;
-				}
-			}
                 #endif
 			if (crc == 0x9f5edd58)
 				return FALSE;
@@ -1409,12 +1206,6 @@ BOOL TestSectorBufEncryption (PCRYPTO_INFO ci)
 				return FALSE;
 			nTestsPerformed++;
 		}
-		else if (wcscmp (name, L"SM4") == 0)
-		{
-			if (crc != 0x7b600d06)
-				return FALSE;
-			nTestsPerformed++;
-		}
 		else if (wcscmp (name, L"AES-Twofish") == 0)
 		{
 			if (crc != 0x14ce7385)
@@ -1469,36 +1260,12 @@ BOOL TestSectorBufEncryption (PCRYPTO_INFO ci)
 				return FALSE;
 			nTestsPerformed++;
 		}
-		else if (wcscmp (name, L"SM4-Kuznyechik") == 0)
-		{
-			if (crc != 0x23039a99)
-				return FALSE;
-			nTestsPerformed++;
-		}
-		else if (wcscmp (name, L"SM4-Serpent") == 0)
-		{
-			if (crc != 0xa7c3155b)
-				return FALSE;
-			nTestsPerformed++;
-		}
-		else if (wcscmp (name, L"SM4-Twofish") == 0)
-		{
-			if (crc != 0x1eaede31)
-				return FALSE;
-			nTestsPerformed++;
-		}
 		else if (wcscmp (name, L"Kuznyechik-Serpent-Camellia") == 0)
 		{
 			if (crc != 0x755dad72)
 				return FALSE;
 			nTestsPerformed++;
 		}
-		else if (wcscmp (name, L"SM4-Twofish-Serpent") == 0)
-		{
-			if (crc != 0x9723753f)
-				return FALSE;
-			nTestsPerformed++;
-		}
         #endif
 		if (crc == 0x9f5edd58)
 			return FALSE;
@@ -1510,7 +1277,7 @@ BOOL TestSectorBufEncryption (PCRYPTO_INFO ci)
 
 		nTestsPerformed++;
 	}
-	return (nTestsPerformed == 200);
+	return (nTestsPerformed == 150);
 }
 
 static BOOL DoAutoTestAlgorithms (void)
@@ -1652,26 +1419,6 @@ static BOOL DoAutoTestAlgorithms (void)
 	}
 	if (i != KUZNYECHIK_TEST_COUNT)
 		bFailed = TRUE;
-
-	/* SM4 */
-
-    for (i = 0; i < SM4_TEST_COUNT; i++)
-    {
-        int cipher = SM4;
-        memcpy(key, sm4_vectors[i].key, 16);
-		memcpy(tmp, sm4_vectors[i].plaintext, 16);
-		CipherInit(cipher, key, ks_tmp);
-
-		EncipherBlock(cipher, tmp, ks_tmp);
-		if (memcmp(sm4_vectors[i].ciphertext, tmp, 16) != 0)
-			break;
-
-		DecipherBlock(cipher, tmp, ks_tmp);
-		if (memcmp(sm4_vectors[i].plaintext, tmp, 16) != 0)
-			break;
-    }
-    if (i != SM4_TEST_COUNT)
-		bFailed = TRUE;
     #endif
 
 	/* PKCS #5 and HMACs */

src/Core/Unix/Linux/CoreLinux.cpp

@@ -312,14 +312,9 @@ namespace VeraCrypt
                         typeid (EncryptionModeXTS));
             #endif 
                 bool algoNotSupported = (typeid (*volume->GetEncryptionAlgorithm()) == typeid (Kuznyechik))
-			|| (typeid (*volume->GetEncryptionAlgorithm()) == typeid (SM4))
 			|| (typeid (*volume->GetEncryptionAlgorithm()) == typeid (CamelliaKuznyechik))
 			|| (typeid (*volume->GetEncryptionAlgorithm()) == typeid (KuznyechikTwofish))
 			|| (typeid (*volume->GetEncryptionAlgorithm()) == typeid (KuznyechikAES))
-			|| (typeid (*volume->GetEncryptionAlgorithm()) == typeid (SM4Kuznyechik))
-			|| (typeid (*volume->GetEncryptionAlgorithm()) == typeid (SM4Serpent))
-			|| (typeid (*volume->GetEncryptionAlgorithm()) == typeid (SM4Twofish))
-			|| (typeid (*volume->GetEncryptionAlgorithm()) == typeid (SM4TwofishSerpent))
 			|| (typeid (*volume->GetEncryptionAlgorithm()) == typeid (KuznyechikSerpentCamellia));
 
 		if (options.NoKernelCrypto

src/Crypto/Crypto.vcxproj

@@ -260,11 +260,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="Sha2Intel.c" />
-    <ClCompile Include="sm4-impl-aesni.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="sm4.cpp" />
     <ClCompile Include="Streebog.c" />
     <ClCompile Include="t1ha2.c" />
     <ClCompile Include="t1ha2_selfcheck.c" />
@@ -292,7 +287,6 @@
     <ClInclude Include="SerpentFast.h" />
     <ClInclude Include="SerpentFast_sbox.h" />
     <ClInclude Include="Sha2.h" />
-    <ClInclude Include="sm4.h" />
     <ClInclude Include="Streebog.h" />
     <ClInclude Include="t1ha.h" />
     <ClInclude Include="t1ha_bits.h" />

src/Crypto/Crypto.vcxproj.filters

@@ -99,12 +99,6 @@
     <ClCompile Include="sha256_armv8.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sm4.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sm4-impl-aesni.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Aes.h">
@@ -182,9 +176,6 @@
     <ClInclude Include="t1ha_selfcheck.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="sm4.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="Aes_hw_cpu.asm">

src/Crypto/Sources

@@ -48,8 +48,6 @@ SOURCES = \
 	Streebog.c \
 	kuznyechik.c \
 	kuznyechik_simd.c \
-	sm4.cpp \
-	sm4-impl-aesni.cpp \
 	Whirlpool.c \
 	Camellia.c \
 	Camellia_$(TC_ARCH).S \

src/Driver/Driver.vcxproj

@@ -277,11 +277,6 @@ copy $(OutDir)veracrypt.inf "$(SolutionDir)Debug\Setup Files\veracrypt.inf"</Com
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\Crypto\Sha2Intel.c" />
-    <ClCompile Include="..\Crypto\sm4-impl-aesni.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\Crypto\sm4.cpp" />
     <ClCompile Include="..\Crypto\Streebog.c" />
     <ClCompile Include="..\Crypto\t1ha2.c" />
     <ClCompile Include="..\Crypto\t1ha2_selfcheck.c" />
@@ -319,7 +314,6 @@ copy $(OutDir)veracrypt.inf "$(SolutionDir)Debug\Setup Files\veracrypt.inf"</Com
     <ClInclude Include="..\Crypto\SerpentFast.h" />
     <ClInclude Include="..\Crypto\SerpentFast_sbox.h" />
     <ClInclude Include="..\Crypto\Sha2.h" />
-    <ClInclude Include="..\Crypto\sm4.h" />
     <ClInclude Include="..\Crypto\Streebog.h" />
     <ClInclude Include="..\Crypto\t1ha.h" />
     <ClInclude Include="..\Crypto\t1ha_bits.h" />

src/Driver/Driver.vcxproj.filters

@@ -171,12 +171,6 @@
     <ClCompile Include="..\Crypto\sha256_armv8.c">
       <Filter>Crypto\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Crypto\sm4.cpp">
-      <Filter>Crypto\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Crypto\sm4-impl-aesni.cpp">
-      <Filter>Crypto\Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\Common\Tcdefs.h">
@@ -287,9 +281,6 @@
     <ClInclude Include="..\Driver\VolumeFilter.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Crypto\sm4.h">
-      <Filter>Crypto\Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\Crypto\Aes_hw_cpu.asm">

src/Format/Tcformat.c

@@ -1442,12 +1442,6 @@ void ComboSelChangeEA (HWND hwndDlg)
 
 			SetWindowTextW (GetDlgItem (hwndDlg, IDC_BOX_HELP), GetString ("CAMELLIA_HELP"));
 		}
-		else if (wcscmp (name, L"SM4") == 0)
-		{
-			StringCbPrintfW (hyperLink, sizeof(hyperLink) / 2, GetString ("MORE_INFO_ABOUT"), name);
-
-			SetWindowTextW (GetDlgItem (hwndDlg, IDC_BOX_HELP), GetString ("SM4_HELP"));
-		}
 		else if (EAGetCipherCount (nIndex) > 1)
 		{
 			// Cascade
@@ -5660,8 +5654,6 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 				Applink ("kuznyechik");
 			else if (wcscmp (name, L"Camellia") == 0)
 				Applink ("camellia");
-			else if (wcscmp (name, L"SM4") == 0)
-				Applink ("sm4");
 			else if (EAGetCipherCount (nIndex) > 1)
 				Applink ("cascades");
 

src/Main/Forms/EncryptionOptionsWizardPage.cpp

@@ -100,8 +100,6 @@ namespace VeraCrypt
 				EncryptionAlgorithmStaticText->SetLabel (LangString["CAMELLIA_HELP"]);
 			else if (typeid (*ea) == typeid (Kuznyechik))
 				EncryptionAlgorithmStaticText->SetLabel (LangString["KUZNYECHIK_HELP"]);
-			else if (typeid (*ea) == typeid (SM4))
-				EncryptionAlgorithmStaticText->SetLabel (LangString["SM4_HELP"]);
 			else
 				EncryptionAlgorithmStaticText->SetLabel (L"");
 		}

src/Main/GraphicUserInterface.cpp

@@ -1304,10 +1304,6 @@ namespace VeraCrypt
 		{
 			url = L"Kuznyechik.html";
 		}
-		else if (linkId == L"sm4")
-		{
-			url = L"SM4.html";
-		}
 		else if (linkId == L"cascades")
 		{
 			url = L"Cascades.html";

src/Release/Setup Files/Product64.wxs

@@ -797,9 +797,6 @@
 			<Component Id="cmp9EC1750F7CD9717D3A761FC2930C509D" Guid="{980F49E8-EBCD-4720-8466-C03DC2B3BBD7}">
 				<File Id="fil780042F951150166D5D328C10993CE7E" KeyPath="yes" Source="$(sys.CURRENTDIR)\docs\html\en\Kuznyechik.html" Checksum="yes" DiskId="1" />
 			</Component>
-			<Component Id="cmpDD785B73974849F0B358BE861E72DF01" Guid="{1AEB282A-FFC1-49E1-A6BA-11B8A60E52DC}">
-				<File Id="fil49731D859E3640C6A02879615E946D42" KeyPath="yes" Source="$(sys.CURRENTDIR)\docs\html\en\SM4.html" Checksum="yes" DiskId="1" />
-			</Component>
 			<Component Id="cmp4298A84BD6956E2A2742B5678BCFF173" Guid="{2809427F-697F-48A4-853B-5BE4AE1E720A}">
 				<File Id="fil01E37EFCBAF6AB983418B79E3DD75E88" KeyPath="yes" Source="$(sys.CURRENTDIR)\docs\html\en\Language Packs.html" Checksum="yes" DiskId="1" />
 			</Component>
@@ -1446,9 +1443,6 @@
 			<Component Id="cmpCA290469DDC2BF237F81DDD5B1767EED" Guid="{AF232DD2-C9E9-43B2-BA21-C653C3D78B17}">
 				<File Id="fil707DCE82E2DB960CA32D798C9D58BFD0" KeyPath="yes" Source="$(sys.CURRENTDIR)\docs\html\ru\Kuznyechik.html" Checksum="yes" DiskId="1" />
 			</Component>
-			<Component Id="cmp28F5B42ECF3547A7962DF465FFB005D1" Guid="{941CF92B-37B4-4119-87BA-D63A7D892031}">
-				<File Id="fil91EBD060483445EAA9DE2D3DB51DD7C7" KeyPath="yes" Source="$(sys.CURRENTDIR)\docs\html\ru\SM4.html" Checksum="yes" DiskId="1" />
-			</Component>
 			<Component Id="cmp72EE25B25C5C68F03DF9176C2D3F8BDD" Guid="{E162CD5B-C72D-4DEE-BD06-048CAB209743}">
 				<File Id="fil30D8E2286343AA063BB31ADDD09E8B79" KeyPath="yes" Source="$(sys.CURRENTDIR)\docs\html\ru\Language Packs.html" Checksum="yes" DiskId="1" />
 			</Component>
@@ -2094,9 +2088,6 @@
 	   	<Component Id="cmp56374396CDBAA23F8BE5DEBA503FDDAA" Guid="{3EEA13F1-B8EB-B348-9D83-BD6B5B37A796}">
 	   		<File Id="filC44D0EAFF15558D6E435AFE7666B22EA" KeyPath="yes" Source="$(sys.CURRENTDIR)\docs\html\zh-cn\Kuznyechik.html" Checksum="yes" DiskId="1" />
 	   		</Component>
-	   	<Component Id="cmpC16F53E9B3C7478A98F30448CB6DD523" Guid="{C16F53E9-B3C7-478A-98F3-0448CB6DD523}">
-	   		<File Id="filC0CC0D6052124CBF959DF853C14352C1" KeyPath="yes" Source="$(sys.CURRENTDIR)\docs\html\zh-cn\SM4.html" Checksum="yes" DiskId="1" />
-	   	</Component>
 	   	<Component Id="cmpB6A781131BBE88FA5794EFF1F719744B" Guid="{80F23A6A-622B-FA9A-1627-088BB700C6F2}">
 	   		<File Id="fil63A19CD842764B27343E0E63488B8540" KeyPath="yes" Source="$(sys.CURRENTDIR)\docs\html\zh-cn\Language Packs.html" Checksum="yes" DiskId="1" />
 	   		</Component>
@@ -2786,7 +2777,6 @@
 			<ComponentRef Id="cmpFC8FB415783E0AA424FBD685EFACF54E" />
 			<ComponentRef Id="cmp2BCEA21755E1C812ACCF15A09210FCCD" />
 			<ComponentRef Id="cmp9EC1750F7CD9717D3A761FC2930C509D" />
-            <ComponentRef Id="cmpDD785B73974849F0B358BE861E72DF01" />
 			<ComponentRef Id="cmp4298A84BD6956E2A2742B5678BCFF173" />
 			<ComponentRef Id="cmp2D9F7D88EF1F843BDEA5A39D13330B8A" />
 			<ComponentRef Id="cmp58EAECCB29CB9ABDDDB72F9378E4EE77" />
@@ -3004,7 +2994,6 @@
 			<ComponentRef Id="cmpD858F6459F1D5BE26754F7B9A6B256FB" />
 			<ComponentRef Id="cmpD935A23E00BC5621253BAF554A60C48A" />
 			<ComponentRef Id="cmpCA290469DDC2BF237F81DDD5B1767EED" />
-            <ComponentRef Id="cmp28F5B42ECF3547A7962DF465FFB005D1" />
 			<ComponentRef Id="cmp72EE25B25C5C68F03DF9176C2D3F8BDD" />
 			<ComponentRef Id="cmp29F705976D3FE416CA69F9A85F81E453" />
 			<ComponentRef Id="cmp3092B4A3F28D76A5F41FB2DC967976BF" />
@@ -3222,7 +3211,6 @@
 			<ComponentRef Id="cmp536D5016E985775CACBEE78964CDB44D" />
 			<ComponentRef Id="cmp34B70BB362A4A65AF541E008135AFD87" />
 			<ComponentRef Id="cmp56374396CDBAA23F8BE5DEBA503FDDAA" />
-            <ComponentRef Id="cmpC16F53E9B3C7478A98F30448CB6DD523" />
 			<ComponentRef Id="cmpB6A781131BBE88FA5794EFF1F719744B" />
 			<ComponentRef Id="cmpE78E6B581A96987CFBA2F14881CC8C29" />
 			<ComponentRef Id="cmp3DA875F1A8705BEE59E1117BB79E9587" />

src/SetupDLL/Setup.c

@@ -733,10 +733,6 @@ void Applink_Dll (MSIHANDLE hInstaller, const char *dest)
 	{
 		StringCbCopyW (page, sizeof (page),L"Camellia.html");
 	}
-	else if (strcmp(dest, "sm4") == 0)
-	{
-		StringCbCopyW (page, sizeof (page),L"SM4.html");
-	}
 	else if (strcmp(dest, "cascades") == 0)
 	{
 		StringCbCopyW (page, sizeof (page),L"Cascades.html");

src/Volume/Cipher.cpp

@@ -17,7 +17,6 @@
 #include "Crypto/Twofish.h"
 #include "Crypto/Camellia.h"
 #include "Crypto/kuznyechik.h"
-#include "Crypto/sm4.h"
 
 #ifdef TC_AES_HW_CPU
 #	include "Crypto/Aes_hw_cpu.h"
@@ -100,7 +99,6 @@ namespace VeraCrypt
 		l.push_back (shared_ptr <Cipher> (new CipherTwofish ()));
 		l.push_back (shared_ptr <Cipher> (new CipherCamellia ()));
 		l.push_back (shared_ptr <Cipher> (new CipherKuznyechik ()));
-		l.push_back (shared_ptr <Cipher> (new CipherSM4 ()));
         #endif
 		return l;
 	}
@@ -521,72 +519,6 @@ namespace VeraCrypt
 #endif
 	}
 
-	// SM4
-	void CipherSM4::Decrypt (uint8 *data) const
-	{
-		sm4_decrypt_block (data, data, (sm4_kds *) ScheduledKey.Ptr());
-	}
-
-	void CipherSM4::Encrypt (uint8 *data) const
-	{
-		sm4_encrypt_block (data, data, (sm4_kds *) ScheduledKey.Ptr());
-	}
-
-	size_t CipherSM4::GetScheduledKeySize () const
-	{
-		return SM4_KS;
-	}
-
-	void CipherSM4::SetCipherKey (const uint8 *key)
-	{
-		sm4_set_key (key, (sm4_kds *) ScheduledKey.Ptr());
-	}
-	void CipherSM4::EncryptBlocks (uint8 *data, size_t blockCount) const
-	{
-		if (!Initialized)
-			throw NotInitialized (SRC_POS);
-
-		if ((blockCount >= 4)
-			&& IsHwSupportAvailable())
-		{
-			sm4_encrypt_blocks (data, data, blockCount, (sm4_kds *) ScheduledKey.Ptr());
-		}
-		else
-			Cipher::EncryptBlocks (data, blockCount);
-	}
-	
-	void CipherSM4::DecryptBlocks (uint8 *data, size_t blockCount) const
-	{
-		if (!Initialized)
-			throw NotInitialized (SRC_POS);
-
-		if ((blockCount >= 4)
-			&& IsHwSupportAvailable())
-		{
-			sm4_decrypt_blocks (data, data, blockCount, (sm4_kds *) ScheduledKey.Ptr());
-		}
-		else
-			Cipher::DecryptBlocks (data, blockCount);
-	}
-	
-	bool CipherSM4::IsHwSupportAvailable () const
-	{
-#if CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32
-		static bool state = false;
-		static bool stateValid = false;
-
-		if (!stateValid)
-		{
-            state = HasSSE41() && HasAESNI();
-			stateValid = true;
-		}
-		return state;
-#else
-		return false;
-#endif
-	}
-
-
     #endif	
         bool Cipher::HwSupportEnabled = true;
 }

src/Volume/Cipher.h

@@ -148,7 +148,6 @@ namespace VeraCrypt
 	TC_CIPHER (Twofish, 16, 32);
 	TC_CIPHER (Camellia, 16, 32);
 	TC_CIPHER (Kuznyechik, 16, 32);
-	TC_CIPHER (SM4, 16, 16);
 
 #undef TC_CIPHER_ADD_METHODS
 #define TC_CIPHER_ADD_METHODS

src/Volume/EncryptionAlgorithm.cpp

@@ -70,7 +70,6 @@ namespace VeraCrypt
 		l.push_back (shared_ptr <EncryptionAlgorithm> (new Twofish ()));
 		l.push_back (shared_ptr <EncryptionAlgorithm> (new Camellia ()));
 		l.push_back (shared_ptr <EncryptionAlgorithm> (new Kuznyechik ()));
-		l.push_back (shared_ptr <EncryptionAlgorithm> (new SM4 ()));
 		l.push_back (shared_ptr <EncryptionAlgorithm> (new AESTwofish ()));
 		l.push_back (shared_ptr <EncryptionAlgorithm> (new AESTwofishSerpent ()));
 		l.push_back (shared_ptr <EncryptionAlgorithm> (new CamelliaKuznyechik ()));
@@ -81,10 +80,6 @@ namespace VeraCrypt
 		l.push_back (shared_ptr <EncryptionAlgorithm> (new SerpentAES ()));
 		l.push_back (shared_ptr <EncryptionAlgorithm> (new SerpentTwofishAES ()));
 		l.push_back (shared_ptr <EncryptionAlgorithm> (new TwofishSerpent ()));
-		l.push_back (shared_ptr <EncryptionAlgorithm> (new SM4Kuznyechik ()));
-		l.push_back (shared_ptr <EncryptionAlgorithm> (new SM4Serpent ()));
-		l.push_back (shared_ptr <EncryptionAlgorithm> (new SM4Twofish ()));
-		l.push_back (shared_ptr <EncryptionAlgorithm> (new SM4TwofishSerpent ()));
         #endif
 		return l;
 	}
@@ -386,49 +381,5 @@ namespace VeraCrypt
 		SupportedModes.push_back (shared_ptr <EncryptionMode> (new EncryptionModeXTS ()));
 	}
 
-	// SM4
-	SM4::SM4 ()
-	{
-		Ciphers.push_back (shared_ptr <Cipher> (new CipherSM4()));
-
-		SupportedModes.push_back (shared_ptr <EncryptionMode> (new EncryptionModeXTS ()));
-	}
-	
-	// SM4-Kuznyechik
-	SM4Kuznyechik::SM4Kuznyechik ()
-	{
-		Ciphers.push_back (shared_ptr <Cipher> (new CipherKuznyechik ()));
-		Ciphers.push_back (shared_ptr <Cipher> (new CipherSM4 ()));
-
-		SupportedModes.push_back (shared_ptr <EncryptionMode> (new EncryptionModeXTS ()));
-	}
-
-	// SM4-Serpent
-	SM4Serpent::SM4Serpent ()
-	{
-		Ciphers.push_back (shared_ptr <Cipher> (new CipherSerpent ()));
-		Ciphers.push_back (shared_ptr <Cipher> (new CipherSM4 ()));
-
-		SupportedModes.push_back (shared_ptr <EncryptionMode> (new EncryptionModeXTS ()));
-	}
-
-    // SM4-Twofish
-    SM4Twofish::SM4Twofish ()
-	{
-        Ciphers.push_back (shared_ptr <Cipher> (new CipherTwofish ()));
-		Ciphers.push_back (shared_ptr <Cipher> (new CipherSM4 ()));
-
-		SupportedModes.push_back (shared_ptr <EncryptionMode> (new EncryptionModeXTS ()));
-	}
-
-    // SM4-Twofish-Serpent
-    SM4TwofishSerpent::SM4TwofishSerpent ()
-	{
-        Ciphers.push_back (shared_ptr <Cipher> (new CipherSerpent ()));
-        Ciphers.push_back (shared_ptr <Cipher> (new CipherTwofish ()));
-		Ciphers.push_back (shared_ptr <Cipher> (new CipherSM4 ()));
-
-		SupportedModes.push_back (shared_ptr <EncryptionMode> (new EncryptionModeXTS ()));
-	}
 #endif
 }

src/Volume/EncryptionAlgorithm.h

@@ -95,11 +95,6 @@ namespace VeraCrypt
 	TC_ENCRYPTION_ALGORITHM (KuznyechikSerpentCamellia);
 	TC_ENCRYPTION_ALGORITHM (CamelliaKuznyechik);
 	TC_ENCRYPTION_ALGORITHM (CamelliaSerpent);
-	TC_ENCRYPTION_ALGORITHM (SM4);
-	TC_ENCRYPTION_ALGORITHM (SM4Kuznyechik);
-	TC_ENCRYPTION_ALGORITHM (SM4Serpent);
-	TC_ENCRYPTION_ALGORITHM (SM4Twofish);
-    TC_ENCRYPTION_ALGORITHM (SM4TwofishSerpent);
 
 
 #undef TC_ENCRYPTION_ALGORITHM

src/Volume/EncryptionTest.cpp

@@ -163,102 +163,6 @@ namespace VeraCrypt
 			}
 		}
 	};
-
-	static const CipherTestVector SM4TestVectors[] =
-	{
-		{
-			// KEY 0
-			{ 0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef,0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10,
-              0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 // dummy
-			},
-			16,
-			{ 0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef,0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10 },
-			{ 0x68,0x1e,0xdf,0x34,0xd2,0x06,0x96,0x5e,0x86,0xb3,0xe9,0x4f,0x53,0x6e,0x42,0x46 }
-		},
-		{
-			// KEY 1
-			{ 0x68,0x1e,0xdf,0x34,0xd2,0x06,0x96,0x5e,0x86,0xb3,0xe9,0x4f,0x53,0x6e,0x42,0x46,
-              0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 // dummy
-			},
-			16,
-			{ 0xf4,0x21,0x31,0xb0,0x02,0x42,0x5b,0x6f,0x5c,0xf5,0x2a,0x81,0x06,0x82,0xa0,0x9d },
-			{ 0xec,0x4b,0x7b,0x17,0x57,0xfe,0xe9,0xce,0x45,0x51,0x97,0xe5,0xbf,0x9c,0x3a,0x90 }
-		},
-		{
-			// After KEY 1, PT/CT pairs
-			{ 0x68,0x1e,0xdf,0x34,0xd2,0x06,0x96,0x5e,0x86,0xb3,0xe9,0x4f,0x53,0x6e,0x42,0x46,
-              0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 // dummy
-			},
-			16,
-			{ 0x07,0xbc,0xae,0x6a,0x83,0x88,0xe1,0x46,0x51,0xfe,0xd8,0x4b,0x37,0x49,0xd3,0x86 },
-			{ 0x89,0xf2,0xc4,0x1e,0xd9,0x7d,0xbb,0x1b,0x74,0xa2,0xad,0x93,0xb9,0x03,0xbb,0xc9 }
-		},
-		{
-			{ 0x68,0x1e,0xdf,0x34,0xd2,0x06,0x96,0x5e,0x86,0xb3,0xe9,0x4f,0x53,0x6e,0x42,0x46,
-              0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 // dummy
-			},
-			16,
-			{ 0xf4,0x76,0x26,0x15,0xb3,0x2c,0x00,0x0a,0x16,0x5e,0x1d,0x72,0x2d,0x70,0x80,0x52 },
-			{ 0xf4,0x5a,0x41,0x05,0x2f,0x9b,0xf3,0xd5,0xb6,0x5d,0xf8,0xcc,0x1c,0x75,0xb4,0xcf }
-		},
-		{
-			{ 0x68,0x1e,0xdf,0x34,0xd2,0x06,0x96,0x5e,0x86,0xb3,0xe9,0x4f,0x53,0x6e,0x42,0x46,
-              0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 // dummy
-			},
-			16,
-			{ 0xba,0x3c,0x19,0xd8,0x92,0x63,0x56,0xed,0x14,0x91,0xc6,0xe4,0xe5,0x28,0x78,0x2f },
-			{ 0x3e,0x1f,0x30,0xd5,0x7d,0xf4,0xb6,0x06,0x94,0xf5,0x66,0xde,0x44,0x48,0x4f,0xaf }
-		},
-		{
-			// KEY 2
-			{ 0x78,0x1e,0xdf,0x34,0xd2,0x06,0x96,0x5e,0x86,0xb3,0xe9,0x4f,0x53,0x6e,0x42,0x47,
-              0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 // dummy
-			},
-			16,
-			{ 0x91,0x08,0x95,0x7f,0xf9,0x17,0xe3,0xd6,0x1c,0x4e,0xa3,0x3e,0x53,0xdb,0x6e,0xf3 },
-			{ 0x6a,0x52,0x9a,0xc0,0x93,0xa5,0xf3,0x04,0x5a,0xed,0x78,0x7f,0x70,0xcc,0xb7,0xf5 }
-		},
-		{
-			{ 0x78,0x1e,0xdf,0x34,0xd2,0x06,0x96,0x5e,0x86,0xb3,0xe9,0x4f,0x53,0x6e,0x42,0x47,
-              0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 // dummy
-			},
-			16,
-			{ 0xcb,0xa0,0xf0,0x56,0x75,0x35,0xd6,0x61,0x48,0xb3,0x5a,0x92,0x58,0x72,0x9c,0x23 },
-			{ 0x63,0x46,0xf0,0xe4,0xc5,0x95,0x32,0xd4,0x18,0xce,0x31,0x5b,0x9f,0x22,0xa0,0xf4 }
-		},
-		{
-			{ 0x78,0x1e,0xdf,0x34,0xd2,0x06,0x96,0x5e,0x86,0xb3,0xe9,0x4f,0x53,0x6e,0x42,0x47,
-              0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 // dummy
-			},
-			16,
-			{ 0xfa,0x59,0x80,0x11,0xf7,0xc2,0x10,0x07,0x99,0x45,0x1e,0x62,0xf3,0xb5,0xcf,0x09 },
-			{ 0x62,0x55,0x45,0x91,0x00,0x95,0x8f,0x4d,0x95,0x3a,0x9d,0x56,0x67,0x69,0x2d,0x6d }
-		},
-		{
-			{ 0x78,0x1e,0xdf,0x34,0xd2,0x06,0x96,0x5e,0x86,0xb3,0xe9,0x4f,0x53,0x6e,0x42,0x47,
-              0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 // dummy
-			},
-			16,
-			{ 0xba,0x1f,0x85,0x55,0xb2,0xdd,0xab,0x0e,0x4e,0x4d,0x80,0x26,0xb0,0x5a,0xf3,0x89 },
-			{ 0x37,0x6f,0xeb,0x09,0x78,0xb5,0x2a,0xb9,0xc9,0x84,0xa1,0x4d,0x7e,0x66,0xf6,0x71 }
-		},
-		{
-			{ 0x78,0x1e,0xdf,0x34,0xd2,0x06,0x96,0x5e,0x86,0xb3,0xe9,0x4f,0x53,0x6e,0x42,0x47,
-              0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 // dummy
-			},
-			16,
-			{ 0x50,0xc6,0x3c,0xe2,0x55,0x82,0x57,0x1a,0xa5,0xd8,0xee,0x22,0x08,0x9c,0x1b,0x59 },
-			{ 0x31,0xff,0xaf,0x2c,0xad,0x65,0x49,0xf3,0xd9,0xfc,0xd7,0xf0,0x2d,0xf5,0x81,0x24 }
-		},
-		{
-			{ 0x78,0x1e,0xdf,0x34,0xd2,0x06,0x96,0x5e,0x86,0xb3,0xe9,0x4f,0x53,0x6e,0x42,0x47,
-              0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 // dummy
-			},
-			16,
-			{ 0x22,0x9a,0xd7,0xa8,0xa8,0x3c,0x5e,0x23,0x84,0xb4,0x08,0x2e,0x50,0xd0,0x6e,0xbf },
-			{ 0x76,0xf2,0x9e,0x93,0xdd,0xf5,0x79,0x32,0xa4,0x1e,0x83,0xbb,0x7b,0x61,0xa4,0x06 }
-		}
-	};
     #endif
 
 	static void TestCipher (Cipher &cipher, const CipherTestVector *testVector, size_t testVectorCount)
@@ -311,9 +215,6 @@ namespace VeraCrypt
 			
 			CipherKuznyechik kuznyechik;
 			TestCipher (kuznyechik, KuznyechikTestVectors, array_capacity (KuznyechikTestVectors));
-
-			CipherSM4 sm4;
-            TestCipher (sm4, SM4TestVectors, array_capacity (SM4TestVectors));
         #endif
 	}
 
@@ -790,32 +691,6 @@ namespace VeraCrypt
 						break;
 					}
 				}
-				else if (typeid (ea) == typeid (SM4))
-				{
-					switch (testCase)
-					{
-					case 0:
-						if (crc != 0x561b1367)
-							throw TestFailed (SRC_POS);
-						nTestsPerformed++;
-						break;
-					case 1:
-						if (crc != 0x8f72e14d)
-							throw TestFailed (SRC_POS);
-						nTestsPerformed++;
-						break;
-					case 2:
-						if (crc != 0xf96df16f)
-							throw TestFailed (SRC_POS);
-						nTestsPerformed++;
-						break;
-					case 3:
-						if (crc != 0x8997e6eb)
-							throw TestFailed (SRC_POS);
-						nTestsPerformed++;
-						break;
-					}
-				}
 				else if (typeid (ea) == typeid (AESTwofish))
 				{
 					switch (testCase)
@@ -1076,110 +951,6 @@ namespace VeraCrypt
 						break;
 					}
 				}
-				else if (typeid (ea) == typeid (SM4Kuznyechik))
-				{
-					switch (testCase)
-					{
-					case 0:
-						if (crc != 0xa8179f71)
-							throw TestFailed (SRC_POS);
-						nTestsPerformed++;
-						break;
-					case 1:
-						if (crc != 0xaa372193)
-							throw TestFailed (SRC_POS);
-						nTestsPerformed++;
-						break;
-					case 2:
-						if (crc != 0x49b78057)
-							throw TestFailed (SRC_POS);
-						nTestsPerformed++;
-						break;
-					case 3:
-						if (crc != 0x80718fd2)
-							throw TestFailed (SRC_POS);
-						nTestsPerformed++;
-						break;
-					}
-				}
-				else if (typeid (ea) == typeid (SM4Serpent))
-				{
-					switch (testCase)
-					{
-					case 0:
-						if (crc != 0x77cd332a)
-							throw TestFailed (SRC_POS);
-						nTestsPerformed++;
-						break;
-					case 1:
-						if (crc != 0x3a2be34b)
-							throw TestFailed (SRC_POS);
-						nTestsPerformed++;
-						break;
-					case 2:
-						if (crc != 0xfc1a6d4c)
-							throw TestFailed (SRC_POS);
-						nTestsPerformed++;
-						break;
-					case 3:
-						if (crc != 0xf9b54baf)
-							throw TestFailed (SRC_POS);
-						nTestsPerformed++;
-						break;
-					}
-				}
-				else if (typeid (ea) == typeid (SM4Twofish))
-				{
-					switch (testCase)
-					{
-					case 0:
-						if (crc != 0xd9a46a64)
-							throw TestFailed (SRC_POS);
-						nTestsPerformed++;
-						break;
-					case 1:
-						if (crc != 0x371fdc08)
-							throw TestFailed (SRC_POS);
-						nTestsPerformed++;
-						break;
-					case 2:
-						if (crc != 0x231c5104)
-							throw TestFailed (SRC_POS);
-						nTestsPerformed++;
-						break;
-					case 3:
-						if (crc != 0xa920424b)
-							throw TestFailed (SRC_POS);
-						nTestsPerformed++;
-						break;
-					}
-				}
-				else if (typeid (ea) == typeid (SM4TwofishSerpent))
-				{
-					switch (testCase)
-					{
-					case 0:
-						if (crc != 0x3ef6c86f)
-							throw TestFailed (SRC_POS);
-						nTestsPerformed++;
-						break;
-					case 1:
-						if (crc != 0xe5202d6c)
-							throw TestFailed (SRC_POS);
-						nTestsPerformed++;
-						break;
-					case 2:
-						if (crc != 0xa3acb43b)
-							throw TestFailed (SRC_POS);
-						nTestsPerformed++;
-						break;
-					case 3:
-						if (crc != 0xe9d64477)
-							throw TestFailed (SRC_POS);
-						nTestsPerformed++;
-						break;
-					}
-				}
                         #endif
 				if (crc == 0x9f5edd58)
 					throw TestFailed (SRC_POS);
@@ -1267,12 +1038,6 @@ namespace VeraCrypt
 					throw TestFailed (SRC_POS);
 				nTestsPerformed++;
 			}
-			else if (typeid (ea) == typeid (SM4))
-			{
-				if (crc != 0x7b600d06)
-					throw TestFailed (SRC_POS);
-				nTestsPerformed++;
-			}
 			else if (typeid (ea) == typeid (AESTwofish))
 			{
 				if (crc != 0x14ce7385)
@@ -1333,30 +1098,6 @@ namespace VeraCrypt
 					throw TestFailed (SRC_POS);
 				nTestsPerformed++;
 			}
-			else if (typeid (ea) == typeid (SM4Kuznyechik))
-			{
-				if (crc != 0x23039a99)
-					throw TestFailed (SRC_POS);
-				nTestsPerformed++;
-			}
-			else if (typeid (ea) == typeid (SM4Serpent))
-			{
-				if (crc != 0xa7c3155b)
-					throw TestFailed (SRC_POS);
-				nTestsPerformed++;
-			}
-			else if (typeid (ea) == typeid (SM4Twofish))
-			{
-				if (crc != 0x1eaede31)
-					throw TestFailed (SRC_POS);
-				nTestsPerformed++;
-			}
-			else if (typeid (ea) == typeid (SM4TwofishSerpent))
-			{
-				if (crc != 0x9723753f)
-					throw TestFailed (SRC_POS);
-				nTestsPerformed++;
-			}
                 #endif
 
 			if (crc == 0x9f5edd58)
@@ -1370,7 +1111,7 @@ namespace VeraCrypt
 			nTestsPerformed++;
 		}
             #ifndef WOLFCRYPT_BACKEND
-		if (nTestsPerformed != 200)
+		if (nTestsPerformed != 150)
             #else
                if (nTestsPerformed != 10)
             #endif

src/Volume/Volume.make

@@ -96,11 +96,6 @@ else
 	OBJS += ../Crypto/blake2s_SSE41.o
 	OBJS += ../Crypto/blake2s_SSSE3.o
 endif
-ifeq "$(GCC_GTEQ_440)" "1"
-	OBJAESNI += ../Crypto/sm4-impl-aesni.oaesni
-else
-	OBJS += ../Crypto/sm4-impl-aesni.o
-endif
 ifeq "$(GCC_GTEQ_500)" "1"
 	OBJSHANI += ../Crypto/Sha2Intel.oshani
 else
@@ -124,7 +119,6 @@ OBJS += ../Crypto/Camellia.o
 OBJS += ../Crypto/Streebog.o
 OBJS += ../Crypto/kuznyechik.o
 OBJS += ../Crypto/kuznyechik_simd.o
-OBJS += ../Crypto/sm4.o
 OBJS += ../Common/Pkcs5.o
 endif
 

src/Volume/VolumeLayout.cpp

@@ -109,7 +109,6 @@ namespace VeraCrypt
 		SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new Twofish ()));
 		SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new Camellia ()));
 		SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new Kuznyechik ()));
-		SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new SM4 ()));
 		SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new AESTwofish ()));
 		SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new AESTwofishSerpent ()));
 		SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new CamelliaKuznyechik ()));
@@ -120,10 +119,6 @@ namespace VeraCrypt
 		SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new SerpentAES ()));
 		SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new SerpentTwofishAES ()));
 		SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new TwofishSerpent ()));
-		SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new SM4Kuznyechik ()));
-		SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new SM4Serpent ()));
-		SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new SM4Twofish ()));
-		SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new SM4TwofishSerpent ()));
 		SupportedEncryptionModes.push_back (shared_ptr <EncryptionMode> (new EncryptionModeXTS ()));
         #else
 		SupportedEncryptionModes.push_back (shared_ptr <EncryptionMode> (new EncryptionModeWolfCryptXTS ()));
@@ -163,7 +158,6 @@ namespace VeraCrypt
 		SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new Twofish ()));
 		SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new Camellia ()));
 		SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new Kuznyechik ()));
-		SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new SM4 ()));
 		SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new AESTwofish ()));
 		SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new AESTwofishSerpent ()));
 		SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new CamelliaKuznyechik ()));
@@ -174,10 +168,6 @@ namespace VeraCrypt
 		SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new SerpentAES ()));
 		SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new SerpentTwofishAES ()));
 		SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new TwofishSerpent ()));
-		SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new SM4Kuznyechik ()));
-		SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new SM4Serpent ()));
-		SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new SM4Twofish ()));
-		SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new SM4TwofishSerpent ()));
 
 		SupportedEncryptionModes.push_back (shared_ptr <EncryptionMode> (new EncryptionModeXTS ()));
         #else