Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 19:08:26 -06:00
Code Activity

Linux: in command line, support hash algorithm names without '-' as on Windows ("sha256", "sha512", "ripemd160")

Browse Source
This commit is contained in:
Mounir IDRASSI
2015-04-24 22:56:42 +02:00
parent bf8e07966b
commit 9ccb8a97af
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Main/CommandLineInterface.cpp
View File

@@ -307,7 +307,9 @@ namespace VeraCrypt
foreach (shared_ptr <Hash> hash, Hash::GetAvailableAlgorithms()) foreach (shared_ptr <Hash> hash, Hash::GetAvailableAlgorithms())
{ {
if (wxString (hash->GetName()).IsSameAs (str, false)) wxString hashName (hash->GetName());
wxString hashAltName (hash->GetAltName());
if (hashName.IsSameAs (str, false) || hashAltName.IsSameAs (str, false))
ArgHash = hash; ArgHash = hash;
} }
@@ -321,7 +323,9 @@ namespace VeraCrypt
foreach (shared_ptr <Hash> hash, Hash::GetAvailableAlgorithms()) foreach (shared_ptr <Hash> hash, Hash::GetAvailableAlgorithms())
{ {
if (wxString (hash->GetName()).IsSameAs (str, false)) wxString hashName (hash->GetName());
wxString hashAltName (hash->GetAltName());
if (hashName.IsSameAs (str, false) || hashAltName.IsSameAs (str, false))
ArgCurrentHash = hash; ArgCurrentHash = hash;
} }
@@ -405,7 +409,9 @@ namespace VeraCrypt
bool bHashFound = false; bool bHashFound = false;
foreach (shared_ptr <Hash> hash, Hash::GetAvailableAlgorithms()) foreach (shared_ptr <Hash> hash, Hash::GetAvailableAlgorithms())
{ {
if (wxString (hash->GetName()).IsSameAs (str, false)) wxString hashName (hash->GetName());
wxString hashAltName (hash->GetAltName());
if (hashName.IsSameAs (str, false) || hashAltName.IsSameAs (str, false))
{ {
bHashFound = true; bHashFound = true;
ArgMountOptions.ProtectionKdf = Pkcs5Kdf::GetAlgorithm (*hash, ArgTrueCryptMode); ArgMountOptions.ProtectionKdf = Pkcs5Kdf::GetAlgorithm (*hash, ArgTrueCryptMode);

5
src/Volume/Hash.h
View File

@@ -27,6 +27,7 @@ namespace VeraCrypt
virtual size_t GetBlockSize () const = 0; virtual size_t GetBlockSize () const = 0;
virtual size_t GetDigestSize () const = 0; virtual size_t GetDigestSize () const = 0;
virtual wstring GetName () const = 0; virtual wstring GetName () const = 0;
virtual wstring GetAltName () const = 0;
virtual shared_ptr <Hash> GetNew () const = 0; virtual shared_ptr <Hash> GetNew () const = 0;
virtual void Init () = 0; virtual void Init () = 0;
bool IsDeprecated () const { return Deprecated; } bool IsDeprecated () const { return Deprecated; }
@@ -54,6 +55,7 @@ namespace VeraCrypt
virtual size_t GetBlockSize () const { return 64; } virtual size_t GetBlockSize () const { return 64; }
virtual size_t GetDigestSize () const { return 160 / 8; } virtual size_t GetDigestSize () const { return 160 / 8; }
virtual wstring GetName () const { return L"RIPEMD-160"; } virtual wstring GetName () const { return L"RIPEMD-160"; }
virtual wstring GetAltName () const { return L"RIPEMD160"; }
virtual shared_ptr <Hash> GetNew () const { return shared_ptr <Hash> (new Ripemd160); } virtual shared_ptr <Hash> GetNew () const { return shared_ptr <Hash> (new Ripemd160); }
virtual void Init (); virtual void Init ();
virtual void ProcessData (const ConstBufferPtr &data); virtual void ProcessData (const ConstBufferPtr &data);
@@ -76,6 +78,7 @@ namespace VeraCrypt
virtual size_t GetBlockSize () const { return 64; } virtual size_t GetBlockSize () const { return 64; }
virtual size_t GetDigestSize () const { return 256 / 8; } virtual size_t GetDigestSize () const { return 256 / 8; }
virtual wstring GetName () const { return L"SHA-256"; } virtual wstring GetName () const { return L"SHA-256"; }
virtual wstring GetAltName () const { return L"SHA256"; }
virtual shared_ptr <Hash> GetNew () const { return shared_ptr <Hash> (new Sha256); } virtual shared_ptr <Hash> GetNew () const { return shared_ptr <Hash> (new Sha256); }
virtual void Init (); virtual void Init ();
virtual void ProcessData (const ConstBufferPtr &data); virtual void ProcessData (const ConstBufferPtr &data);
@@ -98,6 +101,7 @@ namespace VeraCrypt
virtual size_t GetBlockSize () const { return 128; } virtual size_t GetBlockSize () const { return 128; }
virtual size_t GetDigestSize () const { return 512 / 8; } virtual size_t GetDigestSize () const { return 512 / 8; }
virtual wstring GetName () const { return L"SHA-512"; } virtual wstring GetName () const { return L"SHA-512"; }
virtual wstring GetAltName () const { return L"SHA512"; }
virtual shared_ptr <Hash> GetNew () const { return shared_ptr <Hash> (new Sha512); } virtual shared_ptr <Hash> GetNew () const { return shared_ptr <Hash> (new Sha512); }
virtual void Init (); virtual void Init ();
virtual void ProcessData (const ConstBufferPtr &data); virtual void ProcessData (const ConstBufferPtr &data);
@@ -120,6 +124,7 @@ namespace VeraCrypt
virtual size_t GetBlockSize () const { return 64; } virtual size_t GetBlockSize () const { return 64; }
virtual size_t GetDigestSize () const { return 512 / 8; } virtual size_t GetDigestSize () const { return 512 / 8; }
virtual wstring GetName () const { return L"Whirlpool"; } virtual wstring GetName () const { return L"Whirlpool"; }
virtual wstring GetAltName () const { return L"Whirlpool"; }
virtual shared_ptr <Hash> GetNew () const { return shared_ptr <Hash> (new Whirlpool); } virtual shared_ptr <Hash> GetNew () const { return shared_ptr <Hash> (new Whirlpool); }
virtual void Init (); virtual void Init ();
virtual void ProcessData (const ConstBufferPtr &data); virtual void ProcessData (const ConstBufferPtr &data);