NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/dillo: fix openssl support

Browse Source 
Add two patches to fix openssl support:

 - 0003-Fix-openssl-detection.patch (suggested by Jonathan Kimmitt)
 - 0004-Support-OpenSSL-1.1.0.patch (taken from upstream)

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Peter Seiderer 2020-01-09 22:21:10 +01:00 committed by Thomas Petazzoni
parent cfeb591865
commit 62ad96c057
2 changed files with 62 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
package/dillo/0003-Fix-openssl-detection.patch Normal file
View File

@ -0,0 +1,29 @@
From 96dde9dedf806256cdc6cbf5cacbd5c8d74e6288 Mon Sep 17 00:00:00 2001
From: Jonathan Kimmitt <jrrk2@cam.ac.uk>
Date: Thu, 9 Jan 2020 22:01:42 +0100
Subject: [PATCH] Fix openssl detection
SSL_library_init is now a define, use OPENSSL_init_ssl instead.
Signed-off-by: Jonathan Kimmitt <jrrk2@cam.ac.uk>
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 66b5e9f..206fd53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -276,7 +276,7 @@ if test "x$enable_ssl" = "xyes"; then
if test "x$ssl_ok" = "xyes"; then
old_libs="$LIBS"
- AC_CHECK_LIB(ssl, SSL_library_init, ssl_ok=yes, ssl_ok=no, -lcrypto)
+ AC_CHECK_LIB(ssl, OPENSSL_init_ssl, ssl_ok=yes, ssl_ok=no, -lcrypto)
LIBS="$old_libs"
fi
--
2.24.1

33
package/dillo/0004-Support-OpenSSL-1.1.0.patch Normal file
View File

@ -0,0 +1,33 @@
From ff44d8b2d5211a502afdb3e612dae0e8133b5124 Mon Sep 17 00:00:00 2001
From: Johannes Hofmann <Johannes.Hofmann@gmx.de>
Date: Thu, 9 Jan 2020 22:07:15 +0100
Subject: [PATCH] Support OpenSSL 1.1.0
taken-from: pkgsrc (Ryo ONODERA)
submitted-by: Jun Ebihara <jun@soum.co.jp>
Upstream: https://hg.dillo.org/dillo/rev/b171b8610400
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
dpi/https.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/dpi/https.c b/dpi/https.c
index 766b3af..025cfc4 100644
--- a/dpi/https.c
+++ b/dpi/https.c
@@ -476,7 +476,11 @@ static int handle_certificate_problem(SSL * ssl_connection)
case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
/*Either self signed and untrusted*/
/*Extract CN from certificate name information*/
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) {
+#else
+ if ((cn = strstr(X509_get_subject_name(remote_cert), "/CN=")) == NULL) {
+#endif
strcpy(buf, "(no CN given)");
} else {
char *cn_end;
--
2.24.1