47 lines
1.7 KiB
Diff
47 lines
1.7 KiB
Diff
--- crypto/apr_crypto_openssl.c.orig 2017-05-03 23:18:52.000000000 +0000
|
|
+++ crypto/apr_crypto_openssl.c 2017-07-30 10:21:22.592591988 +0000
|
|
@@ -117,7 +117,7 @@
|
|
static apr_status_t crypto_init(apr_pool_t *pool, const char *params,
|
|
const apu_err_t **result)
|
|
{
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
|
CRYPTO_malloc_init();
|
|
#else
|
|
OPENSSL_malloc_init();
|
|
@@ -721,7 +721,7 @@
|
|
if (!EVP_EncryptUpdate(ctx->cipherCtx, (*out), &outl,
|
|
(unsigned char *) in, inlen)) {
|
|
#endif
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
|
EVP_CIPHER_CTX_cleanup(ctx->cipherCtx);
|
|
#else
|
|
EVP_CIPHER_CTX_reset(ctx->cipherCtx);
|
|
@@ -764,7 +764,7 @@
|
|
else {
|
|
*outlen = len;
|
|
}
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
|
EVP_CIPHER_CTX_cleanup(ctx->cipherCtx);
|
|
#else
|
|
EVP_CIPHER_CTX_reset(ctx->cipherCtx);
|
|
@@ -891,7 +891,7 @@
|
|
if (!EVP_DecryptUpdate(ctx->cipherCtx, *out, &outl, (unsigned char *) in,
|
|
inlen)) {
|
|
#endif
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
|
EVP_CIPHER_CTX_cleanup(ctx->cipherCtx);
|
|
#else
|
|
EVP_CIPHER_CTX_reset(ctx->cipherCtx);
|
|
@@ -934,7 +934,7 @@
|
|
else {
|
|
*outlen = len;
|
|
}
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
|
EVP_CIPHER_CTX_cleanup(ctx->cipherCtx);
|
|
#else
|
|
EVP_CIPHER_CTX_reset(ctx->cipherCtx);
|