mirror of
https://github.com/veracrypt/VeraCrypt.git
synced 2025-11-11 11:08:02 -06:00
Initial support of SM4 cipher for normal volumes
This commit is contained in:
@@ -17,6 +17,7 @@
|
||||
#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"
|
||||
@@ -99,6 +100,7 @@ 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;
|
||||
}
|
||||
@@ -518,6 +520,73 @@ namespace VeraCrypt
|
||||
return false;
|
||||
#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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user