Skip to content

Commit 38d9000

Browse files
committed
pkg/wolfssl: bump version to 4.3.0
Update to the latest upstream release https://www.wolfssl.com/docs/wolfssl-changelog/ This unfortunetaly introduced some unused parameter warnings, so add a patch to address those.
1 parent 1506ed3 commit 38d9000

File tree

2 files changed

+49
-1
lines changed

2 files changed

+49
-1
lines changed

pkg/wolfssl/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PKG_NAME=wolfssl
22
PKG_URL=https://github.com/wolfssl/wolfssl.git
3-
PKG_VERSION=eaeaaf12c11dd52ab0cd6833252ed559656e9826 # v4.1.0+
3+
PKG_VERSION=3f13b49fa318fbd3216d7da36d942e7c276d3413 # v4.3.0+
44
PKG_LICENSE=GPLv2
55

66
include $(RIOTBASE)/pkg/pkg.mk
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
From 8d58f18ad8c1f2cafad443002acfeb1253a541bd Mon Sep 17 00:00:00 2001
2+
From: Benjamin Valentin <[email protected]>
3+
Date: Sun, 2 Feb 2020 15:27:26 +0100
4+
Subject: [PATCH] Fix unused parameter warnings
5+
6+
---
7+
src/ssl.c | 4 ++++
8+
wolfssl/wolfcrypt/types.h | 2 +-
9+
2 files changed, 5 insertions(+), 1 deletion(-)
10+
11+
diff --git a/src/ssl.c b/src/ssl.c
12+
index fc2aa63bf..3d2d48e58 100644
13+
--- a/src/ssl.c
14+
+++ b/src/ssl.c
15+
@@ -5214,6 +5214,8 @@ static int ProcessBufferTryDecode(WOLFSSL_CTX* ctx, WOLFSSL* ssl, DerBuffer* der
16+
int* keySz, word32* idx, int* resetSuites, int *rsaKey, int *eccKey,
17+
int *ed25519Key, void* heap, int devId)
18+
{
19+
+ (void) heap;
20+
+
21+
int ret = 0;
22+
23+
if (ctx == NULL && ssl == NULL)
24+
@@ -5341,6 +5343,8 @@ static int ProcessBufferTryDecode(WOLFSSL_CTX* ctx, WOLFSSL* ssl, DerBuffer* der
25+
XFREE(key, heap, DYNAMIC_TYPE_ECC);
26+
#endif
27+
}
28+
+#else
29+
+ (void) devId;
30+
#endif /* HAVE_ECC */
31+
#ifdef HAVE_ED25519
32+
if (ret == 0 && !*rsaKey && !*eccKey) {
33+
diff --git a/wolfssl/wolfcrypt/types.h b/wolfssl/wolfcrypt/types.h
34+
index e80351566..2b9e29dcb 100644
35+
--- a/wolfssl/wolfcrypt/types.h
36+
+++ b/wolfssl/wolfcrypt/types.h
37+
@@ -313,7 +313,7 @@
38+
#else
39+
/* just use plain C stdlib stuff if desired */
40+
#include <stdlib.h>
41+
- #define XMALLOC(s, h, t) malloc((s))
42+
+ #define XMALLOC(s, h, t) malloc((s)); (void)(h); (void)(t)
43+
#define XFREE(p, h, t) {void* xp = (p); if((xp)) free((xp));}
44+
#define XREALLOC(p, n, h, t) realloc((p), (n))
45+
#endif
46+
--
47+
2.20.1
48+

0 commit comments

Comments
 (0)