From 0ba7a58ad5272a893667b22efebf5ea60c51e542 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 23 Nov 2016 12:58:15 -0600 Subject: [PATCH] Add openssl patch --- openssl.patch | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 openssl.patch diff --git a/openssl.patch b/openssl.patch new file mode 100644 index 0000000..f46cd85 --- /dev/null +++ b/openssl.patch @@ -0,0 +1,34 @@ +diff -urNr owncloudclient-2.2.4.orig/src/3rdparty/certificates/p12topem.cpp owncloudclient-2.2.4/src/3rdparty/certificates/p12topem.cpp +--- owncloudclient-2.2.4.orig/src/3rdparty/certificates/p12topem.cpp 2016-09-27 10:53:37.000000000 +0200 ++++ owncloudclient-2.2.4/src/3rdparty/certificates/p12topem.cpp 2016-11-02 19:30:24.104679798 +0100 +@@ -65,7 +65,7 @@ + ret.PrivateKey = ""; + ret.Certificate = ""; + +- SSLeay_add_all_algorithms(); ++ ADD_ALL_ALGORITHMS(); + ERR_load_crypto_strings(); + if(!(fp = fopen(p12File.c_str(), "rb"))) { + ret.ErrorCode = 1; +diff -urNr owncloudclient-2.2.4.orig/src/3rdparty/certificates/p12topem.h owncloudclient-2.2.4/src/3rdparty/certificates/p12topem.h +--- owncloudclient-2.2.4.orig/src/3rdparty/certificates/p12topem.h 2016-09-27 10:53:37.000000000 +0200 ++++ owncloudclient-2.2.4/src/3rdparty/certificates/p12topem.h 2016-11-02 19:29:08.563079631 +0100 +@@ -29,6 +29,13 @@ + #include + #include + #include ++#include ++ ++#if OPENSSL_VERSION_NUMBER <= 0x0090400f ++# define ADD_ALL_ALGORITHMS() SSLeay_add_all_algorithms() ++#else ++# define ADD_ALL_ALGORITHMS() OpenSSL_add_all_algorithms() ++#endif + + using namespace std; + +@@ -59,4 +66,3 @@ + resultP12ToPem p12ToPem(string p12File, string p12Passwd); + + #endif /* P12TOPEM_H */ +-