Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #8735 from neheb/joe

Browse source 
jose: Fix compilation without deprecated OpenSSL APIs
This commit is contained in:
Rosen Penev 2019-04-24 00:48:47 -07:00 committed by GitHub
commit caea056dc2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libs/jose/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=jose PKG_NAME:=jose
PKG_VERSION:=10 PKG_VERSION:=10
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://github.com/latchset/$(PKG_NAME)/releases/download/v$(PKG_VERSION)/ PKG_SOURCE_URL:=https://github.com/latchset/$(PKG_NAME)/releases/download/v$(PKG_VERSION)/

0
libs/jose/patches/Fix_minor_leak_upstream_198f720.patch → libs/jose/patches/010-fix_minor_leak_upstream_198f720.patch
View file

21
libs/jose/patches/020-openssl-deprecated.patch Normal file
View file

@ -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();
}