|
Line 0
Link Here
|
|
|
1 |
--- apr-util-1.6.0/crypto/apr_crypto_openssl.c.orig 2017-05-03 23:18:52 UTC |
| 2 |
+++ apr-util-1.6.0/crypto/apr_crypto_openssl.c |
| 3 |
@@ -117,7 +117,7 @@ static apr_status_t crypto_shutdown_help |
| 4 |
static apr_status_t crypto_init(apr_pool_t *pool, const char *params, |
| 5 |
const apu_err_t **result) |
| 6 |
{ |
| 7 |
-#if OPENSSL_VERSION_NUMBER < 0x10100000L |
| 8 |
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
| 9 |
CRYPTO_malloc_init(); |
| 10 |
#else |
| 11 |
OPENSSL_malloc_init(); |
| 12 |
@@ -721,7 +721,7 @@ static apr_status_t crypto_block_encrypt |
| 13 |
if (!EVP_EncryptUpdate(ctx->cipherCtx, (*out), &outl, |
| 14 |
(unsigned char *) in, inlen)) { |
| 15 |
#endif |
| 16 |
-#if OPENSSL_VERSION_NUMBER < 0x10100000L |
| 17 |
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
| 18 |
EVP_CIPHER_CTX_cleanup(ctx->cipherCtx); |
| 19 |
#else |
| 20 |
EVP_CIPHER_CTX_reset(ctx->cipherCtx); |
| 21 |
@@ -764,7 +764,7 @@ static apr_status_t crypto_block_encrypt |
| 22 |
else { |
| 23 |
*outlen = len; |
| 24 |
} |
| 25 |
-#if OPENSSL_VERSION_NUMBER < 0x10100000L |
| 26 |
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
| 27 |
EVP_CIPHER_CTX_cleanup(ctx->cipherCtx); |
| 28 |
#else |
| 29 |
EVP_CIPHER_CTX_reset(ctx->cipherCtx); |
| 30 |
@@ -891,7 +891,7 @@ static apr_status_t crypto_block_decrypt |
| 31 |
if (!EVP_DecryptUpdate(ctx->cipherCtx, *out, &outl, (unsigned char *) in, |
| 32 |
inlen)) { |
| 33 |
#endif |
| 34 |
-#if OPENSSL_VERSION_NUMBER < 0x10100000L |
| 35 |
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
| 36 |
EVP_CIPHER_CTX_cleanup(ctx->cipherCtx); |
| 37 |
#else |
| 38 |
EVP_CIPHER_CTX_reset(ctx->cipherCtx); |
| 39 |
@@ -934,7 +934,7 @@ static apr_status_t crypto_block_decrypt |
| 40 |
else { |
| 41 |
*outlen = len; |
| 42 |
} |
| 43 |
-#if OPENSSL_VERSION_NUMBER < 0x10100000L |
| 44 |
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
| 45 |
EVP_CIPHER_CTX_cleanup(ctx->cipherCtx); |
| 46 |
#else |
| 47 |
EVP_CIPHER_CTX_reset(ctx->cipherCtx); |