Merge pull request #10477 from Cube707/fix/iar-compiler-warning

valeriosetti · web-flow · commit 525dd917dc1b · 2025-10-31T12:33:26.000Z
add cast to fix IAR compiler errors
diff --git a/ChangeLog.d/iar-6.5fs.txt 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
@@ -1315,14 +1315,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

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+Changes`
	`2`	`+ * Add casts to some Enums to remove compiler errors thrown by IAR 6.5.`
	`3`	`+ Removes Warning "mixed ENUM with other type".`
Original file line number	Diff line number	Diff line change
`@@ -1315,14 +1315,14 @@ static inline void mbedtls_ssl_handshake_set_state(mbedtls_ssl_context *ssl,`
`1315`	`1315`	`mbedtls_ssl_states state)`
`1316`	`1316`	`{`
`1317`	`1317`	`MBEDTLS_SSL_DEBUG_MSG(3, ("handshake state: %d (%s) -> %d (%s)",`
`1318`		`- ssl->state, mbedtls_ssl_states_str(ssl->state),`
	`1318`	`+ ssl->state, mbedtls_ssl_states_str((mbedtls_ssl_states) ssl->state),`
`1319`	`1319`	`(int) state, mbedtls_ssl_states_str(state)));`
`1320`	`1320`	`ssl->state = (int) state;`
`1321`	`1321`	`}`
`1322`	`1322`
`1323`	`1323`	`static inline void mbedtls_ssl_handshake_increment_state(mbedtls_ssl_context *ssl)`
`1324`	`1324`	`{`
`1325`		`- mbedtls_ssl_handshake_set_state(ssl, ssl->state + 1);`
	`1325`	`+ mbedtls_ssl_handshake_set_state(ssl, (mbedtls_ssl_states) (ssl->state + 1));`
`1326`	`1326`	`}`
`1327`	`1327`
`1328`	`1328`	`MBEDTLS_CHECK_RETURN_CRITICAL`