Browse Source

Merge pull request #13029 from neheb/boinc

boinc: fix compilation without deprecated OpenSSL APIs
lilik-openwrt-22.03
Rosen Penev 4 years ago
committed by GitHub
parent
commit
d179b11410
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 1 deletions
  1. +1
    -1
      net/boinc/Makefile
  2. +31
    -0
      net/boinc/patches/010-openssl.patch

+ 1
- 1
net/boinc/Makefile View File

@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=boinc PKG_NAME:=boinc
PKG_VERSION:=7.16.6 PKG_VERSION:=7.16.6
PKG_VERSION_SHORT:=$(shell echo $(PKG_VERSION)| cut -f1,2 -d.) PKG_VERSION_SHORT:=$(shell echo $(PKG_VERSION)| cut -f1,2 -d.)
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE_DATE:=2020-02-25 PKG_SOURCE_DATE:=2020-02-25
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz


+ 31
- 0
net/boinc/patches/010-openssl.patch View File

@ -0,0 +1,31 @@
--- a/lib/crypt.cpp
+++ b/lib/crypt.cpp
@@ -44,6 +44,7 @@
#include <openssl/engine.h>
#include <openssl/err.h>
#include <openssl/rsa.h>
+#include <openssl/bn.h>
#ifdef _USING_FCGI_
#include "boinc_fcgi.h"
@@ -720,8 +721,10 @@ char *check_validity(
int rbytes;
unsigned char md5_md[MD5_DIGEST_LENGTH], rbuf[2048];
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(HAVE_LIBRESSL)
SSL_load_error_strings();
SSL_library_init();
+#endif
if (!is_file(origFile)) {
return NULL;
@@ -772,7 +775,9 @@ int cert_verify_file(
fflush(stdout);
return false;
}
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(HAVE_LIBRESSL)
SSL_library_init();
+#endif
if (!is_file(origFile)) return false;
FILE* of = boinc_fopen(origFile, "r");
if (!of) return false;

Loading…
Cancel
Save