From owner-dev-commits-src-all@freebsd.org Mon Mar 8 18:42:31 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 73AD5552FD1; Mon, 8 Mar 2021 18:42:31 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 4DvRzC2qdkz3J6j; Mon, 8 Mar 2021 18:42:31 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro.local (ralph.baldwin.cx [66.234.199.215]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id B4E26D68C; Mon, 8 Mar 2021 18:42:30 +0000 (UTC) (envelope-from jhb@FreeBSD.org) To: Stefan Esser , Kyle Evans Cc: src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202103051755.125HtZsc073704@gitrepo.freebsd.org> <3e76fccd-efeb-1479-7418-7e69bed98915@freebsd.org> From: John Baldwin Subject: Re: git: bb6e84c988d3 - main - poly1305: Don't export generic Poly1305_* symbols from xform_poly1305.c. Message-ID: <196e118d-c41d-505e-2750-b05ef4328ae7@FreeBSD.org> Date: Mon, 8 Mar 2021 10:42:26 -0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: <3e76fccd-efeb-1479-7418-7e69bed98915@freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Mar 2021 18:42:31 -0000 On 3/5/21 12:27 PM, Stefan Esser wrote: > Am 05.03.21 um 21:05 schrieb Kyle Evans: >> On Fri, Mar 5, 2021 at 11:55 AM John Baldwin wrote: >>> >>> The branch main has been updated by jhb: >>> >>> URL: https://cgit.FreeBSD.org/src/commit/?id=bb6e84c988d3f54eff602ed544ceaa9b9fe3e9ff >>> >>> commit bb6e84c988d3f54eff602ed544ceaa9b9fe3e9ff >>> Author: John Baldwin >>> AuthorDate: 2021-03-05 17:47:58 +0000 >>> Commit: John Baldwin >>> CommitDate: 2021-03-05 17:55:11 +0000 >>> >>> poly1305: Don't export generic Poly1305_* symbols from xform_poly1305.c. >>> >>> There currently isn't a need to provide a public interface to a >>> software Poly1305 implementation beyond what is already available via >>> libsodium's APIs and these symbols conflict with symbols shared within >>> the ossl.ko module between ossl_poly1305.c and ossl_chacha20.c. >>> >>> Reported by: se, kp >>> Fixes: 78991a93eb9d >>> Sponsored by: Netflix >>> --- >>> sys/opencrypto/xform_poly1305.c | 43 ++++++++++++----------------------------- >>> sys/opencrypto/xform_poly1305.h | 16 --------------- >>> 2 files changed, 12 insertions(+), 47 deletions(-) >> >> xform_poly1305.h also needs to stop being grouped in >> ^/include/Makefile (reported by jenkins via np) > > AFAICT, sys/opencrypto/xform_poly1305.h needs to be restored ... > > It is needed during buildworld (and present in stable/13). Removing it from include/Makefile as scottl@ and jkim@ did is the right fix. It was a kernel-only header with no userland-usable parts. I need to double check, but probably only cryptodev.h should be installed in /usr/include/crypto as the rest of those headers are all for kernel-only APIs. It looks like I actually need to add some missing entries to ObsoleteFiles.inc for some headers that were removed in 13. Ahhh, we used to just install *.h from sys/opencrypto (which is wrong) and it was switched in f61a3898bb989 to list files explicitly, but that is somewhat why removing headers in the past didn't trigger build breakage. -- John Baldwin