Skip to content

Commit 7b8d594

Browse files
philljjphilljj
authored
Merge pull request #423 from embhorn/relprep_1_20_0
Relprep 1 20 0
2 parents ff2f1a0 + fc425be commit 7b8d594

7 files changed

Lines changed: 96 additions & 48 deletions

File tree

‎.github/workflows/sec-websocket-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343

4444
- name: Download libwebsockets
4545
run: |
46-
git clone https://libwebsockets.org/repo/libwebsockets
46+
git clone https://github.com/warmcat/libwebsockets
4747
4848
- name: Build libwebsockets with wolfSSL
4949
run: |

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# CMakeList.txt
22
#
3-
# Copyright (C) 2006-2024 wolfSSL Inc.
3+
# Copyright (C) 2006-2025 wolfSSL Inc.
44
#
55
# This file is part of wolfSSL. (formerly known as CyaSSL)
66
#
@@ -21,7 +21,7 @@
2121

2222
cmake_minimum_required(VERSION 3.16)
2323

24-
project(wolfMQTT VERSION 1.19.2 LANGUAGES C)
24+
project(wolfMQTT VERSION 1.20.0 LANGUAGES C)
2525
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
2626

2727
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/functions.cmake)

‎ChangeLog.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
## Release Notes
22

3+
### v1.20.0 (05/02/2025)
4+
Release 1.20.0 has been developed according to wolfSSL's development and QA
5+
process (see link below) and successfully passed the quality criteria.
6+
https://www.wolfssl.com/about/wolfssl-software-development-process-quality-assurance
7+
8+
* OQS's Mosquitto is out of date. by @anhu in #417
9+
* Add support for websocket by @embhorn in #418
10+
* Add support for secure websockets by @embhorn in #419
11+
* Add secure ws CI test by @embhorn in #421
12+
* Update examples for latest Managed Components by @gojimmypi in #420
13+
* Improve cmake duplicate component check by @gojimmypi in #422
14+
315
### v1.19.2 (01/31/2025)
416
Release 1.19.2 has been developed according to wolfSSL's development and QA
517
process (see link below) and successfully passed the quality criteria.

‎configure.ac‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# wolfmqtt
2-
# Copyright (C) 2024 wolfSSL Inc.
2+
# Copyright (C) 2025 wolfSSL Inc.
33
# All right reserved.
44

5-
AC_COPYRIGHT([Copyright (C) 2014-2024 wolfSSL Inc.])
6-
AC_INIT([wolfmqtt],[1.19.2],[https://github.com/wolfssl/wolfMQTT/issues],[wolfmqtt],[http://www.wolfssl.com])
5+
AC_COPYRIGHT([Copyright (C) 2014-2025 wolfSSL Inc.])
6+
AC_INIT([wolfmqtt],[1.20.0],[https://github.com/wolfssl/wolfMQTT/issues],[wolfmqtt],[http://www.wolfssl.com])
77

88
AC_PREREQ([2.63])
99
AC_CONFIG_AUX_DIR([build-aux])
@@ -27,7 +27,7 @@ AC_ARG_PROGRAM
2727
AC_CONFIG_MACRO_DIR([m4])
2828
AC_CONFIG_HEADERS([src/config.h])
2929

30-
WOLFMQTT_LIBRARY_VERSION=17:3:0
30+
WOLFMQTT_LIBRARY_VERSION=18:0:0
3131
# | | |
3232
# +------+ | +---+
3333
# | | |

‎src/mqtt_packet.c‎

Lines changed: 72 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ int MqttEncode_Connect(byte *tx_buf, int tx_buf_len, MqttConnect *mc_connect)
666666
{
667667
int header_len, remain_len;
668668
#ifdef WOLFMQTT_V5
669-
word32 props_len = 0, lwt_props_len = 0;
669+
int props_len = 0, lwt_props_len = 0;
670670
#endif
671671
MqttConnectPacket packet = MQTT_CONNECT_INIT;
672672
byte *tx_payload;
@@ -683,11 +683,16 @@ int MqttEncode_Connect(byte *tx_buf, int tx_buf_len, MqttConnect *mc_connect)
683683
#ifdef WOLFMQTT_V5
684684
if (mc_connect->protocol_level >= MQTT_CONNECT_PROTOCOL_LEVEL_5) {
685685
/* Determine length of properties */
686-
remain_len += props_len = MqttEncode_Props(MQTT_PACKET_TYPE_CONNECT,
686+
props_len = MqttEncode_Props(MQTT_PACKET_TYPE_CONNECT,
687687
mc_connect->props, NULL);
688+
if (props_len >= 0) {
689+
remain_len += props_len;
688690

689-
/* Determine the length of the "property length" */
690-
remain_len += MqttEncode_Vbi(NULL, props_len);
691+
/* Determine the length of the "property length" */
692+
remain_len += MqttEncode_Vbi(NULL, props_len);
693+
}
694+
else
695+
return MQTT_TRACE_ERROR(MQTT_CODE_ERROR_PROPERTY);
691696
}
692697
#endif
693698

@@ -709,11 +714,16 @@ int MqttEncode_Connect(byte *tx_buf, int tx_buf_len, MqttConnect *mc_connect)
709714
#ifdef WOLFMQTT_V5
710715
if (mc_connect->protocol_level >= MQTT_CONNECT_PROTOCOL_LEVEL_5) {
711716
/* Determine length of properties */
712-
remain_len += lwt_props_len = MqttEncode_Props(MQTT_PACKET_TYPE_CONNECT,
717+
lwt_props_len = MqttEncode_Props(MQTT_PACKET_TYPE_CONNECT,
713718
mc_connect->lwt_msg->props, NULL);
719+
if (lwt_props_len >= 0) {
720+
remain_len += lwt_props_len;
714721

715-
/* Determine the length of the "lwt property length" */
716-
remain_len += MqttEncode_Vbi(NULL, lwt_props_len);
722+
/* Determine the length of the "lwt property length" */
723+
remain_len += MqttEncode_Vbi(NULL, lwt_props_len);
724+
}
725+
else
726+
return MQTT_TRACE_ERROR(MQTT_CODE_ERROR_PROPERTY);
717727
}
718728
#endif
719729
}
@@ -872,7 +882,7 @@ int MqttEncode_Publish(byte *tx_buf, int tx_buf_len, MqttPublish *publish,
872882
int header_len, variable_len, payload_len = 0;
873883
byte *tx_payload;
874884
#ifdef WOLFMQTT_V5
875-
word32 props_len = 0;
885+
int props_len = 0;
876886
#endif
877887

878888
/* Validate required arguments */
@@ -892,11 +902,16 @@ int MqttEncode_Publish(byte *tx_buf, int tx_buf_len, MqttPublish *publish,
892902
#ifdef WOLFMQTT_V5
893903
if (publish->protocol_level >= MQTT_CONNECT_PROTOCOL_LEVEL_5) {
894904
/* Determine length of properties */
895-
variable_len += props_len = MqttEncode_Props(MQTT_PACKET_TYPE_PUBLISH,
905+
props_len = MqttEncode_Props(MQTT_PACKET_TYPE_PUBLISH,
896906
publish->props, NULL);
907+
if (props_len >= 0) {
908+
variable_len += props_len;
897909

898-
/* Determine the length of the "property length" */
899-
variable_len += MqttEncode_Vbi(NULL, props_len);
910+
/* Determine the length of the "property length" */
911+
variable_len += MqttEncode_Vbi(NULL, props_len);
912+
}
913+
else
914+
return MQTT_TRACE_ERROR(MQTT_CODE_ERROR_PROPERTY);
900915
}
901916
#endif
902917

@@ -1073,7 +1088,7 @@ int MqttEncode_PublishResp(byte* tx_buf, int tx_buf_len, byte type,
10731088
byte *tx_payload;
10741089
MqttQoS qos;
10751090
#ifdef WOLFMQTT_V5
1076-
word32 props_len = 0;
1091+
int props_len = 0;
10771092
#endif
10781093

10791094
/* Validate required arguments */
@@ -1093,11 +1108,15 @@ int MqttEncode_PublishResp(byte* tx_buf, int tx_buf_len, byte type,
10931108
}
10941109
if (publish_resp->props != NULL) {
10951110
/* Determine length of properties */
1096-
remain_len += props_len = MqttEncode_Props((MqttPacketType)type,
1111+
props_len = MqttEncode_Props((MqttPacketType)type,
10971112
publish_resp->props, NULL);
1098-
1099-
/* Determine the length of the "property length" */
1100-
remain_len += MqttEncode_Vbi(NULL, props_len);
1113+
if (props_len >= 0) {
1114+
remain_len += props_len;
1115+
/* Determine the length of the "property length" */
1116+
remain_len += MqttEncode_Vbi(NULL, props_len);
1117+
}
1118+
else
1119+
return MQTT_TRACE_ERROR(MQTT_CODE_ERROR_PROPERTY);
11011120
}
11021121
}
11031122
#endif
@@ -1225,7 +1244,7 @@ int MqttEncode_Subscribe(byte *tx_buf, int tx_buf_len,
12251244
byte *tx_payload;
12261245
MqttTopic *topic;
12271246
#ifdef WOLFMQTT_V5
1228-
word32 props_len = 0;
1247+
int props_len = 0;
12291248
#endif
12301249

12311250
/* Validate required arguments */
@@ -1249,11 +1268,16 @@ int MqttEncode_Subscribe(byte *tx_buf, int tx_buf_len,
12491268
#ifdef WOLFMQTT_V5
12501269
if (subscribe->protocol_level >= MQTT_CONNECT_PROTOCOL_LEVEL_5) {
12511270
/* Determine length of properties */
1252-
remain_len += props_len = MqttEncode_Props(MQTT_PACKET_TYPE_SUBSCRIBE,
1271+
props_len = MqttEncode_Props(MQTT_PACKET_TYPE_SUBSCRIBE,
12531272
subscribe->props, NULL);
1273+
if (props_len >= 0) {
1274+
remain_len += props_len;
12541275

1255-
/* Determine the length of the "property length" */
1256-
remain_len += MqttEncode_Vbi(NULL, props_len);
1276+
/* Determine the length of the "property length" */
1277+
remain_len += MqttEncode_Vbi(NULL, props_len);
1278+
}
1279+
else
1280+
return MQTT_TRACE_ERROR(MQTT_CODE_ERROR_PROPERTY);
12571281
}
12581282
#endif
12591283

@@ -1374,7 +1398,7 @@ int MqttEncode_Unsubscribe(byte *tx_buf, int tx_buf_len,
13741398
byte *tx_payload;
13751399
MqttTopic *topic;
13761400
#ifdef WOLFMQTT_V5
1377-
word32 props_len = 0;
1401+
int props_len = 0;
13781402
#endif
13791403

13801404
/* Validate required arguments */
@@ -1398,11 +1422,15 @@ int MqttEncode_Unsubscribe(byte *tx_buf, int tx_buf_len,
13981422
#ifdef WOLFMQTT_V5
13991423
if (unsubscribe->protocol_level >= MQTT_CONNECT_PROTOCOL_LEVEL_5) {
14001424
/* Determine length of properties */
1401-
remain_len += props_len = MqttEncode_Props(MQTT_PACKET_TYPE_UNSUBSCRIBE,
1402-
unsubscribe->props, NULL);
1403-
1404-
/* Determine the length of the "property length" */
1405-
remain_len += MqttEncode_Vbi(NULL, props_len);
1425+
props_len = MqttEncode_Props(MQTT_PACKET_TYPE_UNSUBSCRIBE,
1426+
unsubscribe->props, NULL);
1427+
if (props_len >= 0) {
1428+
remain_len += props_len;
1429+
/* Determine the length of the "property length" */
1430+
remain_len += MqttEncode_Vbi(NULL, props_len);
1431+
}
1432+
else
1433+
return MQTT_TRACE_ERROR(MQTT_CODE_ERROR_PROPERTY);
14061434
}
14071435
#endif
14081436

@@ -1563,7 +1591,7 @@ int MqttEncode_Disconnect(byte *tx_buf, int tx_buf_len,
15631591
int header_len;
15641592
int remain_len = 0;
15651593
#ifdef WOLFMQTT_V5
1566-
word32 props_len = 0;
1594+
int props_len = 0;
15671595
#endif
15681596

15691597
/* Validate required arguments */
@@ -1577,12 +1605,15 @@ int MqttEncode_Disconnect(byte *tx_buf, int tx_buf_len,
15771605

15781606
if (disconnect->props != NULL) {
15791607
/* Determine length of properties */
1580-
remain_len += props_len = MqttEncode_Props(
1581-
MQTT_PACKET_TYPE_DISCONNECT,
1608+
props_len = MqttEncode_Props(MQTT_PACKET_TYPE_DISCONNECT,
15821609
disconnect->props, NULL);
1583-
1584-
/* Determine the length of the "property length" */
1585-
remain_len += MqttEncode_Vbi(NULL, props_len);
1610+
if (props_len >= 0) {
1611+
remain_len += props_len;
1612+
/* Determine the length of the "property length" */
1613+
remain_len += MqttEncode_Vbi(NULL, props_len);
1614+
}
1615+
else
1616+
return MQTT_TRACE_ERROR(MQTT_CODE_ERROR_PROPERTY);
15861617
}
15871618
if ((remain_len != 0) ||
15881619
(disconnect->reason_code != MQTT_REASON_SUCCESS)) {
@@ -1695,7 +1726,7 @@ int MqttEncode_Auth(byte *tx_buf, int tx_buf_len, MqttAuth *auth)
16951726
{
16961727
int header_len, remain_len = 0;
16971728
byte* tx_payload;
1698-
word32 props_len = 0;
1729+
int props_len = 0;
16991730

17001731
/* Validate required arguments */
17011732
if ((tx_buf == NULL) || (tx_buf_len <= 0) || (auth == NULL)) {
@@ -1706,11 +1737,15 @@ int MqttEncode_Auth(byte *tx_buf, int tx_buf_len, MqttAuth *auth)
17061737
remain_len++;
17071738

17081739
/* Determine length of properties */
1709-
remain_len += props_len = MqttEncode_Props(MQTT_PACKET_TYPE_AUTH,
1740+
props_len = MqttEncode_Props(MQTT_PACKET_TYPE_AUTH,
17101741
auth->props, NULL);
1711-
1712-
/* Determine the length of the "property length" */
1713-
remain_len += MqttEncode_Vbi(NULL, props_len);
1742+
if (props_len >= 0) {
1743+
remain_len += props_len;
1744+
/* Determine the length of the "property length" */
1745+
remain_len += MqttEncode_Vbi(NULL, props_len);
1746+
}
1747+
else
1748+
return MQTT_TRACE_ERROR(MQTT_CODE_ERROR_PROPERTY);
17141749

17151750
/* Encode fixed header */
17161751
header_len = MqttEncode_FixedHeader(tx_buf, tx_buf_len, remain_len,

‎src/mqtt_sn_packet.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,8 @@ int SN_Decode_GWInfo(byte *rx_buf, int rx_buf_len, SN_GwInfo *gw_info)
281281
/* Packet Type Encoders/Decoders */
282282
int SN_Encode_Connect(byte *tx_buf, int tx_buf_len, SN_Connect *mc_connect)
283283
{
284-
word16 total_len, id_len;
284+
word16 total_len;
285+
size_t id_len;
285286
byte flags = 0;
286287
byte *tx_payload = tx_buf;
287288

@@ -295,7 +296,7 @@ int SN_Encode_Connect(byte *tx_buf, int tx_buf_len, SN_Connect *mc_connect)
295296
total_len = 6; /* Len + Message Type + Flags + ProtocolID + Duration(2) */
296297

297298
/* Client ID size */
298-
id_len = (word16)XSTRLEN(mc_connect->client_id);
299+
id_len = XSTRLEN(mc_connect->client_id);
299300
id_len = (id_len <= SN_CLIENTID_MAX_LEN) ? id_len : SN_CLIENTID_MAX_LEN;
300301

301302
total_len += id_len;

‎wolfmqtt/version.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
extern "C" {
3535
#endif
3636

37-
#define LIBWOLFMQTT_VERSION_STRING "1.19.2"
38-
#define LIBWOLFMQTT_VERSION_HEX 0x01019002
37+
#define LIBWOLFMQTT_VERSION_STRING "1.20.0"
38+
#define LIBWOLFMQTT_VERSION_HEX 0x01020000
3939

4040
#ifdef __cplusplus
4141
}

0 commit comments

Comments
 (0)