diff --git a/.gitignore b/.gitignore index 96b79d0ed6..e0691294fb 100644 --- a/.gitignore +++ b/.gitignore @@ -107,6 +107,9 @@ tests/test_common.h # the cmake/ folder cmake/libcoap +# the scripts/ folder +scripts/fix_version.sh + # ctags - Sublime plugin tags .tags* diff --git a/ChangeLog b/ChangeLog index fda3976cde..8ed4063c70 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,8 +5,10 @@ * Support for wolfSSL TLS library. * Support for DTLS1.3 (using wolfSSL). * Support for Mbed TLS 3.6.0. + * Support for EC-JPAKE (Mbed TLS) * TinyDTLS version update. * Support for RIOT using SOCK i/f. + * Support for LwIP 2.2.0. * Support for LwIP using NO_SYS set to 0. * Support for (Posix based) Zephyr. * Support for QNX builds. @@ -14,9 +16,13 @@ * Updated Contiki-NG support. * Support for multi-thread safe libcoap usage. * Support for defining binary PSK for coap-client and coap-server. + * Support for Connection-ID (CID) (Mbed TLS, wolfSSL and TinyDTLS). * Added new define types for defining PKI parameters. * Support for user definable ENGINE for OpenSSL. * Support for using noTLS and TinyDTLS with WebSockets. + * Support for providing list of compilation #defines. + * Support for proxy code running within lbcoap. + * Cleaned up support for building .h files. * Additional scan-build and pre-commit checks in build tests. * Updated CI build tests to use latest action versions. * Fixes CVE-2023-35862. diff --git a/coap_config.h.contiki b/coap_config.h.contiki index 44d1d500a8..a6b1143022 100644 --- a/coap_config.h.contiki +++ b/coap_config.h.contiki @@ -110,7 +110,7 @@ #ifndef PACKAGE_STRING /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "libcoap 4.3.5rc2" +#define PACKAGE_STRING "libcoap 4.3.5rc3" #endif /* PACKAGE_STRING */ #ifndef PACKAGE_TARNAME @@ -125,7 +125,7 @@ #ifndef PACKAGE_VERSION /* Define to the version of this package. */ -#define PACKAGE_VERSION "4.3.5rc2" +#define PACKAGE_VERSION "4.3.5rc3" #endif /* PACKAGE_VERSION */ #define WITH_CONTIKI 1 diff --git a/coap_config.h.riot b/coap_config.h.riot index eda295ecae..de25c6986d 100644 --- a/coap_config.h.riot +++ b/coap_config.h.riot @@ -367,7 +367,7 @@ #ifndef PACKAGE_STRING /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "libcoap 4.3.5rc2" +#define PACKAGE_STRING "libcoap 4.3.5rc3" #endif /* PACKAGE_STRING */ #ifndef PACKAGE_TARNAME @@ -382,7 +382,7 @@ #ifndef PACKAGE_VERSION /* Define to the version of this package. */ -#define PACKAGE_VERSION "4.3.5rc2" +#define PACKAGE_VERSION "4.3.5rc3" #endif /* PACKAGE_VERSION */ /* Define to 1 if you have the ANSI C header files. */ diff --git a/coap_config.h.windows b/coap_config.h.windows index 4f843f08e7..7d4904a63f 100644 --- a/coap_config.h.windows +++ b/coap_config.h.windows @@ -167,7 +167,7 @@ #ifndef PACKAGE_STRING /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "libcoap 4.3.5rc2" +#define PACKAGE_STRING "libcoap 4.3.5rc3" #endif /* PACKAGE_STRING */ #ifndef PACKAGE_TARNAME @@ -182,7 +182,7 @@ #ifndef PACKAGE_VERSION /* Define to the version of this package. */ -#define PACKAGE_VERSION "4.3.5rc2" +#define PACKAGE_VERSION "4.3.5rc3" #endif /* PACKAGE_VERSION */ /* Define to 1 if you have the ANSI C header files. */ diff --git a/configure.ac b/configure.ac index e2c54d80ce..203e9e3b6d 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ m4_define([libcoap_micro_version], [5]) # define an appending release state if needed, for example for pre-releases # like 'alpha' or 'rc1', for a full release keep the value empty! -m4_define([libcoap_release_state], [rc2]) +m4_define([libcoap_release_state], [rc3]) # Define the previous full libcoap software release version here. # Used if libcoap_release_state is not empty for LIBCOAP_VERSION and LIBCOAP_PACKAGE_BASE. diff --git a/examples/lwip/config/coap_config.h b/examples/lwip/config/coap_config.h index 3e15e4e2f9..d522b590c9 100644 --- a/examples/lwip/config/coap_config.h +++ b/examples/lwip/config/coap_config.h @@ -82,7 +82,7 @@ #ifndef PACKAGE_STRING /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "libcoap 4.3.5rc2" +#define PACKAGE_STRING "libcoap 4.3.5rc3" #endif /* PACKAGE_STRING */ #ifndef PACKAGE_TARNAME @@ -97,7 +97,7 @@ #ifndef PACKAGE_VERSION /* Define to the version of this package. */ -#define PACKAGE_VERSION "4.3.5rc2" +#define PACKAGE_VERSION "4.3.5rc3" #endif /* PACKAGE_VERSION */ #ifndef assert diff --git a/examples/riot/pkg_libcoap/Makefile b/examples/riot/pkg_libcoap/Makefile index 4c46505dcb..a2a3d86b26 100644 --- a/examples/riot/pkg_libcoap/Makefile +++ b/examples/riot/pkg_libcoap/Makefile @@ -1,6 +1,6 @@ PKG_NAME=libcoap PKG_URL=https://github.com/obgm/libcoap -PKG_VERSION=319ffb02c11c5010b26934ba55f50a25ac3b6051 +PKG_VERSION=82b721d7d28c40a2c9f0ba4310a5017d216f0ec3 PKG_LICENSE=BSD-2-Clause LIBCOAP_BUILD_DIR=$(BINDIR)/pkg/$(PKG_NAME) diff --git a/include/coap3/coap.h.riot b/include/coap3/coap.h.riot index c80905e510..4e79591088 100644 --- a/include/coap3/coap.h.riot +++ b/include/coap3/coap.h.riot @@ -25,13 +25,13 @@ #define LIBCOAP_PACKAGE_NAME "libcoap" /* Define the full name and version of libcoap. */ -#define LIBCOAP_PACKAGE_STRING "libcoap 4.3.5rc2" +#define LIBCOAP_PACKAGE_STRING "libcoap 4.3.5rc3" /* Define the home page for libcoap. */ #define LIBCOAP_PACKAGE_URL "https://libcoap.net/" /* Define the version of libcoap this file belongs to. */ -#define LIBCOAP_PACKAGE_VERSION "4.3.5rc2" +#define LIBCOAP_PACKAGE_VERSION "4.3.5rc3" /* Define the numeric version identifier for libcoap */ #define LIBCOAP_VERSION (4003004U) diff --git a/include/coap3/coap.h.windows b/include/coap3/coap.h.windows index a028a44f53..0466aea6d8 100644 --- a/include/coap3/coap.h.windows +++ b/include/coap3/coap.h.windows @@ -25,13 +25,13 @@ #define LIBCOAP_PACKAGE_NAME "libcoap" /* Define the full name and version of libcoap. */ -#define LIBCOAP_PACKAGE_STRING "libcoap 4.3.5rc2" +#define LIBCOAP_PACKAGE_STRING "libcoap 4.3.5rc3" /* Define the home page for libcoap. */ #define LIBCOAP_PACKAGE_URL "https://libcoap.net/" /* Define the version of libcoap this file belongs to. */ -#define LIBCOAP_PACKAGE_VERSION "4.3.5rc2" +#define LIBCOAP_PACKAGE_VERSION "4.3.5rc3" /* Define the numeric version identifier for libcoap */ #define LIBCOAP_VERSION (4003004U)