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

libldns: Fix OpenSSL deprecated API usage

Browse source 
Tested with OpenSSL 1.0.2 and 1.1.1

Signed-off-by: Rosen Penev <rosenp@gmail.com>
[minor tweak to add #ifdef HAVE_SSL in host2str.c]
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
This commit is contained in:
Rosen Penev 2018-11-02 18:35:43 -07:00 committed by Kevin Darbyshire-Bryant
parent d36a7cf1b1
commit 3ee65300d1
2 changed files with 80 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libs/ldns/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ldns PKG_NAME:=ldns
PKG_VERSION:=1.7.0 PKG_VERSION:=1.7.0
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.nlnetlabs.nl/downloads/ldns PKG_SOURCE_URL:=http://www.nlnetlabs.nl/downloads/ldns
@ -20,6 +20,7 @@ PKG_LICENSE_FILES:=LICENSE
PKG_MAINTAINER:= PKG_MAINTAINER:=
PKG_FIXUP:=autoreconf PKG_FIXUP:=autoreconf
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1 PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

78
libs/ldns/patches/200-deprecated-openssl.patch Normal file
View file

@ -0,0 +1,78 @@
--- a/dnssec.c
+++ b/dnssec.c
@@ -23,6 +23,9 @@
#include <openssl/rand.h>
#include <openssl/err.h>
#include <openssl/md5.h>
+#include <openssl/bn.h>
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
#endif
ldns_rr *
--- a/dnssec_sign.c
+++ b/dnssec_sign.c
@@ -17,6 +17,9 @@
#include <openssl/rand.h>
#include <openssl/err.h>
#include <openssl/md5.h>
+#include <openssl/bn.h>
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
#endif /* HAVE_SSL */
ldns_rr *
--- a/dnssec_verify.c
+++ b/dnssec_verify.c
@@ -594,7 +594,9 @@ ldns_dnssec_trust_tree_print_sm_fmt(FILE
if (tree->parent_status[i]
== LDNS_STATUS_SSL_ERR) {
printf("; SSL Error: ");
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
ERR_load_crypto_strings();
+#endif
ERR_print_errors_fp(stdout);
printf("\n");
}
--- a/drill/drill.c
+++ b/drill/drill.c
@@ -1013,7 +1013,7 @@ main(int argc, char *argv[])
xfree(tsig_data);
xfree(tsig_algorithm);
-#ifdef HAVE_SSL
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
CRYPTO_cleanup_all_ex_data();
ERR_free_strings();
EVP_cleanup();
--- a/host2str.c
+++ b/host2str.c
@@ -28,6 +28,12 @@
#include <time.h>
#include <sys/time.h>
+#ifdef HAVE_SSL
+#include <openssl/bn.h>
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
+#endif
+
#ifndef INET_ADDRSTRLEN
#define INET_ADDRSTRLEN 16
#endif
--- a/keys.c
+++ b/keys.c
@@ -16,8 +16,12 @@
#ifdef HAVE_SSL
#include <openssl/ssl.h>
-#include <openssl/engine.h>
#include <openssl/rand.h>
+#include <openssl/bn.h>
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
+#include <openssl/engine.h>
+#include <openssl/ui.h>
#endif /* HAVE_SSL */
ldns_lookup_table ldns_signing_algorithms[] = {