From nobody Thu May 25 16:49:42 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QRvD826qzz4VBw4; Thu, 25 May 2023 16:49:44 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QRvD81QPZz3hZN; Thu, 25 May 2023 16:49:44 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685033384; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wjZ9CdjFRrm51CsyAeDyHUoU9xFUERk/O6KF1rmoNaY=; b=pWC1lbtlKWFiX97R6rMKtMDCpZtO4iEddfeDAEfWTd2VOTLjMQ/G2pfqBNFYUFhLQNgidm qrWXbtb0Xq0q284jzTxzyuZ6zQMA0vyAFajJJtJp5oGdFDKVCSeuEv+GQ8V1KfZJHH6pq/ CA2HMxIUMDLVmtCf5pzRrxemmuvJdCFxzGGkPmWLGElunxg96/qBiwii5ucTw7Y6+LFCRe H/FMMXobxv9Ouuj864pSV/UOV14yXtkGRqUnceyhbac3VomsgaHJhaBItka+MFG3dklfoD 2VQNR3TUSnzfXnW9fRMEyAHqsJFTxULhTlWUzp6/dJlbD7Dyk3IsqkLaNn+m/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685033384; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wjZ9CdjFRrm51CsyAeDyHUoU9xFUERk/O6KF1rmoNaY=; b=lKmQ4/hw0+kgiPZCb7SI+YvMbFw5GwTOOHO3aIR0j60QHpVtielrIK0cTNCF1s84HC0thE EZKrKM+oxM/XhobgTvfJYu+sPkCEcIyPS2Vi97W0xx3FJseRnE9iV4ES3JQlXxghekt/KW m6GTWt96E6VFgv5PwQ2ygSslLUC6MMfi0pYaZr0ZYLqpMmUUehplQuyQR/kqltnT6JDx/T /58KDHt4C2WUS3yNMn8hVVwkMAaE0lrbMIBXaSSzV6bMEV6DH7a5+BGYDf/6GU3gcTqrPQ qMdPezIs0RbKYluUi/oH2Img5YM3r/YKp1PkwMHA5ewW+QSr2wh2da333JXewQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685033384; a=rsa-sha256; cv=none; b=KFtTxF7/lnI+gvs3YdYGbyKLY0yz6UH3UaC7D/KaD8IDDJTMkHMMIz36c9pbVmo7ZGVaCA HkWXuI4HzwBScKhANNJeqHIMrLnI8g3AUMsbtRSaKAnvH6IA9Ss0mChWGK1iit7JcmIyCG +gtxXznFKhwpKdiwRHkFu+A71Z23i6TW5ZiDimo2IwzE2P3x0GFS1PYNGvWUem+xUIupCL qGF3fCVDf67WtxfPdL17BGv1pv6gIgRmt72yP8XBLLtF+IsVGDyUhB1AmxureBE7+x/p6x +oegnWKfP9Kt3lPpO0imCRoV8kyge5xuF/8bd9iFV89xtro0fMX2C7k4su00vQ== Received: from [IPV6:2601:648:8680:16b0:90c3:f402:d706:387d] (unknown [IPv6:2601:648:8680:16b0:90c3:f402:d706:387d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4QRvD74BJKzYcY; Thu, 25 May 2023 16:49:43 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Thu, 25 May 2023 09:49:42 -0700 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: Re: git: 01aee8c92d93 - main - libfetch: do not call deprecated OpenSSL functions Content-Language: en-US To: Ed Maste , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202305251622.34PGM6mN060353@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202305251622.34PGM6mN060353@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-ThisMailContainsUnwantedMimeParts: N On 5/25/23 9:22 AM, Ed Maste wrote: > The branch main has been updated by emaste: > > URL: https://cgit.FreeBSD.org/src/commit/?id=01aee8c92d936470c44821736e0d9e11ed7ce812 > > commit 01aee8c92d936470c44821736e0d9e11ed7ce812 > Author: Ed Maste > AuthorDate: 2023-05-25 15:24:48 +0000 > Commit: Ed Maste > CommitDate: 2023-05-25 16:20:15 +0000 > > libfetch: do not call deprecated OpenSSL functions > > As of OpenSSL 1.1 SSL_library_init() and SSL_load_error_strings() are > deprecated. There are replacement initialization functions but they do > not need to be called: "As of version 1.1.0 OpenSSL will automatically > allocate all resources that it needs so no explicit initialisation is > required." > > Wrap both calls in an OPENSSL_VERSION_NUMBER block. > > PR: 271615 > Reviewed by: Pierre Pronchery > Event: Kitchener-Waterloo Hackathon 202305 > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D40265 > --- > lib/libfetch/common.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c > index 7bf487b0db1d..f2122d7f45c9 100644 > --- a/lib/libfetch/common.c > +++ b/lib/libfetch/common.c > @@ -1204,6 +1204,7 @@ fetch_ssl(conn_t *conn, const struct url *URL, int verbose) > X509_NAME *name; > char *str; > > +#if OPENSSL_VERSION_NUMBER < 0x10100000L > /* Init the SSL library and context */ > if (!SSL_library_init()){ > fprintf(stderr, "SSL library init failed\n"); > @@ -1211,6 +1212,7 @@ fetch_ssl(conn_t *conn, const struct url *URL, int verbose) > } > > SSL_load_error_strings(); > +#endif Should we just remove this code outright? I don't think there's any value in supporting pre-1.1 OpenSSL versions? -- John Baldwin