From owner-svn-ports-all@freebsd.org  Mon Oct 15 17:51:00 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 21AAD10C3402;
 Mon, 15 Oct 2018 17:51:00 +0000 (UTC)
 (envelope-from jbeich@freebsd.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-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 CFF9C7DCF2;
 Mon, 15 Oct 2018 17:50:59 +0000 (UTC)
 (envelope-from jbeich@freebsd.org)
Received: by freefall.freebsd.org (Postfix, from userid 1354)
 id ADBF49C6C; Mon, 15 Oct 2018 17:50:59 +0000 (UTC)
From: Jan Beich <jbeich@FreeBSD.org>
To: Don Lewis <truckman@FreeBSD.org>
Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: Re: svn commit: r482164 - in head/editors: openoffice-4
 openoffice-4/files openoffice-devel openoffice-devel/files
References: <201810151727.w9FHRg1Z083071@repo.freebsd.org>
Date: Mon, 15 Oct 2018 19:50:56 +0200
In-Reply-To: <201810151727.w9FHRg1Z083071@repo.freebsd.org> (Don Lewis's
 message of "Mon, 15 Oct 2018 17:27:42 +0000 (UTC)")
Message-ID: <bm7v-xfnj-wny@FreeBSD.org>
MIME-Version: 1.0
Content-Type: text/plain
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.27
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: Mon, 15 Oct 2018 17:51:00 -0000

Don Lewis <truckman@FreeBSD.org> writes:

> ++        EVP_CIPHER_CTX *pAes_ctx;
> ++#if OPENSSL_VERSION_NUMBER < 0x10100000L
> +         EVP_CIPHER_CTX aes_ctx;
> +         EVP_CIPHER_CTX_init( &aes_ctx );
> +-        EVP_DecryptInit_ex( &aes_ctx, EVP_aes_128_ecb(), 0, pnKey, 0 );
> +-        EVP_CIPHER_CTX_set_padding( &aes_ctx, 0 );
> ++        pAes_ctx = &aes_ctx;
> ++#else
> ++        pAes_ctx = EVP_CIPHER_CTX_new();
> ++#endif
> ++        EVP_DecryptInit_ex( pAes_ctx, EVP_aes_128_ecb(), 0, pnKey, 0 );
> ++        EVP_CIPHER_CTX_set_padding( pAes_ctx, 0 );

Why conditional? Also, LibreSSL still uses non-opaque structs.