Skip to content

Commit 28aef2f

Browse files
Merge branch 'master' of https://github.com/wolfSSL/wolfssl into zd20038_3
2 parents a3b29ed + b982f86 commit 28aef2f

File tree

2 files changed

+58
-1
lines changed

2 files changed

+58
-1
lines changed

.github/workflows/threadx.yml

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: ThreadXBuild Test
2+
3+
on:
4+
push:
5+
branches: [ 'master', 'main', 'release/**' ]
6+
pull_request:
7+
branches: [ '*' ]
8+
9+
jobs:
10+
build:
11+
12+
runs-on: ubuntu-22.04
13+
timeout-minutes: 10
14+
15+
steps:
16+
- name: Cache NetXDuo bundle
17+
id: cache-netxduo
18+
uses: actions/cache@v3
19+
with:
20+
path: ./v6.4.3_rel.tar.gz
21+
key: netxduo-bundle-v6.4.3_rel
22+
23+
- name: Download NetXDuo bundle if not cached
24+
if: steps.cache-netxduo.outputs.cache-hit != 'true'
25+
run: |
26+
wget https://github.com/eclipse-threadx/netxduo/archive/refs/tags/v6.4.3_rel.tar.gz
27+
28+
- name: Extract NetXDuo bundle
29+
run: |
30+
mkdir -p netxduo_src
31+
tar -xzf v6.4.3_rel.tar.gz -C netxduo_src --strip-components=1
32+
33+
- name: Install NetXDuo Dependencies
34+
working-directory: ./netxduo_src
35+
run: |
36+
./scripts/install.sh
37+
38+
- name: Configure NetX with DNS Client Support
39+
working-directory: ./netxduo_src
40+
run: |
41+
cp addons/dns/nxd_dns.h ./common/inc/
42+
cp addons/dns/nxd_dns.c ./common/src/
43+
44+
- name: Build NetXDuo with DNS Support
45+
working-directory: ./netxduo_src
46+
run: |
47+
rm -rf test/cmake/threadx
48+
rm -rf test/cmake/filex
49+
./scripts/build_nxd64.sh
50+
51+
- name: Build wolfSSL
52+
uses: wolfSSL/actions-build-autotools-project@v1
53+
with:
54+
path: wolfssl
55+
configure: --enable-enckeys --disable-examples --disable-benchmark --disable-crypttests CPPFLAGS="-DTHREADX -DHAVE_NETX -DWOLFSSL_USER_IO -I${{ github.workspace }}/netxduo_src/common/inc -I${{ github.workspace }}/netxduo_src/ports/linux/gnu/inc -I${{ github.workspace }}/netxduo_src/test/cmake/netxduo64/build/libs/inc" LDFLAGS="-L${{ github.workspace }}/netxduo_src/test/cmake/netxduo64/build/default_build_coverage/netxduo -L${{ github.workspace }}/netxduo_src/test/cmake/netxduo64/build/libs/threadx" LIBS="-lnetxduo -lthreadx"
56+
install: false
57+

wolfcrypt/src/wc_port.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2472,7 +2472,7 @@ int wolfSSL_HwPkMutexUnLock(void)
24722472

24732473
int wc_InitMutex(wolfSSL_Mutex* m)
24742474
{
2475-
if (tx_mutex_create(m, "wolfSSL Mutex", TX_NO_INHERIT) == 0)
2475+
if (tx_mutex_create(m, (CHAR*)"wolfSSL Mutex", TX_NO_INHERIT) == 0)
24762476
return 0;
24772477
else
24782478
return BAD_MUTEX_E;

0 commit comments

Comments
 (0)