diff options
| author | Rosen Penev <rosenp@gmail.com> | 2019-04-24 00:48:47 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-24 00:48:47 -0700 |
| commit | caea056dc2f3770278ea078fdf986e5432bf2e7c (patch) | |
| tree | cfc5d2a0f1cc4455fd33278d2ec659970049718e /libs | |
| parent | 13914fac461e2cefcda8dc96f49fa772834b7cca (diff) | |
| parent | e7d28760f1fb7edb2c55b127292ffaab9a9e7257 (diff) | |
Merge pull request #8735 from neheb/joe
jose: Fix compilation without deprecated OpenSSL APIs
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/jose/Makefile | 2 | ||||
| -rw-r--r-- | libs/jose/patches/010-fix_minor_leak_upstream_198f720.patch (renamed from libs/jose/patches/Fix_minor_leak_upstream_198f720.patch) | 0 | ||||
| -rw-r--r-- | libs/jose/patches/020-openssl-deprecated.patch | 21 |
3 files changed, 22 insertions, 1 deletions
diff --git a/libs/jose/Makefile b/libs/jose/Makefile index f515cf85b..20b9c2f7e 100644 --- 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 index 507576038..507576038 100644 --- a/libs/jose/patches/Fix_minor_leak_upstream_198f720.patch +++ b/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 index 000000000..bcee0dfad --- /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(); + } |