jose: Fix compilation without deprecated OpenSSL APIs

Signed-off-by: Rosen Penev <redacted>

diff --git a/libs/jose/Makefile b/libs/jose/Makefile
index f515cf85b6cba3a6a8066f1f2ef81081dd96c559..20b9c2f7ee30518e2fd4e2e4047749e4d9126d7c 100644 (file)
--- a/libs/jose/Makefile
+++ b/libs/jose/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=jose
 PKG_VERSION:=10
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://github.com/latchset/$(PKG_NAME)/releases/download/v$(PKG_VERSION)/

diff --git a/libs/jose/patches/Fix_minor_leak_upstream_198f720.patch b/libs/jose/patches/010-fix_minor_leak_upstream_198f720.patch
similarity index 100%
rename from libs/jose/patches/Fix_minor_leak_upstream_198f720.patch
rename to libs/jose/patches/010-fix_minor_leak_upstream_198f720.patch

diff --git a/libs/jose/patches/020-openssl-deprecated.patch b/libs/jose/patches/020-openssl-deprecated.patch
new file mode 100644 (file)
index 0000000..bcee0df
--- /dev/null
+++ b/libs/jose/patches/020-openssl-deprecated.patch
@@ -0,0 +1,21 @@
+--- a/lib/openssl/compat.h
++++ b/lib/openssl/compat.h
+@@ -17,6 +17,7 @@
+ 
+ #pragma once
+ 
++#include <openssl/bn.h>
+ #include <openssl/hmac.h>
+ #include <openssl/ec.h>
+ #include <openssl/ecdsa.h>
+--- a/lib/openssl/misc.c
++++ b/lib/openssl/misc.c
+@@ -185,6 +185,8 @@ add_entity(json_t *root, json_t *obj, const char *plural, ...)
+ static void __attribute__((constructor))
+ constructor(void)
+ {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     OpenSSL_add_all_algorithms();
++#endif
+     RAND_poll();
+ }