HardenedBSD/src d5ab3e1secure/lib/libcrypto/arch/amd64 sha256-mb-x86_64.S ecp_nistz256-x86_64.S, secure/lib/libcrypto/arch/i386 sha256-586.S ecp_nistz256-x86.S

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
DeltaFile
+0-13,612secure/lib/libcrypto/arch/i386/sha256-586.S
+0-10,584secure/lib/libcrypto/arch/i386/ecp_nistz256-x86.S
+0-8,016secure/lib/libcrypto/arch/i386/sha1-586.S
+0-8,006secure/lib/libcrypto/arch/amd64/sha256-mb-x86_64.S
+0-7,365secure/lib/libcrypto/arch/amd64/ecp_nistz256-x86_64.S
+0-7,325secure/lib/libcrypto/arch/amd64/sha1-mb-x86_64.S
+0-54,908246 files not shown
+37,611-312,563252 files

HardenedBSD/src f0d83d5sys/crypto/openssl/aarch64 aes-gcm-armv8_64.S aesv8-armx.S, sys/crypto/openssl/amd64 aes-x86_64.S bsaes-x86_64.S

ossl: Update the generated assembly files from OpenSSL 3.0.

Tested with:    cryptocheck -d ossl0 -a all -z on amd64
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D41568

(cherry picked from commit c0855eaa3ee9614804b6bd6a255aa9f71e095f43)
DeltaFile
+6,644-0sys/crypto/openssl/i386/aes-586.S
+6,390-0sys/crypto/openssl/aarch64/aes-gcm-armv8_64.S
+2,680-0sys/crypto/openssl/amd64/aes-x86_64.S
+2,619-0sys/crypto/openssl/amd64/bsaes-x86_64.S
+2,470-46sys/crypto/openssl/aarch64/aesv8-armx.S
+1,101-1,044sys/crypto/openssl/aarch64/chacha-armv8.S
+21,904-1,09093 files not shown
+37,538-1,95999 files

HardenedBSD/src cb0c532contrib/less screen.c, sys/kern vfs_subr.c

Merge remote-tracking branch 'internal/freebsd/13-stable/main' into hardened/13-stable/master

Conflicts:
        bin/cat/cat.c
        lib/libc/gen/auxv.3
        libexec/rc/rc.d/archdep
        share/man/man5/src.conf.5
        sys/amd64/amd64/elf_machdep.c
        sys/amd64/cloudabi64/cloudabi64_sysvec.c
        sys/amd64/linux/linux_sysvec.c
        sys/amd64/linux32/linux32_sysvec.c
        sys/arm/arm/elf_machdep.c
        sys/arm64/linux/linux_sysvec.c
        sys/compat/ia32/ia32_sysvec.c
        sys/i386/cloudabi32/cloudabi32_sysvec.c
        sys/i386/linux/imgact_linux.c
        sys/i386/linux/linux_sysvec.c
        sys/kern/imgact_aout.c
        sys/kern/kern_module.c

    [22 lines not shown]
DeltaFile
+175-44sys/vm/vm_map.c
+97-38sys/kern/vfs_subr.c
+64-0tests/sys/vm/stack/stack_dlopen_exec_test.c
+57-0tests/sys/vm/stack/stack_mprotect_exec_test.c
+42-11contrib/less/screen.c
+51-0tests/sys/vm/mmap_map_32bit_helper.c
+486-9331,889 files not shown
+1,170-49,85331,895 files

HardenedBSD/src f0d37bbsecure/lib/libcrypto/arch/amd64 sha256-mb-x86_64.S ecp_nistz256-x86_64.S, secure/lib/libcrypto/arch/i386 sha256-586.S ecp_nistz256-x86.S

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+0-13,612secure/lib/libcrypto/arch/i386/sha256-586.S
+0-10,584secure/lib/libcrypto/arch/i386/ecp_nistz256-x86.S
+0-8,016secure/lib/libcrypto/arch/i386/sha1-586.S
+0-8,006secure/lib/libcrypto/arch/amd64/sha256-mb-x86_64.S
+0-7,365secure/lib/libcrypto/arch/amd64/ecp_nistz256-x86_64.S
+0-7,325secure/lib/libcrypto/arch/amd64/sha1-mb-x86_64.S
+0-54,908241 files not shown
+37,583-312,547247 files

HardenedBSD/src 4924ee4secure/lib/libcrypto/arch/amd64 sha256-mb-x86_64.S ecp_nistz256-x86_64.S, secure/lib/libcrypto/arch/i386 sha256-586.S ecp_nistz256-x86.S

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+0-13,612secure/lib/libcrypto/arch/i386/sha256-586.S
+0-10,584secure/lib/libcrypto/arch/i386/ecp_nistz256-x86.S
+0-8,016secure/lib/libcrypto/arch/i386/sha1-586.S
+0-8,006secure/lib/libcrypto/arch/amd64/sha256-mb-x86_64.S
+0-7,365secure/lib/libcrypto/arch/amd64/ecp_nistz256-x86_64.S
+0-7,325secure/lib/libcrypto/arch/amd64/sha1-mb-x86_64.S
+0-54,908241 files not shown
+37,583-312,547247 files

HardenedBSD/src c0855easys/crypto/openssl/aarch64 aes-gcm-armv8_64.S aesv8-armx.S, sys/crypto/openssl/amd64 aes-x86_64.S bsaes-x86_64.S

ossl: Update the generated assembly files from OpenSSL 3.0.

Tested with:    cryptocheck -d ossl0 -a all -z on amd64
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D41568
DeltaFile
+6,644-0sys/crypto/openssl/i386/aes-586.S
+6,390-0sys/crypto/openssl/aarch64/aes-gcm-armv8_64.S
+2,680-0sys/crypto/openssl/amd64/aes-x86_64.S
+2,619-0sys/crypto/openssl/amd64/bsaes-x86_64.S
+2,470-46sys/crypto/openssl/aarch64/aesv8-armx.S
+1,101-1,044sys/crypto/openssl/aarch64/chacha-armv8.S
+21,904-1,09093 files not shown
+37,538-1,95999 files

HardenedBSD/src 4fbf14esys/amd64/include _align.h _inttypes.h, sys/dev/mpt/mpilib mpi_ioc.h

sys: Remove $FreeBSD$: one-line .c comment pattern

Remove /^/[*/]\s*\$FreeBSD\$.*\n/

Similar commit in current:
(cherry picked from commit 71625ec9ad2a)
DeltaFile
+0-1sys/dev/mpt/mpilib/mpi_ioc.h
+0-1sys/amd64/include/_align.h
+0-1sys/amd64/include/_inttypes.h
+0-1sys/amd64/include/_limits.h
+0-1sys/amd64/include/_stdint.h
+0-1sys/amd64/include/_types.h
+0-61,044 files not shown
+0-1,0501,050 files

HardenedBSD/src acf3d6esys/arm64/arm64 pl031_rtc.c, sys/compat/linux linux_socket.c

Merge remote-tracking branch 'internal/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        tools/build/options/WITH_OFED_EXTRA (deleted)
        usr.sbin/rpc.yppasswdd/Makefile (unresolved)
DeltaFile
+697-0sys/dev/virtio/gpu/virtio_gpu.c
+454-0sys/dev/virtio/gpu/virtio_gpu.h
+153-0sys/arm64/arm64/pl031_rtc.c
+80-52sys/compat/linux/linux_socket.c
+107-0tools/build/freebsd-yeet.pl
+87-11sys/dev/ixl/ixl_pf_main.c
+1,578-6331,042 files not shown
+2,188-48,40531,048 files

HardenedBSD/src 2226d61sys/arm64/arm64 pl031_rtc.c, sys/compat/linux linux_socket.c

Merge remote-tracking branch 'internal/freebsd/current/main' into hardened/current/master

Conflicts:
        bin/cat/cat.c (unresolved)
        lib/csu/aarch64/crt1_c.c (unresolved)
        lib/csu/amd64/crt1_c.c (unresolved)
        lib/csu/i386/crt1_c.c (unresolved)
        lib/csu/powerpc64/crt1_c.c (unresolved)
        lib/csu/powerpc64/reloc.c (unresolved)
        lib/csu/riscv/crt1_c.c (unresolved)
        lib/libc/gen/auxv.3 (unresolved)
        lib/libcasper/services/cap_net/cap_net.3 (unresolved)
        sys/amd64/amd64/elf_machdep.c (unresolved)
        sys/amd64/include/sgxreg.h (deleted)
        sys/amd64/linux/linux_sysvec.c (unresolved)
        sys/amd64/linux32/linux32_sysvec.c (unresolved)
        sys/amd64/sgx/sgx.c (deleted)
        sys/amd64/sgx/sgx_linux.c (deleted)
        sys/amd64/sgx/sgxvar.h (deleted)

    [29 lines not shown]
DeltaFile
+697-0sys/dev/virtio/gpu/virtio_gpu.c
+454-0sys/dev/virtio/gpu/virtio_gpu.h
+153-0sys/arm64/arm64/pl031_rtc.c
+80-52sys/compat/linux/linux_socket.c
+107-0tools/build/freebsd-yeet.pl
+87-11sys/dev/ixl/ixl_pf_main.c
+1,578-6331,044 files not shown
+2,304-48,37531,050 files

HardenedBSD/src 71625ecsys/dev/ixl i40e_osdep.h i40e_prototype.h

sys: Remove $FreeBSD$: one-line .c comment pattern

Remove /^/[*/]\s*\$FreeBSD\$.*\n/
DeltaFile
+0-1sys/dev/ixl/i40e_osdep.h
+0-1sys/dev/ixl/i40e_prototype.h
+0-1sys/dev/ixl/i40e_register.h
+0-1sys/dev/ixl/i40e_status.h
+0-1sys/dev/ixl/i40e_type.h
+0-1sys/dev/ixl/if_ixl.c
+0-61,230 files not shown
+0-1,2361,236 files

HardenedBSD/src 34ab832contrib/binutils Makefile.in, contrib/terminus ter-u32n.bdf ter-u32b.bdf

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        Makefile.inc1 (unresolved)
        share/man/man5/src.conf.5 (unresolved)
        targets/pseudo/bootstrap-tools/Makefile (unresolved)
        tools/build/options/WITH_OFED_EXTRA (deleted)
DeltaFile
+71,590-432tools/tools/locale/etc/final-maps/widths.txt
+52,834-0contrib/terminus/ter-u32n.bdf
+52,834-0contrib/terminus/ter-u32b.bdf
+0-49,485contrib/binutils/Makefile.in
+47,418-0contrib/terminus/ter-u28b.bdf
+47,418-0contrib/terminus/ter-u28n.bdf
+272,094-49,91725,491 files not shown
+3,013,181-3,285,38525,497 files

HardenedBSD/src c7ce6b0contrib/libstdc++ configure, lib/clang/liblldb LLDBWrapLua.cpp

Merge branch 'hardened/current/master' into hardened/current/uninit-autoinit
DeltaFile
+0-111,817contrib/libstdc++/configure
+72,183-0lib/clang/liblldb/LLDBWrapLua.cpp
+71,590-432tools/tools/locale/etc/final-maps/widths.txt
+31,726-39,305share/ctypedef/ja_JP.eucJP.src
+59,521-0sys/contrib/dev/iwm/iwm-9000-34.fw.uu
+59,517-0sys/contrib/dev/iwm/iwm-9260-34.fw.uu
+294,537-151,55460,534 files not shown
+10,288,584-10,879,88160,540 files

HardenedBSD/src 7bf00cdsecure/lib/libcrypto/amd64 sha256-mb-x86_64.S, secure/lib/libcrypto/i386 sha256-586.S ecp_nistz256-x86.S

Merge branch 'freebsd/current/master' into hardened/current/master

* freebsd/current/master:
  geom_ctl.c: remove stale header files
  arm64: add uhci to GENERIC
  Add a kernel crypto driver using assembly routines from OpenSSL.
  Fix linprocfs(4) /proc/self/mem semantics to more closely match Linux. Steam's Anti-Cheat might depend on it.
  Fix potential race condition in linux stat(2).
  Move generated OpenSSL assembly routines into the kernel sources.
  Use a template assembly file to generate the embedded MFS.
DeltaFile
+0-13,569secure/lib/libcrypto/i386/sha256-586.S
+13,569-0sys/crypto/openssl/i386/sha256-586.S
+0-10,331secure/lib/libcrypto/i386/ecp_nistz256-x86.S
+10,331-0sys/crypto/openssl/i386/ecp_nistz256-x86.S
+0-7,950secure/lib/libcrypto/amd64/sha256-mb-x86_64.S
+7,950-0sys/crypto/openssl/amd64/sha256-mb-x86_64.S
+31,850-31,850183 files not shown
+205,946-204,682189 files

HardenedBSD/src b4760acsecure/lib/libcrypto/amd64 sha256-mb-x86_64.S, secure/lib/libcrypto/i386 sha256-586.S ecp_nistz256-x86.S

Move generated OpenSSL assembly routines into the kernel sources.

Sponsored by:   Netflix
DeltaFile
+0-13,569secure/lib/libcrypto/i386/sha256-586.S
+13,569-0sys/crypto/openssl/i386/sha256-586.S
+0-10,331secure/lib/libcrypto/i386/ecp_nistz256-x86.S
+10,331-0sys/crypto/openssl/i386/ecp_nistz256-x86.S
+7,950-0sys/crypto/openssl/amd64/sha256-mb-x86_64.S
+0-7,950secure/lib/libcrypto/amd64/sha256-mb-x86_64.S
+31,850-31,850158 files not shown
+204,615-204,615164 files

HardenedBSD/src bc3d569 (r366898)secure/lib/libcrypto/amd64 sha256-mb-x86_64.S, secure/lib/libcrypto/i386 sha256-586.S ecp_nistz256-x86.S

Move generated OpenSSL assembly routines into the kernel sources.

Sponsored by:   Netflix
DeltaFile
+13,569-0sys/crypto/openssl/i386/sha256-586.S
+0-13,569secure/lib/libcrypto/i386/sha256-586.S
+10,331-0sys/crypto/openssl/i386/ecp_nistz256-x86.S
+0-10,331secure/lib/libcrypto/i386/ecp_nistz256-x86.S
+0-7,950secure/lib/libcrypto/amd64/sha256-mb-x86_64.S
+7,950-0sys/crypto/openssl/amd64/sha256-mb-x86_64.S
+31,850-31,850158 files not shown
+204,615-204,615164 files