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

HardenedBSD/src 61eedeashare/colldef zh_CN.GB18030.src zh_CN.UTF-8.src, share/ctypedef C.UTF-8.src

Merge remote-tracking branch 'upstream/hardened/current/master' into hardened/current/safestack-arm64

Conflicts:
        contrib/llvm/tools/clang/lib/Driver/ToolChains/FreeBSD.cpp (unresolved)
        lib/libclang_rt/Makefile (unresolved)
DeltaFile
+70,239-70,390share/colldef/zh_CN.GB18030.src
+42,270-42,546share/colldef/zh_CN.UTF-8.src
+36,985-37,199share/colldef/zh_CN.GBK.src
+20,052-20,058share/colldef/ko_KR.UTF-8.src
+35,064-0share/ctypedef/C.UTF-8.src
+16,817-16,879share/colldef/zh_CN.GB2312.src
+221,427-187,07215,426 files not shown
+2,012,059-1,265,00315,432 files

HardenedBSD/src 4050f2bcontrib/dialog configure, contrib/libevent configure ltmain.sh

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

Conflicts:
        ObsoleteFiles.inc (unresolved)
        lib/clang/include/lld/Common/Version.inc (unresolved)
        lib/csu/amd64/Makefile (unresolved)
        share/man/man5/src.conf.5 (unresolved)
DeltaFile
+18,613-0contrib/libevent/configure
+12,218-3,527contrib/dialog/configure
+11,147-0contrib/libevent/ltmain.sh
+5,721-5,307crypto/openssl/crypto/objects/obj_dat.h
+10,339-0secure/lib/libcrypto/i386/ecp_nistz256-x86.S
+8,369-0contrib/libevent/m4/libtool.m4
+66,407-8,8345,326 files not shown
+730,336-501,3415,332 files

HardenedBSD/src c6879c6 (r339670)contrib/dialog configure, contrib/libevent configure ltmain.sh

Merge ^/head r339015 through r339669.
DeltaFile
+18,613-0contrib/libevent/configure
+12,218-3,527contrib/dialog/configure
+11,147-0contrib/libevent/ltmain.sh
+5,721-5,307crypto/openssl/crypto/objects/obj_dat.h
+10,339-0secure/lib/libcrypto/i386/ecp_nistz256-x86.S
+8,369-0contrib/libevent/m4/libtool.m4
+66,407-8,8345,343 files not shown
+730,281-501,5355,349 files

HardenedBSD/src 6c8ec16contrib/dialog configure, contrib/libevent configure ltmain.sh

Merge ^/head r339015 through r339669.
DeltaFile
+18,613-0contrib/libevent/configure
+12,218-3,527contrib/dialog/configure
+11,147-0contrib/libevent/ltmain.sh
+5,721-5,307crypto/openssl/crypto/objects/obj_dat.h
+10,339-0secure/lib/libcrypto/i386/ecp_nistz256-x86.S
+8,369-0contrib/libevent/m4/libtool.m4
+66,407-8,8345,343 files not shown
+730,281-501,5355,349 files

HardenedBSD/src 84ee88ccrypto/openssl/crypto/ec curve25519.c, crypto/openssl/crypto/objects obj_dat.h

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/unstable

* origin/hardened/current/master: (99 commits)
  Upgrade to 1.8.1.
  Improved substitution logic for Unbound man pages.
  Update Makefile for 1.8.0, apologies for the breakage.
  HBSD: Resolve merge conflicts
  Add myself to committers-src.dot and calendar.freebsd.
  Don't include the broken riscv64sf TARGET_ARCH in universe.
  Update head from ALPHA8 to ALPHA9 as part of the 12.0-RELEASE cycle.
  Regenerated assorted syscall related files after:  - r327895: Implement 'domainset'...  - r329876: Use linux types for linux-specific syscalls
  Use mbuf defines to construct csum offload masks rather than literals
  Fix portability issues with the Capsicum patch committed in r339216:
  Switch ntp's embedded libevent to 2.1.18
  Update sendmail to work with the OpenSSL 1.1 API.
  Regenerate ssh_namespace.h for OpenSSL 1.1.1 update
  Fix a mismerge from head to projects/openssl111.
  MFH r339206-r339212, r339215-r339239
  libcrypto: have buildinf.h depend on Makefile

    [5 lines not shown]
DeltaFile
+5,721-5,307crypto/openssl/crypto/objects/obj_dat.h
+10,339-0secure/lib/libcrypto/i386/ecp_nistz256-x86.S
+0-7,030crypto/openssl/doc/ssleay.txt
+3,465-3,170crypto/openssl/ssl/s3_lib.c
+1,907-3,750crypto/openssl/ssl/t1_lib.c
+5,457-0crypto/openssl/crypto/ec/curve25519.c
+26,889-19,2573,836 files not shown
+514,792-411,1123,842 files

HardenedBSD/src ff683b5crypto/openssl/crypto/ec curve25519.c, crypto/openssl/crypto/objects obj_dat.h

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

Conflicts:
        contrib/telnet/libtelnet/pk.c (unresolved)
        secure/lib/libssl/Makefile (unresolved)
DeltaFile
+5,721-5,307crypto/openssl/crypto/objects/obj_dat.h
+10,339-0secure/lib/libcrypto/i386/ecp_nistz256-x86.S
+0-7,030crypto/openssl/doc/ssleay.txt
+3,465-3,170crypto/openssl/ssl/s3_lib.c
+1,907-3,750crypto/openssl/ssl/t1_lib.c
+5,457-0crypto/openssl/crypto/ec/curve25519.c
+26,889-19,2573,735 files not shown
+511,345-410,1673,741 files

HardenedBSD/src 1da7787 (r339270)crypto/openssl/crypto/ec curve25519.c, crypto/openssl/crypto/objects obj_dat.h

Merge the remainder of the projects/openssl111 branch to head.

- Update OpenSSL to version 1.1.1.
- Update Kerberos/Heimdal API for OpenSSL 1.1.1 compatibility.
- Bump __FreeBSD_version.

Approved by:    re (kib)
Sponsored by:   The FreeBSD Foundation
DeltaFile
+5,721-5,307crypto/openssl/crypto/objects/obj_dat.h
+10,339-0secure/lib/libcrypto/i386/ecp_nistz256-x86.S
+0-7,030crypto/openssl/doc/ssleay.txt
+3,465-3,170crypto/openssl/ssl/s3_lib.c
+1,907-3,750crypto/openssl/ssl/t1_lib.c
+5,457-0crypto/openssl/crypto/ec/curve25519.c
+26,889-19,2573,627 files not shown
+508,851-408,3143,633 files

HardenedBSD/src 05d1d50crypto/openssl/crypto/ec curve25519.c, crypto/openssl/crypto/objects obj_dat.h

Merge the remainder of the projects/openssl111 branch to head.

- Update OpenSSL to version 1.1.1.
- Update Kerberos/Heimdal API for OpenSSL 1.1.1 compatibility.
- Bump __FreeBSD_version.

Approved by:    re (kib)
Sponsored by:   The FreeBSD Foundation
DeltaFile
+5,721-5,307crypto/openssl/crypto/objects/obj_dat.h
+10,339-0secure/lib/libcrypto/i386/ecp_nistz256-x86.S
+0-7,030crypto/openssl/doc/ssleay.txt
+3,465-3,170crypto/openssl/ssl/s3_lib.c
+1,907-3,750crypto/openssl/ssl/t1_lib.c
+5,457-0crypto/openssl/crypto/ec/curve25519.c
+26,889-19,2573,627 files not shown
+508,851-408,3143,633 files

HardenedBSD/src 18c5ff1secure/lib/libcrypto/arm ecp_nistz256-armv4.S keccak1600-armv4.S

Regen assembly files for arm.
DeltaFile
+4,442-0secure/lib/libcrypto/arm/ecp_nistz256-armv4.S
+2,667-0secure/lib/libcrypto/arm/keccak1600-armv4.S
+1,125-1,096secure/lib/libcrypto/arm/bsaes-armv7.S
+1,472-0secure/lib/libcrypto/arm/chacha-armv4.S
+778-684secure/lib/libcrypto/arm/sha512-armv4.S
+1,170-0secure/lib/libcrypto/arm/poly1305-armv4.S
+11,654-1,7809 files not shown
+13,420-3,00715 files

HardenedBSD/src 2c17169 (r338877)secure/lib/libcrypto/arm ecp_nistz256-armv4.S keccak1600-armv4.S

Regen assembly files for arm.
DeltaFile
+4,442-0secure/lib/libcrypto/arm/ecp_nistz256-armv4.S
+2,667-0secure/lib/libcrypto/arm/keccak1600-armv4.S
+1,125-1,096secure/lib/libcrypto/arm/bsaes-armv7.S
+1,472-0secure/lib/libcrypto/arm/chacha-armv4.S
+778-684secure/lib/libcrypto/arm/sha512-armv4.S
+1,170-0secure/lib/libcrypto/arm/poly1305-armv4.S
+11,654-1,7809 files not shown
+13,420-3,00715 files