jaiden
/
apk-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix compilation without deprecated OpenSSL APIs 

(De)initialization is deprecated under OpenSSL 1.0 and above.

[TT: Some simplifications, and additional edits.]

Signed-off-by: Rosen Penev <rosenp@gmail.com>
cute-signatures
Rosen Penev 2021-01-11 01:51:58 -08:00 committed by Timo Teräs
parent bcbcbfc1fc
commit c4c8aa5ba0
3 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libfetch/common.c
View File

@ -499,15 +499,11 @@ static int fetch_ssl_setup_client_certificate(SSL_CTX *ctx, int verbose)
int int
fetch_ssl(conn_t *conn, const struct url *URL, int verbose) fetch_ssl(conn_t *conn, const struct url *URL, int verbose)
{ {
/* Init the SSL library and context */ #if OPENSSL_VERSION_NUMBER < 0x10100000L
if (!SSL_library_init()){
fprintf(stderr, "SSL library init failed\n");
return (-1);
}
SSL_load_error_strings();
conn->ssl_meth = SSLv23_client_method(); conn->ssl_meth = SSLv23_client_method();
#else
conn->ssl_meth = TLS_client_method();
#endif
conn->ssl_ctx = SSL_CTX_new(conn->ssl_meth); conn->ssl_ctx = SSL_CTX_new(conn->ssl_meth);
SSL_CTX_set_mode(conn->ssl_ctx, SSL_MODE_AUTO_RETRY); SSL_CTX_set_mode(conn->ssl_ctx, SSL_MODE_AUTO_RETRY);

26
src/apk.c
View File

@ -20,11 +20,6 @@
#include <unistd.h> #include <unistd.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <openssl/crypto.h>
#ifndef OPENSSL_NO_ENGINE
#include <openssl/engine.h>
#endif
#include <fetch.h> #include <fetch.h>
#include "apk_defines.h" #include "apk_defines.h"
@ -358,25 +353,6 @@ static int parse_options(int argc, char **argv, struct apk_applet *applet, void
return 0; return 0;
} }
static void fini_openssl(void)
{
EVP_cleanup();
#ifndef OPENSSL_NO_ENGINE
ENGINE_cleanup();
#endif
CRYPTO_cleanup_all_ex_data();
}
static void init_openssl(void)
{
atexit(fini_openssl);
OpenSSL_add_all_algorithms();
#ifndef OPENSSL_NO_ENGINE
ENGINE_load_builtin_engines();
ENGINE_register_all_complete();
#endif
}
static void setup_automatic_flags(struct apk_ctx *ac) static void setup_automatic_flags(struct apk_ctx *ac)
{ {
const char *tmp; const char *tmp;
@ -449,7 +425,7 @@ int main(int argc, char **argv)
ctx.force |= applet->forced_force; ctx.force |= applet->forced_force;
} }
init_openssl(); apk_openssl_init();
setup_automatic_flags(&ctx); setup_automatic_flags(&ctx);
fetchConnectionCacheInit(32, 4); fetchConnectionCacheInit(32, 4);

27
src/apk_openssl.h
View File

@ -11,7 +11,11 @@
#define APK_SSL_COMPAT_H #define APK_SSL_COMPAT_H
#include <openssl/opensslv.h> #include <openssl/opensslv.h>
#include <openssl/crypto.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#ifndef OPENSSL_NO_ENGINE
#include <openssl/engine.h>
#endif
#if OPENSSL_VERSION_NUMBER < 0x1010000fL || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) #if OPENSSL_VERSION_NUMBER < 0x1010000fL || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
@ -25,6 +29,29 @@ static inline void EVP_MD_CTX_free(EVP_MD_CTX *mdctx)
return EVP_MD_CTX_destroy(mdctx); return EVP_MD_CTX_destroy(mdctx);
} }
static inline void apk_openssl_cleanup(void)
{
EVP_cleanup();
#ifndef OPENSSL_NO_ENGINE
ENGINE_cleanup();
#endif
CRYPTO_cleanup_all_ex_data();
}
static inline void apk_openssl_init(void)
{
atexit(apk_openssl_cleanup);
OpenSSL_add_all_algorithms();
#ifndef OPENSSL_NO_ENGINE
ENGINE_load_builtin_engines();
ENGINE_register_all_complete();
#endif
}
#else
static inline void apk_openssl_init(void) {}
#endif #endif
#endif #endif