commit 05216335596a21e0986a6c617f989ee2f1c4a0e8
author Valerio Setti <valerio.setti@nordicsemi.no> Mon Oct 16 11:22:21 2023 +0200
committer Valerio Setti <valerio.setti@nordicsemi.no> Mon Oct 16 11:22:21 2023 +0200
tree dd7131703ec5f4a9834db009b8ecbd5dcb3b0190
parent 5f5573fa90bade3f5d505882a486df2c9c7df839

cipher: fix guards in mbedtls_cipher_auth_[encrypt/decrypt]_ext()

Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>

library/cipher.c

diff --git a/library/cipher.c b/library/cipher.c
index 7009c19..c5d82cb 100644
--- a/library/cipher.c
+++ b/library/cipher.c
@@ -1607,7 +1607,7 @@
     }
 #endif /* MBEDTLS_NIST_KW_C */
 
-#if defined(MBEDTLS_CIPHER_HAVE_SOME_AEAD)
+#if defined(MBEDTLS_CIPHER_HAVE_AEAD_LEGACY)
     /* AEAD case: check length before passing on to shared function */
     if (output_len < ilen + tag_len) {
         return MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA;
@@ -1620,7 +1620,7 @@
     return ret;
 #else
     return MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE;
-#endif /* MBEDTLS_CIPHER_HAVE_SOME_AEAD */
+#endif /* MBEDTLS_CIPHER_HAVE_AEAD_LEGACY */
 }
 
 /*
@@ -1658,7 +1658,7 @@
     }
 #endif /* MBEDTLS_NIST_KW_C */
 
-#if defined(MBEDTLS_CIPHER_HAVE_SOME_AEAD)
+#if defined(MBEDTLS_CIPHER_HAVE_AEAD_LEGACY)
     /* AEAD case: check length before passing on to shared function */
     if (ilen < tag_len || output_len < ilen - tag_len) {
         return MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA;
@@ -1669,7 +1669,7 @@
                                        input + ilen - tag_len, tag_len);
 #else
     return MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE;
-#endif /* MBEDTLS_CIPHER_HAVE_SOME_AEAD */
+#endif /* MBEDTLS_CIPHER_HAVE_AEAD_LEGACY */
 }
 #endif /* MBEDTLS_CIPHER_HAVE_AEAD_LEGACY || MBEDTLS_NIST_KW_C */