Skip to content

Commit b564138

Browse files
Merge remote-tracking branch 'upstream/master' into zd19563_4
2 parents d53beb0 + 1d67e55 commit b564138

74 files changed

Lines changed: 2803 additions & 1013 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/docker-Espressif.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ jobs:
1919
# This should be a safe limit for the tests to run.
2020
timeout-minutes: 12
2121
container:
22-
image: espressif/idf:latest
22+
# The latest stable release is v5.5
23+
image: espressif/idf:release-v5.5
24+
# image: espressif/idf:latest # The "latest" has breaking changes for ESP-IDF V6
2325
steps:
2426
- uses: actions/checkout@v4
2527
- name: Initialize Espressif IDE and build examples

.github/workflows/os-check.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ jobs:
6161
'--enable-all CPPFLAGS=-DWOLFSSL_DEBUG_CERTS ',
6262
'--enable-all CFLAGS="-DWOLFSSL_CHECK_MEM_ZERO"',
6363
'--enable-coding=no',
64+
'--enable-dtls --enable-dtls13 --enable-ocspstapling --enable-ocspstapling2
65+
--enable-cert-setup-cb --enable-sessioncerts',
6466
]
6567
name: make check
6668
if: github.repository_owner == 'wolfssl'

IDE/GCC-ARM/Header/user_settings.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ extern unsigned int my_rng_seed_gen(void);
521521
#define USE_WOLF_STRTOK
522522
#define XSTRTOK(s1,d,ptr) wc_strtok((s1),(d),(ptr))
523523

524-
#define XSTRNSTR(s1,s2,n) mystrnstr((s1),(s2),(n))
524+
#define XSTRNSTR(s1,s2,n) wolfSSL_strnstr((s1),(s2),(n))
525525

526526
#define XMEMCPY(d,s,l) memcpy((d),(s),(l))
527527
#define XMEMSET(b,c,l) memset((b),(c),(l))

IDE/STM32Cube/README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ The section for "Hardware platform" may need to be adjusted depending on your pr
100100
* To enable STM32U5 support define `WOLFSSL_STM32U5`.
101101
* To enable STM32H5 support define `WOLFSSL_STM32H5`.
102102
* To enable STM32MP13 support define `WOLFSSL_STM32MP13`.
103+
* To enable STM32N6 support define `WOLFSSL_STM32N6`.
103104

104105
To use the STM32 Cube HAL support make sure `WOLFSSL_STM32_CUBEMX` is defined.
105106

@@ -195,7 +196,9 @@ Note: The Benchmark example uses float. To enable go to "Project Properties" ->
195196
196197
## STM32 Printf
197198
198-
In main.c make the following changes:
199+
Generation of code for a NUCLEO board provides a BSP option for generating printf support for the virtual com port. To use this set `#define HAL_CONSOLE_UART hcom_uart`.
200+
201+
If setting the printf support manually make the following changes in `main.c`.
199202
200203
This section needs to go below the `UART_HandleTypeDef` line, otherwise `wolfssl/wolfcrypt/settings.h` will error.
201204

IDE/STM32Cube/STM32_Benchmarks.md

Lines changed: 277 additions & 37 deletions
Large diffs are not rendered by default.

IDE/STM32Cube/default_conf.ftl

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ extern ${variable.value} ${variable.name};
221221
#define WOLFSSL_STM32H5
222222
#define STM32_HAL_V2
223223
#undef NO_STM32_HASH
224+
#define WOLFSSL_STM32_PKA
224225
#ifndef HAL_CONSOLE_UART
225226
#define HAL_CONSOLE_UART huart3
226227
#endif
@@ -299,6 +300,7 @@ extern ${variable.value} ${variable.name};
299300
/* ------------------------------------------------------------------------- */
300301
#if defined(WOLF_CONF_RTOS) && WOLF_CONF_RTOS == 2
301302
#define FREERTOS
303+
#define WOLFSSL_NO_REALLOC
302304
#else
303305
#define SINGLE_THREADED
304306
#endif
@@ -789,12 +791,6 @@ extern ${variable.value} ${variable.name};
789791
/* Base16 / Base64 encoding */
790792
//#define NO_CODING
791793

792-
/* bypass certificate date checking, due to lack of properly configured RTC source */
793-
#ifndef HAL_RTC_MODULE_ENABLED
794-
#define NO_ASN_TIME
795-
#endif
796-
797-
798794
#ifdef __cplusplus
799795
}
800796
#endif

IDE/SimplicityStudio/user_settings.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ extern "C" {
438438
#define USE_WOLF_STRTOK
439439
#define XSTRTOK(s1,d,ptr) wc_strtok((s1),(d),(ptr))
440440

441-
#define XSTRNSTR(s1,s2,n) mystrnstr((s1),(s2),(n))
441+
#define XSTRNSTR(s1,s2,n) wolfSSL_strnstr((s1),(s2),(n))
442442

443443
#define XMEMCPY(d,s,l) memcpy((d),(s),(l))
444444
#define XMEMSET(b,c,l) memset((b),(c),(l))

IDE/WICED-STUDIO/user_settings.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ extern unsigned int my_rng_seed_gen(void);
515515
#define USE_WOLF_STRTOK
516516
#define XSTRTOK(s1,d,ptr) wc_strtok((s1),(d),(ptr))
517517

518-
#define XSTRNSTR(s1,s2,n) mystrnstr((s1),(s2),(n))
518+
#define XSTRNSTR(s1,s2,n) wolfSSL_strnstr((s1),(s2),(n))
519519

520520
#define XMEMCPY(d,s,l) memcpy((d),(s),(l))
521521
#define XMEMSET(b,c,l) memset((b),(c),(l))

IDE/WINCE/user_settings.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ C149F3285397DFBD0C6720E14818475C3A50B10880EF9619463173A6D5ED15E7
646646
#define USE_WOLF_STRTOK
647647
#define XSTRTOK(s1,d,ptr) wc_strtok((s1),(d),(ptr))
648648

649-
#define XSTRNSTR(s1,s2,n) mystrnstr((s1),(s2),(n))
649+
#define XSTRNSTR(s1,s2,n) wolfSSL_strnstr((s1),(s2),(n))
650650

651651
#define XMEMCPY(d,s,l) memcpy((d),(s),(l))
652652
#define XMEMSET(b,c,l) memset((b),(c),(l))

IDE/XCODE-FIPSv2/macOS-C++/Intel/user_settings.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ extern "C" {
512512
#define USE_WOLF_STRTOK
513513
#define XSTRTOK(s1,d,ptr) wc_strtok((s1),(d),(ptr))
514514

515-
#define XSTRNSTR(s1,s2,n) mystrnstr((s1),(s2),(n))
515+
#define XSTRNSTR(s1,s2,n) wolfSSL_strnstr((s1),(s2),(n))
516516

517517
#define XMEMCPY(d,s,l) memcpy((d),(s),(l))
518518
#define XMEMSET(b,c,l) memset((b),(c),(l))

0 commit comments

Comments
 (0)