diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-09-25 22:37:45 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-10-17 18:40:16 +0200 |
| commit | b65eabe23d5910a26d741439b1f5ea45ba4a0777 (patch) | |
| tree | bd63c2de5b151657d294f1a56040fc4c6db4c893 /src/Crypto | |
| parent | d18ecc1a37b5f83d70b204f0bcb097fb8525314f (diff) | |
| download | VeraCrypt-b65eabe23d5910a26d741439b1f5ea45ba4a0777.tar.gz VeraCrypt-b65eabe23d5910a26d741439b1f5ea45ba4a0777.zip | |
Add test vectors for Kuznyechik and GOST89 (the later is deprecated)
Diffstat (limited to 'src/Crypto')
| -rw-r--r-- | src/Crypto/GostCipher.c | 42 | ||||
| -rw-r--r-- | src/Crypto/GostCipher.h | 2 |
2 files changed, 20 insertions, 24 deletions
diff --git a/src/Crypto/GostCipher.c b/src/Crypto/GostCipher.c index b84fd4ed..4d7e5070 100644 --- a/src/Crypto/GostCipher.c +++ b/src/Crypto/GostCipher.c @@ -69,7 +69,6 @@ void gost_prepare_kds(gost_kds* kds) { } -#ifdef GOST_DYNAMIC_SBOXES static void xor_s_box(byte s_box[8][16], byte *seed) { int i; @@ -85,38 +84,35 @@ static void xor_s_box(byte s_box[8][16], byte *seed) s_box[7][i] ^= (seed[ (i * 4) + 3 ]>>4) & 0xF; } } -#endif -void gost_set_key(const byte *key, gost_kds *ks) +void gost_set_key(const byte *key, gost_kds *ks, int useDynamicSbox) { -#ifdef GOST_DYNAMIC_SBOXES - STREEBOG_CTX sctx; - byte sbox_seed[64]; -#if defined (DEVICE_DRIVER) && !defined (_WIN64) - KFLOATING_SAVE floatingPointState; - NTSTATUS saveStatus = STATUS_SUCCESS; - if (HasSSE2() || HasSSE41()) - saveStatus = KeSaveFloatingPointState (&floatingPointState); -#endif -#endif - memcpy(ks->key, key, GOST_KEYSIZE); memcpy(ks->sbox, S_TC26, sizeof(ks->sbox)); -#ifdef GOST_DYNAMIC_SBOXES - //Generate pseudorandom data based on the key - STREEBOG_init(&sctx); - STREEBOG_add(&sctx, key, 32); - STREEBOG_finalize(&sctx, sbox_seed); - + if (useDynamicSbox) + { + STREEBOG_CTX sctx; + byte sbox_seed[64]; #if defined (DEVICE_DRIVER) && !defined (_WIN64) - if (NT_SUCCESS (saveStatus) && (HasSSE2() || HasSSE41())) - KeRestoreFloatingPointState (&floatingPointState); + KFLOATING_SAVE floatingPointState; + NTSTATUS saveStatus = STATUS_SUCCESS; + if (HasSSE2() || HasSSE41()) + saveStatus = KeSaveFloatingPointState (&floatingPointState); #endif + //Generate pseudorandom data based on the key + STREEBOG_init(&sctx); + STREEBOG_add(&sctx, key, 32); + STREEBOG_finalize(&sctx, sbox_seed); - xor_s_box(ks->sbox, sbox_seed); +#if defined (DEVICE_DRIVER) && !defined (_WIN64) + if (NT_SUCCESS (saveStatus) && (HasSSE2() || HasSSE41())) + KeRestoreFloatingPointState (&floatingPointState); #endif + xor_s_box(ks->sbox, sbox_seed); + } + gost_prepare_kds(ks); } diff --git a/src/Crypto/GostCipher.h b/src/Crypto/GostCipher.h index 40962073..36afb777 100644 --- a/src/Crypto/GostCipher.h +++ b/src/Crypto/GostCipher.h @@ -56,7 +56,7 @@ typedef struct gost_kds void gost_encrypt(const byte *in, byte *out, gost_kds *ks, int count); void gost_decrypt(const byte *in, byte *out, gost_kds *ks, int count); -void gost_set_key(const byte *key, gost_kds *ks); +void gost_set_key(const byte *key, gost_kds *ks, int useDynamicSbox); #else #define GOST_KS (0) |