Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 28 Oct 2018 10:48:11 +0000
From:      Alexey Dokuchaev <danfe@freebsd.org>
To:        "Jason E. Hale" <jhale@freebsd.org>
Cc:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   Re: svn commit: r481881 - in head/archivers/libunrar5: . files
Message-ID:  <20181028104811.GB20356@FreeBSD.org>
In-Reply-To: <201810120735.w9C7ZlgE052626@repo.freebsd.org>
References:  <201810120735.w9C7ZlgE052626@repo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, Oct 12, 2018 at 07:35:47AM +0000, Jason E. Hale wrote:
> New Revision: 481881
> URL: https://svnweb.freebsd.org/changeset/ports/481881
> 
> Log:
>   Fix build with OpenSSL 1.1.x
>   
>   Reported by:	pkg-fallout (head)
> 
> ...
> ++#if OPENSSL_VERSION_NUMBER < 0x10100000L
>  +  EVP_CIPHER_CTX_init(&ctx);
>  +  EVP_CipherInit_ex(&ctx, cipher, NULL, key, initVector, Encrypt);
>  +  EVP_CIPHER_CTX_set_padding(&ctx, 0);

Shouldn't it read 0x10100005L instead?

>   class Rijndael
>   { 
>     private:
>  +#ifdef OPENSSL_AES
> ++#if OPENSSL_VERSION_NUMBER < 0x10100000L
>  +    EVP_CIPHER_CTX ctx;
> ++#else
> ++    EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
> ++#endif

This looks fishy; I think EVP_CIPHER_CTX_new() should be called in ctor and
EVP_CIPHER_CTX_free() in dtor (the latter is missing altogether).

./danfe



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20181028104811.GB20356>