From e4502ddd24c376c45d9b4df3d25555728c43b2a6 Mon Sep 17 00:00:00 2001 From: Zhi Guan Date: Thu, 11 Apr 2024 18:02:46 +0800 Subject: [PATCH] XTS use new GF(2^128) API --- src/sm4_xts.c | 16 ++++++++-------- tools/sm4.c | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/sm4_xts.c b/src/sm4_xts.c index 3d9a6a978..7795bfe1c 100644 --- a/src/sm4_xts.c +++ b/src/sm4_xts.c @@ -36,8 +36,8 @@ int sm4_xts_encrypt(const SM4_KEY *key1, const SM4_KEY *key2, const uint8_t twea sm4_encrypt(key1, block, block); gmssl_memxor(out, block, T, 16); - a = gf128_from_bytes(T); - a = gf128_mul2(a); + gf128_from_bytes(a, T); + gf128_mul_by_2(a, a); gf128_to_bytes(a, T); in += 16; @@ -55,8 +55,8 @@ int sm4_xts_encrypt(const SM4_KEY *key1, const SM4_KEY *key2, const uint8_t twea sm4_encrypt(key1, block, block); gmssl_memxor(block, block, T, 16); - a = gf128_from_bytes(T); - a = gf128_mul2(a); + gf128_from_bytes(a, T); + gf128_mul_by_2(a, a); gf128_to_bytes(a, T); in += 16; @@ -95,8 +95,8 @@ int sm4_xts_decrypt(const SM4_KEY *key1, const SM4_KEY *key2, const uint8_t twea sm4_decrypt(key1, block, block); gmssl_memxor(out, block, T, 16); - a = gf128_from_bytes(T); - a = gf128_mul2(a); + gf128_from_bytes(a, T); + gf128_mul_by_2(a, a); gf128_to_bytes(a, T); in += 16; @@ -112,8 +112,8 @@ int sm4_xts_decrypt(const SM4_KEY *key1, const SM4_KEY *key2, const uint8_t twea } else { uint8_t T1[16]; - a = gf128_from_bytes(T); - a = gf128_mul2(a); + gf128_from_bytes(a, T); + gf128_mul_by_2(a, a); gf128_to_bytes(a, T1); gmssl_memxor(block, in, T1, 16); diff --git a/tools/sm4.c b/tools/sm4.c index 6f1cdd233..c6bd84703 100755 --- a/tools/sm4.c +++ b/tools/sm4.c @@ -559,8 +559,8 @@ int sm4_main(int argc, char **argv) goto end; } -#ifdef ENABLE_SM4_XTS - if (mode == SM4_MODE_XTS) { +#ifdef ENABLE_SM4_CCM + if (mode == SM4_MODE_CCM) { if (sm4_ccm_crypt(key, keylen, iv, ivlen, aad, aadlen, taglen, infp, outfp, enc, prog) != 1) { goto end; }