On 8/8/25 20:25, Enji Cooper (yaneurabeya) wrote:

On Aug 8, 2025, at 3:39 PM, Enji Cooper (yaneurabeya) <yaneurab...@gmail.com> 
wrote:


On Aug 8, 2025, at 12:29 PM, Enji Cooper (yaneurabeya) <yaneurab...@gmail.com> 
wrote:


On Aug 8, 2025, at 12:22 PM, Pierre Pronchery <khor...@freebsd.org> wrote:

The branch main has been updated by khorben:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=e7be843b4a162e68651d3911f0357ed464915629

commit e7be843b4a162e68651d3911f0357ed464915629
Merge: d0ff5773cefa 1095efe41fee
Author:     Pierre Pronchery <khor...@freebsd.org>
AuthorDate: 2025-08-07 13:50:32 +0000
Commit:     Pierre Pronchery <khor...@freebsd.org>
CommitDate: 2025-08-07 13:50:32 +0000

  Merge commit '1095efe41feed8ea5a6fe5ca123c347ae0914801'

  Approved by:    philip (mentor)
  Sponsored by:   Alpha-Omega Beach Cleaning Project
  Sponsored by:   The FreeBSD Foundation

This commit didn’t note that OpenSSL 3.5.1 was imported. I think it’s best to 
revert the merge commit and correct the commit message. Feel free to copy the 
commit message from the original import, adding more details as needed.

The ossl module is broken on several architectures as well after this change: 
secure/lib/libcrypto/Makefile.asm was updated, but the files under 
sys/conf/files* and sys/modules/ossl/Makefile need to be updated.

        This should fix the ossl module (in theory), but sys/conf/files.* needs 
to be regenerated too: 
https://gist.github.com/ngie-eign/785663f814c3d56e6dc721e5e96457ca (I haven’t 
gotten around to automating this piece).
        All of the entries for sys/modules/ossl/Makefile were done with 
something like the following:

                % find -s ../../../sys/crypto/openssl/powerpc64le -name \*.S -exec 
basename {} \; | sed -e 's/^/\t/' -e 's/$/ \\/g' >> sys/modules/ossl/Makefile

        I’m going to look into shuffling the files.* pieces out into their own 
files so they can be touched without having to modify the top-level 
per-architecture conf files.
Thanks,

I don't know that we need to automate generating the list of files.  The
list of files doesn't change that often, and ossl doesn't use all of them.
The powerpc64 ossl support is still in a review that was waiting for this
merge to land for example, and I know for x86-64 and armv8 we only use a
subset of the assembly files for ossl.  Many of the changes in your diff
aren't correct as those functions aren't used by ossl in fact.

--
John Baldwin


Reply via email to