From dac5aec0c47c3b0aeafa6ae7dac8d7fd7b7a4066 Mon Sep 17 00:00:00 2001
From: Benjamin Valentin <benjamin.valentin@bht-berlin.de>
Date: Wed, 6 Dec 2023 19:01:30 +0100
Subject: [PATCH] pkg/tinydtls: bump version

---
 pkg/tinydtls/Makefile                         |  2 +-
 pkg/tinydtls/contrib/sock_dtls.c              |  3 -
 ...dtls_debug-mock-dsrv_log-when-NDEBUG.patch | 93 -------------------
 3 files changed, 1 insertion(+), 97 deletions(-)
 delete mode 100644 pkg/tinydtls/patches/0001-dtls_debug-mock-dsrv_log-when-NDEBUG.patch

diff --git a/pkg/tinydtls/Makefile b/pkg/tinydtls/Makefile
index 8f314cb772c1..e076cecc5d0e 100644
--- a/pkg/tinydtls/Makefile
+++ b/pkg/tinydtls/Makefile
@@ -1,6 +1,6 @@
 PKG_NAME=tinydtls
 PKG_URL=https://github.com/eclipse/tinydtls.git
-PKG_VERSION=5e14e4930b0f329f35809c623976df1e08ca4593
+PKG_VERSION=95d02ee28ea745541d6c55dba49f3b3ab8b71a43
 PKG_LICENSE=EPL-1.0,EDL-1.0
 
 include $(RIOTBASE)/pkg/pkg.mk
diff --git a/pkg/tinydtls/contrib/sock_dtls.c b/pkg/tinydtls/contrib/sock_dtls.c
index cab294155763..f5fdc0d6aa59 100644
--- a/pkg/tinydtls/contrib/sock_dtls.c
+++ b/pkg/tinydtls/contrib/sock_dtls.c
@@ -137,9 +137,6 @@ static int _event(struct dtls_context_t *ctx, session_t *session,
         case DTLS_EVENT_CONNECTED:
             DEBUG("sock_dtls: event connected\n");
             break;
-        case DTLS_EVENT_RENEGOTIATE:
-            DEBUG("sock_dtls: event renegotiate\n");
-            break;
         }
     }
     if (!level && (code != DTLS_EVENT_CONNECT)) {
diff --git a/pkg/tinydtls/patches/0001-dtls_debug-mock-dsrv_log-when-NDEBUG.patch b/pkg/tinydtls/patches/0001-dtls_debug-mock-dsrv_log-when-NDEBUG.patch
deleted file mode 100644
index 499fceee1c07..000000000000
--- a/pkg/tinydtls/patches/0001-dtls_debug-mock-dsrv_log-when-NDEBUG.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 3eade60499185b40c0593774af52dbe42042a939 Mon Sep 17 00:00:00 2001
-From: Benjamin Valentin <benjamin.valentin@ml-pa.com>
-Date: Mon, 27 Feb 2023 16:37:14 +0100
-Subject: [PATCH] dtls_debug: mock dsrv_log() when NDEBUG is set
-
-Setting NDEBUG already replaces dtls_dsrv_hexdump_log(), dtls_dsrv_log_addr()
-etc with dummy implementations.
-
-This extends this to also replace dsrv_log() and dtls_{get,set}_log_level()
-with a no-op implementation.
----
- dtls_debug.c | 26 +++++++++++++++++++-------
- 1 file changed, 19 insertions(+), 7 deletions(-)
-
-diff --git a/dtls_debug.c b/dtls_debug.c
-index 70c88ff..e7a9902 100644
---- a/dtls_debug.c
-+++ b/dtls_debug.c
-@@ -51,8 +51,6 @@ typedef int in_port_t;
- LOG_MODULE_REGISTER(TINYDTLS, CONFIG_TINYDTLS_LOG_LEVEL);
- #endif /* WITH_ZEPHYR */
- 
--static int maxlog = DTLS_LOG_WARN;      /* default maximum log level */
--
- const char *dtls_package_name(void) {
-   return PACKAGE_NAME;
- }
-@@ -61,6 +59,9 @@ const char *dtls_package_version(void) {
-   return PACKAGE_VERSION;
- }
- 
-+#ifndef NDEBUG
-+static int maxlog = DTLS_LOG_WARN;      /* default maximum log level */
-+
- log_t
- dtls_get_log_level(void) {
-   return maxlog;
-@@ -101,8 +102,6 @@ print_timestamp(char *s, size_t len, clock_time_t t) {
- 
- #endif /* HAVE_TIME_H */
- 
--#ifndef NDEBUG
--
- /**
-  * A length-safe strlen() fake.
-  *
-@@ -240,8 +239,6 @@ dsrv_print_addr(const session_t *addr, char *buf, size_t len) {
- #endif /* ! HAVE_INET_NTOP */
- }
- 
--#endif /* NDEBUG */
--
- #if !defined(WITH_CONTIKI) && !defined(_MSC_VER)
- 
- static void
-@@ -332,7 +329,6 @@ dsrv_log(log_t level, char *format, ...) {
- }
- #endif /* WITH_CONTIKI */
- 
--#ifndef NDEBUG
- /** dumps packets in usual hexdump format */
- void hexdump(const unsigned char *packet, int length) {
-   int n = 0;
-@@ -497,6 +493,16 @@ dtls_dsrv_hexdump_log(log_t level, const char *name, const unsigned char *buf, s
- 
- #else /* NDEBUG */
- 
-+log_t
-+dtls_get_log_level(void) {
-+  return 0;
-+}
-+
-+void
-+dtls_set_log_level(log_t level) {
-+  (void)level;
-+}
-+
- void
- hexdump(const unsigned char *packet, int length) {
-   (void)packet;
-@@ -518,6 +524,12 @@ dtls_dsrv_hexdump_log(log_t level, const char *name, const unsigned char *buf, s
-   (void)extend;
- }
- 
-+void
-+dsrv_log(log_t level, const char *format, ...) {
-+  (void)level;
-+  (void)format;
-+}
-+
- void
- dtls_dsrv_log_addr(log_t level, const char *name, const session_t *addr) {
-   (void)level;