Download-Tools/aria2
1
0
Fork 0
mirror of https://github.com/aria2/aria2.git synced 2025-02-26 08:22:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1315 from neheb/patch-1

Browse Source 
Platform: Fix compilation without deprecated OpenSSL APIs
This commit is contained in:
Tatsuhiro Tsujikawa 2019-04-07 12:39:12 +09:00 committed by GitHub
commit eb7a15513a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Platform.cc
View File

@ -44,6 +44,7 @@
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSSL
# include <openssl/err.h> # include <openssl/err.h>
# include <openssl/ssl.h> # include <openssl/ssl.h>
# include "libssl_compat.h"
#endif // HAVE_OPENSSL #endif // HAVE_OPENSSL
#ifdef HAVE_LIBGCRYPT #ifdef HAVE_LIBGCRYPT
# include <gcrypt.h> # include <gcrypt.h>
@ -111,11 +112,13 @@ bool Platform::setUp()
#endif // ENABLE_NLS #endif // ENABLE_NLS
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSSL
#if !OPENSSL_101_API
// for SSL initialization // for SSL initialization
SSL_load_error_strings(); SSL_load_error_strings();
SSL_library_init(); SSL_library_init();
// Need this to "decrypt" p12 files. // Need this to "decrypt" p12 files.
OpenSSL_add_all_algorithms(); OpenSSL_add_all_algorithms();
#endif // !OPENSSL_101_API
#endif // HAVE_OPENSSL #endif // HAVE_OPENSSL
#ifdef HAVE_LIBGCRYPT #ifdef HAVE_LIBGCRYPT
if (!gcry_check_version("1.2.4")) { if (!gcry_check_version("1.2.4")) {