mirror of
https://github.com/veracrypt/VeraCrypt.git
synced 2026-06-19 02:56:07 -05:00
Initial support of SM4 cipher for normal volumes
This commit is contained in:
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
||||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 1,26,20,0
|
||||
PRODUCTVERSION 1,26,20,0
|
||||
FILEVERSION 1,26,21,0
|
||||
PRODUCTVERSION 1,26,21,0
|
||||
FILEFLAGSMASK 0x17L
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
@@ -46,11 +46,11 @@ BEGIN
|
||||
BEGIN
|
||||
VALUE "CompanyName", "IDRIX"
|
||||
VALUE "FileDescription", "VeraCrypt Format"
|
||||
VALUE "FileVersion", "1.26.20"
|
||||
VALUE "FileVersion", "1.26.21"
|
||||
VALUE "LegalTrademarks", "VeraCrypt"
|
||||
VALUE "OriginalFilename", "VeraCrypt Format.exe"
|
||||
VALUE "ProductName", "VeraCrypt"
|
||||
VALUE "ProductVersion", "1.26.20"
|
||||
VALUE "ProductVersion", "1.26.21"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
||||
@@ -1442,6 +1442,12 @@ 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
|
||||
@@ -5654,6 +5660,8 @@ 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");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user