commit 9ee0e1f6fed0efb123bd75aefe7ced9f24484cd7
author Dave Rodgman <dave.rodgman@arm.com> Mon Jul 31 12:33:36 2023 +0100
committer Dave Rodgman <dave.rodgman@arm.com> Mon Jul 31 12:43:23 2023 +0100
tree baf6883038a5305df364a865da89fee007f6e3bc
parent 0172de8b3da60f7cb78fb5b701d216119630303b

Remove GCC redundant-decls workaround for mbedtls_ct_memcmp

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

include/mbedtls/constant_time.h

diff --git a/include/mbedtls/constant_time.h b/include/mbedtls/constant_time.h
index 2d33adc..01d5d9d 100644
--- a/include/mbedtls/constant_time.h
+++ b/include/mbedtls/constant_time.h
@@ -23,11 +23,6 @@
 
 #include <stddef.h>
 
-#ifdef __GNUC__
-    #pragma GCC diagnostic push
-    #pragma GCC diagnostic ignored "-Wredundant-decls"
-#endif
-
 /** Constant-time buffer comparison without branches.
  *
  * This is equivalent to the standard memcmp function, but is likely to be
@@ -47,8 +42,4 @@
                       const void *b,
                       size_t n);
 
-#ifdef __GNUC__
-    #pragma GCC diagnostic pop
-#endif
-
 #endif /* MBEDTLS_CONSTANT_TIME_H */

library/constant_time_internal.h

diff --git a/library/constant_time_internal.h b/library/constant_time_internal.h
index 5879e47..1411e14 100644
--- a/library/constant_time_internal.h
+++ b/library/constant_time_internal.h
@@ -476,10 +476,12 @@
                               size_t offset_max,
                               size_t len);
 
-/* Documented in include/mbedtls/constant_time.h. a and b are secret. */
-int mbedtls_ct_memcmp(const void *a,
-                      const void *b,
-                      size_t n);
+/* Documented in include/mbedtls/constant_time.h. a and b are secret.
+
+   int mbedtls_ct_memcmp(const void *a,
+                         const void *b,
+                         size_t n);
+ */
 
 #ifdef __GNUC__
     #pragma GCC diagnostic pop