From 427260663f80661ba9e4f909482f0da7b20d64f1 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Tue, 29 Mar 2022 09:34:44 +0200 Subject: [PATCH] Replacing CFB to CBC AES proc Signed-off-by: Pol Henarejos --- src/hsm/hash_utils.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/hsm/hash_utils.c b/src/hsm/hash_utils.c index 9659174..bd25654 100644 --- a/src/hsm/hash_utils.c +++ b/src/hsm/hash_utils.c @@ -78,26 +78,24 @@ int aes_encrypt(const uint8_t *key, const uint8_t *iv, int key_size, uint8_t *da mbedtls_aes_context aes; mbedtls_aes_init(&aes); uint8_t tmp_iv[IV_SIZE]; - size_t iv_offset = 0; memset(tmp_iv, 0, IV_SIZE); if (iv) memcpy(tmp_iv, iv, IV_SIZE); int r = mbedtls_aes_setkey_enc(&aes, key, key_size); if (r != 0) return HSM_EXEC_ERROR; - return mbedtls_aes_crypt_cfb128(&aes, MBEDTLS_AES_ENCRYPT, len, &iv_offset, tmp_iv, data, data); + return mbedtls_aes_crypt_cbc(&aes, MBEDTLS_AES_ENCRYPT, len, tmp_iv, data, data); } int aes_decrypt(const uint8_t *key, const uint8_t *iv, int key_size, uint8_t *data, int len) { mbedtls_aes_context aes; mbedtls_aes_init(&aes); uint8_t tmp_iv[IV_SIZE]; - size_t iv_offset = 0; memset(tmp_iv, 0, IV_SIZE); if (iv) memcpy(tmp_iv, iv, IV_SIZE); - int r = mbedtls_aes_setkey_enc(&aes, key, key_size); + int r = mbedtls_aes_setkey_dec(&aes, key, key_size); if (r != 0) return HSM_EXEC_ERROR; - return mbedtls_aes_crypt_cfb128(&aes, MBEDTLS_AES_DECRYPT, len, &iv_offset, tmp_iv, data, data); + return mbedtls_aes_crypt_cbc(&aes, MBEDTLS_AES_DECRYPT, len, tmp_iv, data, data); } \ No newline at end of file