From 9913c0899a8fb6bfbda33e7a1fd84f2fa6c3ddda Mon Sep 17 00:00:00 2001 From: "Sergey V. Lobanov" Date: Mon, 3 Jan 2022 21:10:50 +0300 Subject: [PATCH] rtty: add compatibility for wolfssl >= 5.0 NTRU support has been removed in wolfssl 5.0 so it is required to mask NTRU specific code if wolfssl >= 5.0 Signed-off-by: Sergey V. Lobanov --- utils/rtty/Makefile | 2 +- .../rtty/patches/100-wolfssl_5_support.patch | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 utils/rtty/patches/100-wolfssl_5_support.patch diff --git a/utils/rtty/Makefile b/utils/rtty/Makefile index c471ff56b..cd6f34f33 100644 --- a/utils/rtty/Makefile +++ b/utils/rtty/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rtty PKG_VERSION:=8.0.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL=https://github.com/zhaojh329/rtty/releases/download/v$(PKG_VERSION) diff --git a/utils/rtty/patches/100-wolfssl_5_support.patch b/utils/rtty/patches/100-wolfssl_5_support.patch new file mode 100644 index 000000000..096a32ef0 --- /dev/null +++ b/utils/rtty/patches/100-wolfssl_5_support.patch @@ -0,0 +1,21 @@ +commit 91b66a6b402b790f3c8cebb0420ef549744ee197 +Author: Sergey V. Lobanov +Date: Mon Jan 3 19:25:45 2022 +0300 + + add compatibility for wolfssl >= 5.0 + + NTRU support has been removed in wolfssl 5.0 so it is required to + mask NTRU specific code if wolfssl >= 5.0 + +--- a/src/ssl/openssl.c ++++ b/src/ssl/openssl.c +@@ -336,7 +336,9 @@ static bool handle_wolfssl_asn_error(voi + case ASN_SIG_HASH_E: + case ASN_SIG_KEY_E: + case ASN_DH_KEY_E: ++#if LIBWOLFSSL_VERSION_HEX < 0x05000000 + case ASN_NTRU_KEY_E: ++#endif + case ASN_CRIT_EXT_E: + case ASN_ALT_NAME_E: + case ASN_NO_PEM_HEADER: