HardenedBSD/src 22126eecrypto/openssl/crypto/ec ecp_nistz256_table.c curve25519.c, crypto/openssl/ssl s3_lib.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+14,894-9,513crypto/openssl/crypto/ec/ecp_nistz256_table.c
+10,184-10,183crypto/openssl/test/ecdsatest.h
+9,620-1,938crypto/openssl/test/quic_record_test.c
+3,601-3,206crypto/openssl/ssl/s3_lib.c
+2,877-2,722crypto/openssl/test/sslapitest.c
+2,625-2,478crypto/openssl/crypto/ec/curve25519.c
+43,801-30,0403,301 files not shown
+221,299-178,1013,307 files

HardenedBSD/ports ffb8d01graphics/glfw Makefile, math/octave pkg-plist

Merge branch 'freebsd/main' into hardenedbsd/main
DeltaFile
+94-17math/octave/pkg-plist
+8-8misc/freebsd-release-manifests/pkg-plist
+0-11math/octave/files/patch-liboctave_util_quit.h
+6-4graphics/glfw/Makefile
+0-9misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-14.4-BETA2
+9-0misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-14.4-BETA3
+117-49152 files not shown
+314-198158 files

HardenedBSD/src 06aeb11contrib/netbsd-tests/kernel t_ptrace_wait.c

t_ptrace_wait.c: clean up trailing whitespace

This is being done to aid with future potential updates of this file.

MFC after:      1 week

(cherry picked from commit fa3519d068d95f87e773d27f96e9f1e18f70075a)
DeltaFile
+12-12contrib/netbsd-tests/kernel/t_ptrace_wait.c
+12-121 files

HardenedBSD/ports 444f42emath/octave pkg-plist Makefile, math/octave-forge-irsa Makefile

math/octave: Update to 11.1.0.

- Bump portrevision of dependent ports.
DeltaFile
+94-17math/octave/pkg-plist
+0-11math/octave/files/patch-liboctave_util_quit.h
+3-3math/octave/Makefile
+3-3math/octave/distinfo
+1-1math/octave-forge-outliers/Makefile
+1-1math/octave-forge-irsa/Makefile
+102-36131 files not shown
+233-119137 files

HardenedBSD/src 12eecb3crypto/openssl/include/openssl ssl.h bio.h

OpenSSL: update vendor sources to match 3.5.5 content

MFC with:       f25b8c9fb4f58cf61adb47d7570abe7caa6d385d
MFC after:      1 week

(cherry picked from commit 1731fc70f7344af08db49b06c63c963fa12ee354)
DeltaFile
+1,423-1,416crypto/openssl/include/openssl/ssl.h
+538-532crypto/openssl/include/openssl/bio.h
+451-462crypto/openssl/include/openssl/asn1t.h
+403-358crypto/openssl/include/openssl/x509v3.h
+344-346crypto/openssl/include/openssl/x509.h
+331-330crypto/openssl/include/openssl/x509_vfy.h
+3,490-3,444946 files not shown
+15,475-11,782952 files

HardenedBSD/src f775385crypto/openssl/crypto/ec ecp_nistz256_table.c curve25519.c, crypto/openssl/ssl s3_lib.c

openssl: import 3.5.5

This change adds OpenSSL 3.5.5 from upstream [1].

The 3.5.5 artifact was been verified via PGP key [2] and by SHA256 checksum [3].

This is a security release, but also contains several bugfixes. All of
the CVE-worthy issues have already been addressed on the target
branch(es), so the net-result is that this is a bugfix release.

More information about the release (from a high level) can be found in
the release notes [4].

MFC after:      1 week

1. https://github.com/openssl/openssl/releases/download/openssl-3.5.5/openssl-3.5.5.tar.gz
2. https://github.com/openssl/openssl/releases/download/openssl-3.5.5/openssl-3.5.5.tar.gz.asc
3. https://github.com/openssl/openssl/releases/download/openssl-3.5.5/openssl-3.5.5.tar.gz.sha256
4. https://github.com/openssl/openssl/blob/openssl-3.5.5/NEWS.md

    [4 lines not shown]
DeltaFile
+14,894-9,513crypto/openssl/crypto/ec/ecp_nistz256_table.c
+10,184-10,183crypto/openssl/test/ecdsatest.h
+9,620-1,938crypto/openssl/test/quic_record_test.c
+3,601-3,206crypto/openssl/ssl/s3_lib.c
+2,877-2,722crypto/openssl/test/sslapitest.c
+2,625-2,478crypto/openssl/crypto/ec/curve25519.c
+43,801-30,0402,263 files not shown
+199,825-161,2952,269 files

HardenedBSD/src 66aff32sys/crypto/openssl arm_arch.h, sys/crypto/openssl/aarch64 vpsm4_ex-armv8.S

OpenSSL: commit sys/crypto changes for 3.5.5

These files were changed as part of the 3.5.4 -> 3.5.5 upgrade. Please
see the upstream release notes linked in
1731fc70f7344af08db49b06c63c963fa12ee354, et al, for more details.

MFC after:      6 days
MFC with:       1731fc70f7344af08db49b06c63c963fa12ee354
Fixes:  1731fc70f7344af08d ("OpenSSL: update vendor sources to match 3.5.5 content")

(cherry picked from commit e6c8997a8958c7aaec8e266d2eeefbfaa137e218)
DeltaFile
+897-1,244sys/crypto/openssl/powerpc64/aes-gcm-ppc.S
+897-1,244sys/crypto/openssl/powerpc64le/aes-gcm-ppc.S
+897-1,243sys/crypto/openssl/powerpc/aes-gcm-ppc.S
+160-171sys/crypto/openssl/arm_arch.h
+13-1sys/crypto/openssl/aarch64/vpsm4_ex-armv8.S
+2,864-3,9035 files

HardenedBSD/src cfd588asys/dev/asmc asmc.c

chore: asmc: additional style(9) cleanup

Pick out non-gratuitous style(9) changes suggested by `clang-format` on
the driver. This helps eliminate minor stylistic issues with spaces,
braces, line lengths, etc, so future functional changes in the driver
will be easier to pick out.

Many of the other `clang-format` suggested changes were not taken because
they were considerably more gratuitous.

No functional change intended.

MFC after:      1 week

(cherry picked from commit d76bb14e0224e235209d8c07ec132d602b18648b)
DeltaFile
+56-49sys/dev/asmc/asmc.c
+56-491 files

HardenedBSD/src df4cc7dsys/dev/asmc asmc.c

chore: asmc: minor code cleanup

- Use symbolic names in Mac definitions in lieu of the unrolled values
  they represent.
- Delete trailing whitespace.
- Fix indentation.

No functional change intended.

MFC after:      1 week

(cherry picked from commit a8f3c3b5d4d9dac1dafe4094fe35b30ffdf26178)
DeltaFile
+37-35sys/dev/asmc/asmc.c
+37-351 files

HardenedBSD/src a0d06f5sys/dev/acpica acpi.c

Make message added for Darwin OSI quirk more terse

The verbose message was way too verbose. Make it terse.

MFC after:      1 week
MFC with:       052a791b00 ("acpi: add Darwin OSI quirk for Apple Mac hardware")
Requested by:   kib

(cherry picked from commit 9c666de5b339d3c8f9bf3963691e4310e7d159cb)
DeltaFile
+6-8sys/dev/acpica/acpi.c
+6-81 files

HardenedBSD/src cd93714sys/dev/acpica acpi.c

acpi: add Darwin OSI quirk for Apple Mac hardware

Mac firmware hides the Intel integrated GPU (iGPU) on dual GPU x86
systems, i.e., with AMD/NVIDIA dGPUs, when the Darwin OSI is not
installed via ACPI.

Prior to this change, FreeBSD always used the dGPU. This is fine in
practice, but consumed more power than when the iGPU is used,
resulting in reduced battery life.

Linux handles this in `drivers/acpi/osi.c` by detecting Apple
hardware via DMI, disabling all Windows OSI strings, and
by explicitly installing the Darwin OSI ACPI handler. This change
applies equivalent logic to the acpi(4) driver on FreeBSD.

This feature can be enabled/disabled using the
`hw.acpi.apple_darwin_osi` tunable. Setting this tunable to `0`
restores the previous behavior by explicitly disabling the added
support.

    [5 lines not shown]
DeltaFile
+72-0sys/dev/acpica/acpi.c
+72-01 files

HardenedBSD/src 9ecdc69sys/dev/acpica acpi.c

Unbreak the build

Add the missing comma in the `device_printf` statement.

MFC after:      1 week
MFC with:       9c666de5b
Fixes:  9c666de5b ("Make message added for Darwin OSI quirk more terse")

(cherry picked from commit cc702c78f70f972cf2f8ea008752d96df1989988)
DeltaFile
+1-1sys/dev/acpica/acpi.c
+1-11 files

HardenedBSD/src 640c1eetools/build/mk OptionalObsoleteFiles.inc

Remove example tests when MK_EXAMPLES=no

This change cleans up example tests for atf, googletest, plain, and TAP
when MK_EXAMPLES=no. Not having this in results
`kyua test -k /usr/tests/share/examples/Kyuafile` being broken on a host
where the content in that directory tree is stale. I ran into that case
because at some point in time in the past I had specified
`MK_GOOGLETEST=no` one of my dev instances.

MFC after:      1 week

(cherry picked from commit cea2683bb691d6cbcfb7e342c497d018bba712c2)
DeltaFile
+26-0tools/build/mk/OptionalObsoleteFiles.inc
+26-01 files

HardenedBSD/src 5111a75sys/dev/asmc asmcvar.h asmc.c

asmc: Add support for MacBookPro11,5

  Add support for the MacBookPro11,5 (Mid 2015, 15-inch with AMD Radeon R9 M370X GPU)
  to the Apple SMC driver.

  Debug testing revealed this model lacks several SMC keys present on MacBookPro11,4
  (IBLC, ICMC, IC2C), that model-specific sensor definitions.

Differential Revision:  https://reviews.freebsd.org/D54665
Reviewed by:    adrian

(cherry picked from commit c498eaa2f9090d7bdc6456181d8bf74869288bbb)
DeltaFile
+35-0sys/dev/asmc/asmcvar.h
+7-0sys/dev/asmc/asmc.c
+42-02 files

HardenedBSD/src afa1058sys/dev/asmc asmc.c asmcvar.h

asmc: improve asmc_dumpall to read actual SMC key count

The asmc_dumpall debug function previously used a hardcoded loop limit
of 0x100 (256) keys with a "XXX magic number" comment.

This change improves asmc_dumpall to:

* Read the actual number of keys from the ASMC_NKEYS SMC key
* Print the key count being dumped for better debugging output
* Loop only up to the actual key count (e.g., 297 on Mac Mini 5,1)

This provides more accurate debug output and removes the magic number.

Tested on Mac Mini 5,1 (FreeBSD 16.0-CURRENT):

* Rebuild kernel with DEBUG enabled in asmc driver
* Boot with new kernel
* Verify dmesg shows "asmc_dumpall: dumping 297 keys" (or actual count)
* Verify all 297 keys are dumped

    [5 lines not shown]
DeltaFile
+17-8sys/dev/asmc/asmc.c
+1-0sys/dev/asmc/asmcvar.h
+18-82 files

HardenedBSD/src e6c36b2sys/x86/conf NOTES

sys/x86/NOTES: Add vt_efifb

Contrary to what is stated in commit f224591746bd ("Add ASMC_DEBUG make
option"), the various NOTES files should list all available options.

Since vt_efifb is supported also on i386, add it back to x86/NOTES
instead of amd64/NOTES.

Fixes:          f224591746bd ("Add ASMC_DEBUG make option")
Sponsored by:   The FreeBSD Foundation

(cherry picked from commit 67599eef01f5417715f673ec81fc1467917c7a10)
DeltaFile
+1-0sys/x86/conf/NOTES
+1-01 files

HardenedBSD/src 3eddfddsys/amd64/conf NOTES, sys/conf options.amd64

Add ASMC_DEBUG make option

This allows folks to enable debug statements in asmc(4) using kernel
configs via the `options ASMC_DEBUG` directive.

While here, remove a duplicate `device vt_efifb` directive in `NOTES`
as it's already handled in the `GENERIC` config

MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D54511

(cherry picked from commit f224591746bdaf14ad5f63de4738a3146cc2f55f)
DeltaFile
+11-9sys/dev/asmc/asmc.c
+4-3sys/amd64/conf/NOTES
+3-0sys/conf/options.amd64
+1-1sys/modules/asmc/Makefile
+19-134 files

HardenedBSD/src 3342ea3contrib/googletest/googletest/src gtest.cc

gtest.cc: declare fail_if_no_test_linked flag

Clang's -Wmissing-variable-declarations flags this as an issue since the
flag is only used in `gtest.cc`. Declare the flag beforehand to ensure
that the variable scope is properly limited to `gtest.cc`.

MFC after:      1 week
MFC with:       46333229c6a0187ebf231805682ee0bceed704d1
Ref:            https://github.com/google/googletest/pull/4898

(cherry picked from commit 3926ae98adfe4b2f1dd957cab353ba7ca11ce709)
DeltaFile
+1-0contrib/googletest/googletest/src/gtest.cc
+1-01 files

HardenedBSD/src 0029027contrib/googletest/googlemock/include/gmock gmock-matchers.h, contrib/googletest/googlemock/test gmock-matchers-containers_test.cc gmock-matchers-arithmetic_test.cc

GoogleTest: import 1.17.0

The changes between the two versions can be found in this diff of the
two release tags:
https://github.com/google/googletest/compare/v1.15.2...v1.17.0

One notable change is that GoogleTest 1.17.0 now requires C++-17 to
build.

MFC after:      1 week
Merge commit '3a4c29b5bed4ea20266ad9371fbfdc6bca088f92'

(cherry picked from commit 46333229c6a0187ebf231805682ee0bceed704d1)
DeltaFile
+347-80contrib/googletest/googlemock/include/gmock/gmock-matchers.h
+317-19contrib/googletest/googlemock/test/gmock-matchers-containers_test.cc
+210-27contrib/googletest/googlemock/test/gmock-matchers-arithmetic_test.cc
+157-34contrib/googletest/googletest/src/gtest.cc
+131-5contrib/googletest/googlemock/test/gmock-matchers-comparisons_test.cc
+95-39contrib/googletest/googletest/include/gtest/gtest-param-test.h
+1,257-20455 files not shown
+2,688-92061 files

HardenedBSD/src 7111f12. .clang-format

clang-format: adjust to sort C++ headers per style(9)

Many standard C++ headers do not have the .h file extension: some, such as
`iostream`, lack it; others have a .hpp file extension. Moreover, some
projects (like ATF/Kyua) also contain .ipp files, which are C++ "interface"
files.

Relax the regular expression to ensure that non-traditional C "system"
headers, C++ headers, etc, with angle brackets are sorted before
"local" headers.

MFC after:      1 week
Reviewed by: markj
Differential Revision: https://reviews.freebsd.org/D54401

(cherry picked from commit ab9b04736945537743eb0624ead7a4fa4b960783)
DeltaFile
+2-2.clang-format
+2-21 files

HardenedBSD/src 6ba1febtools/build/mk OptionalObsoleteFiles.inc

usr.bin/tftp: remove tests when MK_TFTP=no

These tests require the tftp client, which is not installed when
`MK_TFTP=no`. Remove them when that's not true.

MFC after:      1 week

(cherry picked from commit e1f36b9db9220cf51c6c3d2d2ad230fb9490bc3e)
DeltaFile
+3-0tools/build/mk/OptionalObsoleteFiles.inc
+3-01 files

HardenedBSD/src 26632bctools/build/mk OptionalObsoleteFiles.inc

tftpd: remove tests when MK_TFTP=no

MFC after:      1 week

(cherry picked from commit 1ccee516edb681b33182f0a57531752eb98ec838)
DeltaFile
+3-0tools/build/mk/OptionalObsoleteFiles.inc
+3-01 files

HardenedBSD/src d6eabaetools/build/mk OptionalObsoleteFiles.inc

Remove bsnmpd tests when MK_BSNMP == no

MFC after:      1 week

(cherry picked from commit 51509500acdc5d23285a962e9c55dd9e38d2b30a)
DeltaFile
+3-0tools/build/mk/OptionalObsoleteFiles.inc
+3-01 files

HardenedBSD/src 0306b70tools/build/mk OptionalObsoleteFiles.inc

usr.bin/factor: remove tests when MK_GAMES=no

factor(1) is only installed when MK_GAMES != no. Ergo, remove the tests
when that's not true.

MFC after:      1 week

(cherry picked from commit 7baa76c30c833750007e8d8823c9f5d94f5b2925)
DeltaFile
+4-0tools/build/mk/OptionalObsoleteFiles.inc
+4-01 files

HardenedBSD/src 3882602libexec/tftpd/tests functional.c

tftpd tests: clean trailing whitespace

No functional change intended.

MFC after:      1 week

(cherry picked from commit fd6217075e6a5926bdc627145b38194b6c5ba8da)
DeltaFile
+9-9libexec/tftpd/tests/functional.c
+9-91 files

HardenedBSD/src 968d6accontrib/netbsd-tests/sbin/newfs_msdos t_create.sh, sbin/newfs_msdos/tests Makefile

t_create.sh: use `ATF_TESTS_SH_SED` & remove local mods

This particular change replaces all local modifications to the test
script like so:
- Use `ATF_TESTS_SH_SED_test` with a sed(1) statement in the Makefile,
  instead of the equivalent local modifications.
- Remove the need for expecting the output of newfs_msdos to be empty.
  There isn't much to gain from deviating from the upstream NetBSD test--it's
  just another local modification that would need to be carried forward. If
  it's worth testing this FreeBSD-specific behavior, it should be in a
  FreeBSD-specific test.

This makes moving new modifications to the script easier moving forward.

MFC after:      1 week

(cherry picked from commit 411a566d565277e47c9644d19a5efa0fe5b00179)
DeltaFile
+2-12contrib/netbsd-tests/sbin/newfs_msdos/t_create.sh
+2-0sbin/newfs_msdos/tests/Makefile
+4-122 files

HardenedBSD/src d7363dccontrib/netbsd-tests/lib/libc/sys t_access.c

t_access.c: remove unnecessary local modification

FreeBSD 11.x is no longer supported; there's no reason why the
`FreeBSD_version__` check is still required (now).

MFC after:      1 week

(cherry picked from commit 35237ff9871478a92b34ced28a75487afd3562ff)
DeltaFile
+0-8contrib/netbsd-tests/lib/libc/sys/t_access.c
+0-81 files

HardenedBSD/src 3b7db69lib/libnetbsd/sys cdefs.h

libnetbsd: import the `__nothing` macro

This macro is widely used in new NetBSD tests. Please see the comment
next to the imported macro for more details on its use.

Obtained from:  NetBSD (c26cc77b3a0b2)
MFC after:      1 week

(cherry picked from commit faaeb6e62ae2f7371ac3ed37aae102f8e066a4b9)
DeltaFile
+14-1lib/libnetbsd/sys/cdefs.h
+14-11 files

HardenedBSD/src 6a6152bsys/dev/usb/wlan if_rsu.c

rsu: migrate to new net80211 encryption key API

Migrate to the new encryption key API rather than poking at the
key struct directly.

Differential Revision:  https://reviews.freebsd.org/D54483
DeltaFile
+12-7sys/dev/usb/wlan/if_rsu.c
+12-71 files

HardenedBSD/src 4544f34. .gitignore

.gitignore: ignore additional unwanted files

Ignore more files generated by toolchains, e.g., `.pico`, etc. Ignore the
`.DS_Store` produced by macOS as well because all they provide is
additional file metadata that shouldn't be committed to `git`.

MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D55096
DeltaFile
+10-0.gitignore
+10-01 files