Attachment 186892 Details for Bug 222762 – Patch to add in the files/ directory of the port

Patch to add in the files/ directory of the port

patch-apr-util__crypto__apr_crypto_openssl.c (text/x-csrc), 1.71 KB, created by Stéphane Lapie on 2017-10-03 19:53:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stéphane Lapie

Created: 2017-10-03 19:53:17 UTC

Size: 1.71 KB

patch

obsolete

>--- apr-util-1.6.0/crypto/apr_crypto_openssl.c.orig	2017-05-04 01:18:52.000000000 +0200
>+++ apr-util-1.6.0/crypto/apr_crypto_openssl.c	2017-10-03 21:37:50.760367000 +0200
>@@ -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);

Flags:

brnrd: maintainer-approval? (apache)

Actions: View

Attachments on bug 222762: 186892 | 186990 | 187839