From owner-svn-ports-all@freebsd.org  Sun Oct 28 10:48:12 2018
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6A0BB1085C45;
 Sun, 28 Oct 2018 10:48:12 +0000 (UTC)
 (envelope-from danfe@freebsd.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
 (Client CN "freefall.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 1C4F57BD44;
 Sun, 28 Oct 2018 10:48:12 +0000 (UTC)
 (envelope-from danfe@freebsd.org)
Received: by freefall.freebsd.org (Postfix, from userid 1033)
 id 00DA3753; Sun, 28 Oct 2018 10:48:11 +0000 (UTC)
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>
References: <201810120735.w9C7ZlgE052626@repo.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201810120735.w9C7ZlgE052626@repo.freebsd.org>
User-Agent: Mutt/1.10.1 (2018-07-13)
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Oct 2018 10:48:12 -0000

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