From 73d5398f02dc0d7469170945f0636ca29b63fcab Mon Sep 17 00:00:00 2001 From: Jan Spannberger Date: Tue, 28 Oct 2025 15:14:30 +0100 Subject: [PATCH 1/2] add cast to fix IAR compiler errors IAR throws a warning "mixed ENUM with other type" backport of a5384bdf09 Signed-off-by: Jan Spannberger --- ChangeLog.d/iar-6.5fs.txt | 3 +++ library/ssl_misc.h | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 ChangeLog.d/iar-6.5fs.txt diff --git a/ChangeLog.d/iar-6.5fs.txt b/ChangeLog.d/iar-6.5fs.txt new file mode 100644 index 0000000000..63e903b9c3 --- /dev/null +++ b/ChangeLog.d/iar-6.5fs.txt @@ -0,0 +1,3 @@ +Changes + * Add casts to some Enums to remove compiler errors thrown by IAR 6.5. + Removes Warning "mixed ENUM with other type". diff --git a/library/ssl_misc.h b/library/ssl_misc.h index faa1b5ec05..2617d1dd69 100644 --- a/library/ssl_misc.h +++ b/library/ssl_misc.h @@ -1351,14 +1351,14 @@ static inline void mbedtls_ssl_handshake_set_state(mbedtls_ssl_context *ssl, mbedtls_ssl_states state) { MBEDTLS_SSL_DEBUG_MSG(3, ("handshake state: %d (%s) -> %d (%s)", - ssl->state, mbedtls_ssl_states_str(ssl->state), + ssl->state, mbedtls_ssl_states_str((mbedtls_ssl_states)ssl->state), (int) state, mbedtls_ssl_states_str(state))); ssl->state = (int) state; } static inline void mbedtls_ssl_handshake_increment_state(mbedtls_ssl_context *ssl) { - mbedtls_ssl_handshake_set_state(ssl, ssl->state + 1); + mbedtls_ssl_handshake_set_state(ssl, (mbedtls_ssl_states)(ssl->state + 1)); } MBEDTLS_CHECK_RETURN_CRITICAL From 8d59423fe56d097c9726da75a5137a31a1c48b38 Mon Sep 17 00:00:00 2001 From: Jan Wille Date: Wed, 29 Oct 2025 15:49:10 +0100 Subject: [PATCH 2/2] format: apply suggestions (add spaces) Signed-off-by: Jan Wille --- library/ssl_misc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/ssl_misc.h b/library/ssl_misc.h index 2617d1dd69..218a30d408 100644 --- a/library/ssl_misc.h +++ b/library/ssl_misc.h @@ -1351,14 +1351,14 @@ static inline void mbedtls_ssl_handshake_set_state(mbedtls_ssl_context *ssl, mbedtls_ssl_states state) { MBEDTLS_SSL_DEBUG_MSG(3, ("handshake state: %d (%s) -> %d (%s)", - ssl->state, mbedtls_ssl_states_str((mbedtls_ssl_states)ssl->state), + ssl->state, mbedtls_ssl_states_str((mbedtls_ssl_states) ssl->state), (int) state, mbedtls_ssl_states_str(state))); ssl->state = (int) state; } static inline void mbedtls_ssl_handshake_increment_state(mbedtls_ssl_context *ssl) { - mbedtls_ssl_handshake_set_state(ssl, (mbedtls_ssl_states)(ssl->state + 1)); + mbedtls_ssl_handshake_set_state(ssl, (mbedtls_ssl_states) (ssl->state + 1)); } MBEDTLS_CHECK_RETURN_CRITICAL