diff options
Diffstat (limited to 'src/Common/Crypto.c')
| -rw-r--r-- | src/Common/Crypto.c | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/src/Common/Crypto.c b/src/Common/Crypto.c index da233090..10c97e98 100644 --- a/src/Common/Crypto.c +++ b/src/Common/Crypto.c @@ -66,5 +66,2 @@ static Cipher Ciphers[] = { CAMELLIA, L"Camellia", 16, 32, CAMELLIA_KS }, -#if defined(CIPHER_GOST89) - { GOST89, L"GOST89", 16, 32, GOST_KS }, -#endif // defined(CIPHER_GOST89) { KUZNYECHIK, L"Kuznyechik",16, 32, KUZNYECHIK_KS }, @@ -87,5 +84,2 @@ static EncryptionAlgorithm EncryptionAlgorithms[] = { { CAMELLIA, 0 }, { XTS, 0 }, 1, 1 }, -#if defined(CIPHER_GOST89) - { { GOST89, 0 }, { XTS, 0 }, 0, 0 }, -#endif // defined(CIPHER_GOST89) { { KUZNYECHIK, 0 }, { XTS, 0 }, 0, 1 }, @@ -128,4 +122,4 @@ static Hash Hashes[] = { WHIRLPOOL, L"Whirlpool", FALSE, FALSE }, + { BLAKE2S, L"BLAKE2s-256", FALSE, TRUE }, { SHA256, L"SHA-256", FALSE, TRUE }, - { RIPEMD160, L"RIPEMD-160", TRUE, TRUE }, { STREEBOG, L"Streebog", FALSE, FALSE }, @@ -170,7 +164,2 @@ int CipherInit (int cipher, unsigned char *key, unsigned __int8 *ks) #if !defined(TC_WINDOWS_BOOT) -#if defined(CIPHER_GOST89) - case GOST89: - gost_set_key(key, (gost_kds*)ks, 1); - break; -#endif // && defined(CIPHER_GOST89) case KUZNYECHIK: @@ -208,5 +197,2 @@ void EncipherBlock(int cipher, void *data, void *ks) #if !defined(TC_WINDOWS_BOOT) -#if defined(CIPHER_GOST89) - case GOST89: gost_encrypt(data, data, ks, 1); break; -#endif // defined(CIPHER_GOST89) case KUZNYECHIK: kuznyechik_encrypt_block(data, data, ks); break; @@ -283,5 +269,2 @@ void EncipherBlocks (int cipher, void *dataPtr, void *ks, size_t blockCount) #endif - else if (cipher == GOST89) { - gost_encrypt(data, data, ks, (int)blockCount); - } else @@ -309,5 +292,2 @@ void DecipherBlock(int cipher, void *data, void *ks) #if !defined(TC_WINDOWS_BOOT) -#if defined(CIPHER_GOST89) - case GOST89: gost_decrypt(data, data, ks, 1); break; -#endif // defined(CIPHER_GOST89) case KUZNYECHIK: kuznyechik_decrypt_block(data, data, ks); break; @@ -400,5 +380,2 @@ void DecipherBlocks (int cipher, void *dataPtr, void *ks, size_t blockCount) #endif - else if (cipher == GOST89) { - gost_decrypt(data, data, ks, (int)blockCount); - } else @@ -468,3 +445,2 @@ BOOL CipherSupportsIntraDataUnitParallelization (int cipher) return (cipher == AES && IsAesHwCpuSupported()) - || (cipher == GOST89) #if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE && !defined (_UEFI) |