Merge pull request #475 from embhorn/fenrir_issues

dgarske · web-flow · commit c38cbde77d44 · 2026-03-19T09:03:34.000-07:00
Misc issues
diff --git a/src/mqtt_client.c b/src/mqtt_client.c
@@ -201,9 +201,8 @@ static int MqttClient_CancelMessage(MqttClient *client, MqttObject* msg);
         return 0;
     }
 
-    static UINT semstatus;
     int wm_SemLock(wm_Sem *s) {
-        semstatus = tx_semaphore_get(s, TX_WAIT_FOREVER);
+        UINT semstatus = tx_semaphore_get(s, TX_WAIT_FOREVER);
         if (semstatus != TX_SUCCESS) {
             return MQTT_TRACE_ERROR(MQTT_CODE_ERROR_SYSTEM);
         }
diff --git a/src/mqtt_socket.c b/src/mqtt_socket.c
@@ -466,6 +466,10 @@ int MqttSocket_Connect(MqttClient *client, const char* host, word16 port,
                 goto exit;
             }
             wolfSSL_CTX_set_verify(client->tls.ctx, WOLFSSL_VERIFY_NONE, 0);
+        #ifdef WOLFMQTT_DEBUG_SOCKET
+            PRINTF("Warning: TLS set to VERIFY_NONE. Use MqttClient_SetTlsCb "
+                "to set peer verification in production");
+        #endif
         }
 
     #ifndef NO_DH

Original file line number	Diff line number	Diff line change
`@@ -201,9 +201,8 @@ static int MqttClient_CancelMessage(MqttClient client, MqttObject msg);`
`201`	`201`	`return 0;`
`202`	`202`	`}`
`203`	`203`
`204`		`- static UINT semstatus;`
`205`	`204`	`int wm_SemLock(wm_Sem *s) {`
`206`		`- semstatus = tx_semaphore_get(s, TX_WAIT_FOREVER);`
	`205`	`+ UINT semstatus = tx_semaphore_get(s, TX_WAIT_FOREVER);`
`207`	`206`	`if (semstatus != TX_SUCCESS) {`
`208`	`207`	`return MQTT_TRACE_ERROR(MQTT_CODE_ERROR_SYSTEM);`
`209`	`208`	`}`
Original file line number	Diff line number	Diff line change
`@@ -466,6 +466,10 @@ int MqttSocket_Connect(MqttClient client, const char host, word16 port,`
`466`	`466`	`goto exit;`
`467`	`467`	`}`
`468`	`468`	`wolfSSL_CTX_set_verify(client->tls.ctx, WOLFSSL_VERIFY_NONE, 0);`
	`469`	`+ #ifdef WOLFMQTT_DEBUG_SOCKET`
	`470`	`+ PRINTF("Warning: TLS set to VERIFY_NONE. Use MqttClient_SetTlsCb "`
	`471`	`+ "to set peer verification in production");`
	`472`	`+ #endif`
`469`	`473`	`}`
`470`	`474`
`471`	`475`	`#ifndef NO_DH`