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

neon: Fix compilation without deprecated OpenSSL APIs

Browse source 
Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2018-12-02 16:20:10 -08:00
parent 3fba9b0d5d
commit 4d9f9e6a33
2 changed files with 38 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libs/neon/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=neon
PKG_VERSION:=0.30.2
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://web.archive.org/web/20170923042221/http://webdav.org:80/neon/

37
libs/neon/patches/010-openssl-deprecated.patch Normal file
View file

@ -0,0 +1,37 @@
--- a/src/ne_openssl.c
+++ b/src/ne_openssl.c
@@ -35,6 +35,10 @@
#include <openssl/x509v3.h>
#include <openssl/rand.h>
#include <openssl/opensslv.h>
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#define X509_get0_notBefore X509_get_notBefore
+#define X509_get0_notAfter X509_get_notAfter
+#endif
#ifdef NE_HAVE_TS_SSL
#include <stdlib.h> /* for abort() */
@@ -226,10 +230,10 @@ void ne_ssl_cert_validity_time(const ne_ssl_certificate *cert,
time_t *from, time_t *until)
{
if (from) {
- *from = asn1time_to_timet(X509_get_notBefore(cert->subject));
+ *from = asn1time_to_timet(X509_get0_notBefore(cert->subject));
}
if (until) {
- *until = asn1time_to_timet(X509_get_notAfter(cert->subject));
+ *until = asn1time_to_timet(X509_get0_notAfter(cert->subject));
}
}
--- a/src/ne_socket.c
+++ b/src/ne_socket.c
@@ -27,7 +27,7 @@
#include "config.h"
#include <sys/types.h>
-#ifdef HAVE_SYS_UIO_h
+#ifdef HAVE_SYS_UIO_H
#include <sys/uio.h> /* writev(2) */
#endif
#ifdef HAVE_SYS_TIME_H