git: bb6e84c988d3 - main - poly1305: Don't export generic Poly1305_* symbols from xform_poly1305.c.

[John Baldwin]

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 <jhb at freebsd.org> wrote:
>>>
>>> The branch main has been updated by jhb:
>>>
>>> URL: https://cgit.FreeBSD.org/src/commit/?id=bb6e84c988d3f54eff602ed544ceaa9b9fe3e9ff
>>>
>>> commit bb6e84c988d3f54eff602ed544ceaa9b9fe3e9ff
>>> Author:     John Baldwin <jhb at FreeBSD.org>
>>> AuthorDate: 2021-03-05 17:47:58 +0000
>>> Commit:     John Baldwin <jhb at FreeBSD.org>
>>> 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