From 04b03d7712badeaad673019277615c779b398d20 Mon Sep 17 00:00:00 2001
From: Ben Taylor <ben.taylor@linaro.org>
Date: Mon, 14 Jul 2025 09:46:18 +0100
Subject: [PATCH] Replace Werror removal with pragma

Signed-off-by: Ben Taylor <ben.taylor@linaro.org>
---
 CMakeLists.txt                             | 9 +++++++++
 library/ssl_tls12_client.c                 | 1 +
 library/ssl_tls13_generic.c                | 1 +
 library/x509_crt.c                         | 2 ++
 tests/suites/test_suite_x509write.function | 1 +
 5 files changed, 14 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1e3c4910a1..162373182b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -271,6 +271,9 @@ function(set_gnu_base_compile_options target)
     target_compile_options(${target} PRIVATE $<$<CONFIG:Check>:-Os>)
     target_compile_options(${target} PRIVATE $<$<CONFIG:CheckFull>:-Os -Wcast-qual>)
 
+    if(MBEDTLS_FATAL_WARNINGS)
+        target_compile_options(${target} PRIVATE -Werror)
+    endif(MBEDTLS_FATAL_WARNINGS)
 endfunction(set_gnu_base_compile_options)
 
 function(set_clang_base_compile_options target)
@@ -293,6 +296,9 @@ function(set_clang_base_compile_options target)
     set_target_properties(${target} PROPERTIES LINK_FLAGS_TSANDBG "-fsanitize=thread")
     target_compile_options(${target} PRIVATE $<$<CONFIG:Check>:-Os>)
 
+    if(MBEDTLS_FATAL_WARNINGS)
+        target_compile_options(${target} PRIVATE -Werror)
+    endif(MBEDTLS_FATAL_WARNINGS)
 endfunction(set_clang_base_compile_options)
 
 function(set_iar_base_compile_options target)
@@ -300,6 +306,9 @@ function(set_iar_base_compile_options target)
     target_compile_options(${target} PRIVATE $<$<CONFIG:Release>:-Ohz>)
     target_compile_options(${target} PRIVATE $<$<CONFIG:Debug>:--debug -On>)
 
+    if(MBEDTLS_FATAL_WARNINGS)
+        target_compile_options(${target} PRIVATE --warnings_are_errors)
+    endif(MBEDTLS_FATAL_WARNINGS)
 endfunction(set_iar_base_compile_options)
 
 function(set_msvc_base_compile_options target)
diff --git a/library/ssl_tls12_client.c b/library/ssl_tls12_client.c
index 2129da122d..820cab17a8 100644
--- a/library/ssl_tls12_client.c
+++ b/library/ssl_tls12_client.c
@@ -19,6 +19,7 @@
 
 #include "psa_util_internal.h"
 #include "psa/crypto.h"
+#pragma GCC diagnostic warning "-Wenum-conversion"
 #if defined(MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED)
 /* Define a local translating function to save code size by not using too many
  * arguments in each translating place. */
diff --git a/library/ssl_tls13_generic.c b/library/ssl_tls13_generic.c
index 372bf84608..cdf42128f8 100644
--- a/library/ssl_tls13_generic.c
+++ b/library/ssl_tls13_generic.c
@@ -25,6 +25,7 @@
 
 #include "psa/crypto.h"
 #include "psa_util_internal.h"
+#pragma GCC diagnostic warning "-Wenum-conversion"
 
 #if defined(MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_SOME_EPHEMERAL_ENABLED)
 /* Define a local translating function to save code size by not using too many
diff --git a/library/x509_crt.c b/library/x509_crt.c
index 3947eb09aa..b6d95f534e 100644
--- a/library/x509_crt.c
+++ b/library/x509_crt.c
@@ -17,6 +17,8 @@
  *  [SIRO] https://cabforum.org/wp-content/uploads/Chunghwatelecom201503cabforumV4.pdf
  */
 
+#pragma GCC diagnostic warning "-Wenum-conversion"
+
 #include "x509_internal.h"
 
 #if defined(MBEDTLS_X509_CRT_PARSE_C)
diff --git a/tests/suites/test_suite_x509write.function b/tests/suites/test_suite_x509write.function
index e0aad90a04..5e3d470f5a 100644
--- a/tests/suites/test_suite_x509write.function
+++ b/tests/suites/test_suite_x509write.function
@@ -14,6 +14,7 @@
 #include <mbedtls/private/pk_private.h>
 #endif /* MBEDTLS_PK_HAVE_PRIVATE_HEADER */
 #include "mbedtls/psa_util.h"
+#pragma GCC diagnostic warning "-Wenum-conversion"
 
 #if defined(MBEDTLS_USE_PSA_CRYPTO) && \
     defined(MBEDTLS_PEM_WRITE_C) && defined(MBEDTLS_X509_CSR_WRITE_C)