commit bb521fdbc936f5cc29632158dfdc5a7efbd25ba1
author Dave Rodgman <dave.rodgman@arm.com> Sat Jun 24 11:21:25 2023 +0100
committer Dave Rodgman <dave.rodgman@arm.com> Sat Jun 24 12:59:31 2023 +0100
tree 2205f7533488b909a14242476f243025a9933c15
parent 6c6c84212ef94072b47f6ed47a06d9659569f8af

Don't directly access iv_size

Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>

library/cipher.c

diff --git a/library/cipher.c b/library/cipher.c
index 7dc09ee..dfbbbfd 100644
--- a/library/cipher.c
+++ b/library/cipher.c
@@ -375,7 +375,7 @@
     if ((ctx->cipher_info->flags & MBEDTLS_CIPHER_VARIABLE_IV_LEN) != 0) {
         actual_iv_size = iv_len;
     } else {
-        actual_iv_size = ctx->cipher_info->iv_size;
+        actual_iv_size = mbedtls_cipher_info_get_iv_size(ctx->cipher_info);
 
         /* avoid reading past the end of input buffer */
         if (actual_iv_size > iv_len) {
@@ -1363,7 +1363,7 @@
 #if defined(MBEDTLS_CHACHAPOLY_C)
     if (MBEDTLS_CIPHER_CHACHA20_POLY1305 == ctx->cipher_info->type) {
         /* ChachaPoly has fixed length nonce and MAC (tag) */
-        if ((iv_len != ctx->cipher_info->iv_size) ||
+        if ((iv_len != mbedtls_cipher_info_get_iv_size(ctx->cipher_info)) ||
             (tag_len != 16U)) {
             return MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA;
         }
@@ -1459,7 +1459,7 @@
         int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
 
         /* ChachaPoly has fixed length nonce and MAC (tag) */
-        if ((iv_len != ctx->cipher_info->iv_size) ||
+        if ((iv_len != mbedtls_cipher_info_get_iv_size(ctx->cipher_info)) ||
             (tag_len != 16U)) {
             return MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA;
         }