Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

elektra: Fix compilation without deprecated OpenSSL APIs

Browse source 
Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2019-05-15 14:49:47 -07:00
parent f30898d3e3
commit 24ad87702f
No known key found for this signature in database
GPG key ID: 36D31CFA845F0E3B
2 changed files with 36 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libs/elektra/Makefile
View file

@ -15,7 +15,7 @@ PKG_NAME:=elektra
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE.md PKG_LICENSE_FILES:=LICENSE.md
PKG_VERSION:=0.8.21 PKG_VERSION:=0.8.21
PKG_RELEASE:=1 PKG_RELEASE:=2
# Use this for official releasees # Use this for official releasees
PKG_HASH:=51892570f18d1667d0da4d0908a091e41b41c20db9835765677109a3d150cd26 PKG_HASH:=51892570f18d1667d0da4d0908a091e41b41c20db9835765677109a3d150cd26

35
libs/elektra/patches/010-openssl-deprecated.patch Normal file
View file

@ -0,0 +1,35 @@
--- a/src/plugins/crypto/openssl_operations.c
+++ b/src/plugins/crypto/openssl_operations.c
@@ -25,6 +25,10 @@
#include <stdlib.h>
#include <string.h>
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#define EVP_CIPHER_CTX_reset EVP_CIPHER_CTX_cleanup
+#endif
+
#define KEY_BUFFER_SIZE (ELEKTRA_CRYPTO_SSL_KEYSIZE + ELEKTRA_CRYPTO_SSL_BLOCKSIZE)
/*
@@ -144,8 +148,10 @@ int elektraCryptoOpenSSLInit (Key * errorKey ELEKTRA_UNUSED)
// initialize OpenSSL according to
// https://wiki.openssl.org/index.php/Library_Initialization
pthread_mutex_lock (&mutex_ssl);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
OpenSSL_add_all_algorithms ();
ERR_load_crypto_strings ();
+#endif
pthread_mutex_unlock (&mutex_ssl);
return 1;
}
@@ -246,8 +252,8 @@ void elektraCryptoOpenSSLHandleDestroy (elektraCryptoHandle * handle)
if (handle)
{
pthread_mutex_lock (&mutex_ssl);
- EVP_CIPHER_CTX_cleanup (handle->encrypt);
- EVP_CIPHER_CTX_cleanup (handle->decrypt);
+ EVP_CIPHER_CTX_reset (handle->encrypt);
+ EVP_CIPHER_CTX_reset (handle->decrypt);
EVP_CIPHER_CTX_free (handle->encrypt);
EVP_CIPHER_CTX_free (handle->decrypt);
pthread_mutex_unlock (&mutex_ssl);