commit cc068ae6312ac7cb788abbbf3b3c3e0a78040840
author Jerry Yu <jerry.h.yu@arm.com> Wed Aug 16 16:07:57 2023 +0800
committer Jerry Yu <jerry.h.yu@arm.com> Wed Aug 16 16:14:01 2023 +0800
tree f5b894a4a6a7d8d5df9a5f32cf68ec78358eefcb
parent e62ff095690ff0f45764f9e19c7973567f59f64f

fix `-Werror=return-type` when runtime detection enabled and plain c disabled

Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>

library/aes.c

diff --git a/library/aes.c b/library/aes.c
index ebacc67..4ea4d22 100644
--- a/library/aes.c
+++ b/library/aes.c
@@ -655,6 +655,13 @@
     }
 #endif
 
+/* When runtime detection enabled and plain C is disabled, compiler
+   reports `-Werror=return-type`. */
+#if defined(MBEDTLS_HAVE_X86) && defined(MBEDTLS_AES_USE_HARDWARE_ONLY) && \
+    defined(MBEDTLS_PADLOCK_C) && defined(MBEDTLS_AESNI_HAVE_CODE)
+    return MBEDTLS_ERR_PLATFORM_FEATURE_UNSUPPORTED;
+#endif
+
 #if !defined(MBEDTLS_AES_USE_HARDWARE_ONLY)
     for (i = 0; i < (keybits >> 5); i++) {
         RK[i] = MBEDTLS_GET_UINT32_LE(key, i << 2);
@@ -1101,6 +1108,13 @@
     }
 #endif
 
+/* When runtime detection enabled and plain C is disabled, compiler
+   reports `-Werror=return-type`. */
+#if defined(MBEDTLS_HAVE_X86) && defined(MBEDTLS_AES_USE_HARDWARE_ONLY) && \
+    defined(MBEDTLS_PADLOCK_C) && defined(MBEDTLS_AESNI_HAVE_CODE)
+    return MBEDTLS_ERR_PLATFORM_FEATURE_UNSUPPORTED;
+#endif
+
 #if !defined(MBEDTLS_AES_USE_HARDWARE_ONLY)
     if (mode == MBEDTLS_AES_ENCRYPT) {
         return mbedtls_internal_aes_encrypt(ctx, input, output);