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 b6edaedsecure/lib/libcrypto Makefile.man, secure/lib/libcrypto/man SSL_CONF_cmd.3 ENGINE_add.3

Merge remote-tracking branch 'tor/freebsd/12-stable/master' into hardened/12-stable/master

Conflicts:
        etc/mtree/BSD.usr.dist (unresolved)
        secure/lib/libcrypto/Makefile (unresolved)
DeltaFile
+4-3,805secure/lib/libcrypto/Makefile.man
+3,806-0secure/lib/libcrypto/man/man3/Makefile
+914-0secure/lib/libcrypto/man/man7/ssl.7
+0-777secure/lib/libcrypto/man/SSL_CONF_cmd.3
+777-0secure/lib/libcrypto/man/man3/SSL_CONF_cmd.3
+0-767secure/lib/libcrypto/man/ENGINE_add.3
+5,501-5,349968 files not shown
+119,424-114,309974 files

HardenedBSD/src 6786182secure/lib/libcrypto Makefile.man, secure/lib/libcrypto/man SSL_CONF_cmd.3 ENGINE_add.3

MFC:    r356963

Install man5 and man7 for OpenSSL.
DeltaFile
+4-3,805secure/lib/libcrypto/Makefile.man
+3,806-0secure/lib/libcrypto/man/man3/Makefile
+914-0secure/lib/libcrypto/man/man7/ssl.7
+777-0secure/lib/libcrypto/man/man3/SSL_CONF_cmd.3
+0-777secure/lib/libcrypto/man/SSL_CONF_cmd.3
+0-767secure/lib/libcrypto/man/ENGINE_add.3
+5,501-5,349945 files not shown
+119,120-113,952951 files

HardenedBSD/src 6b4382c (r358188)secure/lib/libcrypto Makefile.man, secure/lib/libcrypto/man SSL_CONF_cmd.3 ENGINE_add.3

MFC:    r356963

Install man5 and man7 for OpenSSL.
DeltaFile
+4-3,805secure/lib/libcrypto/Makefile.man
+3,806-0secure/lib/libcrypto/man/man3/Makefile
+914-0secure/lib/libcrypto/man/man7/ssl.7
+777-0secure/lib/libcrypto/man/man3/SSL_CONF_cmd.3
+0-777secure/lib/libcrypto/man/SSL_CONF_cmd.3
+0-767secure/lib/libcrypto/man/ENGINE_add.3
+5,501-5,349945 files not shown
+119,120-113,952951 files

HardenedBSD/src 8cc71a9contrib/llvm-project/llvm/lib/Target/Hexagon HexagonDepInstrInfo.td, contrib/llvm-project/llvm/lib/Target/X86 X86ISelLowering.cpp

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

Conflicts:
        gnu/lib/libgcc/Makefile (deleted)
        share/man/man5/src.conf.5 (unresolved)
        usr.bin/clang/lld/Makefile (unresolved)
        usr.sbin/rpc.statd/Makefile (unresolved)
DeltaFile
+59,521-0sys/contrib/dev/iwm/iwm-9000-34.fw.uu
+59,517-0sys/contrib/dev/iwm/iwm-9260-34.fw.uu
+45,556-0contrib/llvm-project/llvm/lib/Target/X86/X86ISelLowering.cpp
+0-42,750contrib/llvm/lib/Target/X86/X86ISelLowering.cpp
+0-37,629contrib/llvm/lib/Target/Hexagon/HexagonDepInstrInfo.td
+37,628-0contrib/llvm-project/llvm/lib/Target/Hexagon/HexagonDepInstrInfo.td
+202,222-80,37929,524 files not shown
+5,482,014-5,100,48629,530 files

HardenedBSD/src c37c79fsecure/lib/libcrypto Makefile.man, secure/lib/libcrypto/man SSL_CONF_cmd.3

Merge ^/head r356931 through r357118.
DeltaFile
+4-3,805secure/lib/libcrypto/Makefile.man
+3,806-0secure/lib/libcrypto/man/man3/Makefile
+654-547sys/vm/vm_fault.c
+914-0secure/lib/libcrypto/man/man7/ssl.7
+0-777secure/lib/libcrypto/man/SSL_CONF_cmd.3
+777-0secure/lib/libcrypto/man/man3/SSL_CONF_cmd.3
+6,155-5,1291,144 files not shown
+124,073-116,5001,150 files

HardenedBSD/src 051669e (r357119)secure/lib/libcrypto Makefile.man, secure/lib/libcrypto/man SSL_CONF_cmd.3

Merge ^/head r356931 through r357118.
DeltaFile
+4-3,805secure/lib/libcrypto/Makefile.man
+3,806-0secure/lib/libcrypto/man/man3/Makefile
+654-547sys/vm/vm_fault.c
+914-0secure/lib/libcrypto/man/man7/ssl.7
+777-0secure/lib/libcrypto/man/man3/SSL_CONF_cmd.3
+0-777secure/lib/libcrypto/man/SSL_CONF_cmd.3
+6,155-5,1291,144 files not shown
+124,073-116,5001,150 files

HardenedBSD/src e1cae73secure/lib/libcrypto Makefile.man, secure/lib/libcrypto/man SSL_CONF_cmd.3 ENGINE_add.3

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

Conflicts:
        etc/mtree/BSD.usr.dist (unresolved)
        secure/lib/libcrypto/Makefile (unresolved)
DeltaFile
+4-3,805secure/lib/libcrypto/Makefile.man
+3,806-0secure/lib/libcrypto/man/man3/Makefile
+914-0secure/lib/libcrypto/man/man7/ssl.7
+777-0secure/lib/libcrypto/man/man3/SSL_CONF_cmd.3
+0-777secure/lib/libcrypto/man/SSL_CONF_cmd.3
+0-767secure/lib/libcrypto/man/ENGINE_add.3
+5,501-5,349993 files not shown
+120,181-114,337999 files

HardenedBSD/src a9e3baa (r356963)secure/lib/libcrypto Makefile.man, secure/lib/libcrypto/man SSL_CONF_cmd.3 ENGINE_add.3

Install man5 and man7 for OpenSSL.

Note config.5 and crypto.7 are not installed because we have conflicts.

Requested by:   phk
MFC after:      1 month
DeltaFile
+4-3,805secure/lib/libcrypto/Makefile.man
+3,806-0secure/lib/libcrypto/man/man3/Makefile
+914-0secure/lib/libcrypto/man/man7/ssl.7
+0-777secure/lib/libcrypto/man/SSL_CONF_cmd.3
+777-0secure/lib/libcrypto/man/man3/SSL_CONF_cmd.3
+0-767secure/lib/libcrypto/man/ENGINE_add.3
+5,501-5,349945 files not shown
+119,120-113,952951 files

HardenedBSD/src 772217fsecure/lib/libcrypto Makefile.man, secure/lib/libcrypto/man SSL_CONF_cmd.3 ENGINE_add.3

Install man5 and man7 for OpenSSL.

Note config.5 and crypto.7 are not installed because we have conflicts.

Requested by:   phk
MFC after:      1 month
DeltaFile
+4-3,805secure/lib/libcrypto/Makefile.man
+3,806-0secure/lib/libcrypto/man/man3/Makefile
+914-0secure/lib/libcrypto/man/man7/ssl.7
+0-777secure/lib/libcrypto/man/SSL_CONF_cmd.3
+777-0secure/lib/libcrypto/man/man3/SSL_CONF_cmd.3
+0-767secure/lib/libcrypto/man/ENGINE_add.3
+5,501-5,349945 files not shown
+119,120-113,952951 files

HardenedBSD/src 8ee8a7fcrypto/openssl CHANGES, crypto/openssl/apps s_server.c

Merge OpenSSL 1.0.2u.
DeltaFile
+210-197crypto/openssl/crypto/bn/asm/rsaz-x86_64.pl
+194-181secure/lib/libcrypto/amd64/rsaz-x86_64.S
+11-5crypto/openssl/apps/s_server.c
+14-0crypto/openssl/CHANGES
+14-0crypto/openssl/crypto/ec/ec_asn1.c
+4-4crypto/openssl/crypto/asn1/x_bignum.c
+447-387377 files not shown
+1,206-1,136383 files

HardenedBSD/src 3cbabc7crypto/openssl/crypto/aes/asm bsaes-x86_64.pl aes-586.pl, secure/lib/libcrypto/amd64 aes-x86_64.S

Merge branch 'freebsd/12.1-releng/master' into releng_12.1_merge

Conflicts:
        release/pkg_repos/release-dvd.conf
        share/man/man5/src.conf.5
        share/mk/bsd.lib.mk
        share/mk/bsd.opts.mk
        share/mk/bsd.prog.mk
        sys/compat/freebsd32/freebsd32_misc.c
        sys/kern/kern_fork.c
        sys/kern/kern_procctl.c
        sys/sys/proc.h
        sys/sys/procctl.h
        tools/build/options/WITHOUT_PIE
        usr.bin/proccontrol/proccontrol.c
        usr.sbin/bsdinstall/scripts/config
        usr.sbin/pkg/Makefile
DeltaFile
+0-11,187sys/dev/mlx5/mlx5_core/mlx5_fwdump_regmaps.c
+0-6,491secure/lib/libcrypto/i386/aes-586.S
+0-3,239crypto/openssl/crypto/aes/asm/bsaes-x86_64.pl
+0-3,000crypto/openssl/crypto/aes/asm/aes-586.pl
+0-2,916crypto/openssl/crypto/aes/asm/aes-x86_64.pl
+0-2,651secure/lib/libcrypto/amd64/aes-x86_64.S
+0-29,4841,252 files not shown
+39,471-43,3591,258 files

HardenedBSD/src e8a413bcrypto/openssl/crypto/aes/asm bsaes-x86_64.pl aes-586.pl, secure/lib/libcrypto/amd64 aes-x86_64.S

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

 Conflicts:
        share/man/man5/src.conf.5 (not resolved)
        share/mk/bsd.lib.mk (not resolved)
        share/mk/bsd.opts.mk (not resolved)
        share/mk/bsd.prog.mk (not resolved)
        sys/compat/freebsd32/freebsd32_misc.c (not resolved)
        sys/kern/imgact_elf.c (not resolved)
        sys/kern/kern_fork.c (not resolved)
        sys/kern/kern_procctl.c (not resolved)
        sys/sys/proc.h (not resolved)
        sys/sys/procctl.h (not resolved)
        tools/build/options/WITHOUT_PIE (resolved)
        usr.bin/proccontrol/proccontrol.c (not resolved)
        usr.sbin/bsdinstall/scripts/config (not resolved)
        usr.sbin/pkg/Makefile (not resolved)
DeltaFile
+0-11,187sys/dev/mlx5/mlx5_core/mlx5_fwdump_regmaps.c
+0-6,491secure/lib/libcrypto/i386/aes-586.S
+0-3,239crypto/openssl/crypto/aes/asm/bsaes-x86_64.pl
+0-3,000crypto/openssl/crypto/aes/asm/aes-586.pl
+0-2,916crypto/openssl/crypto/aes/asm/aes-x86_64.pl
+0-2,651secure/lib/libcrypto/amd64/aes-x86_64.S
+0-29,4841,839 files not shown
+48,320-47,3951,845 files

HardenedBSD/src 8864118crypto/openssl/crypto/aes/asm bsaes-x86_64.pl aes-586.pl, secure/lib/libcrypto/amd64 aes-x86_64.S bsaes-x86_64.S

Merge ^/head r352105 through r352307.
DeltaFile
+0-6,491secure/lib/libcrypto/i386/aes-586.S
+0-3,239crypto/openssl/crypto/aes/asm/bsaes-x86_64.pl
+0-3,000crypto/openssl/crypto/aes/asm/aes-586.pl
+0-2,916crypto/openssl/crypto/aes/asm/aes-x86_64.pl
+0-2,651secure/lib/libcrypto/amd64/aes-x86_64.S
+0-2,597secure/lib/libcrypto/amd64/bsaes-x86_64.S
+0-20,8941,134 files not shown
+34,620-51,4651,140 files

HardenedBSD/src 61c1328 (r352308)crypto/openssl/crypto/aes/asm bsaes-x86_64.pl aes-586.pl, secure/lib/libcrypto/amd64 aes-x86_64.S bsaes-x86_64.S

Merge ^/head r352105 through r352307.
DeltaFile
+0-6,491secure/lib/libcrypto/i386/aes-586.S
+0-3,239crypto/openssl/crypto/aes/asm/bsaes-x86_64.pl
+0-3,000crypto/openssl/crypto/aes/asm/aes-586.pl
+0-2,916crypto/openssl/crypto/aes/asm/aes-x86_64.pl
+0-2,651secure/lib/libcrypto/amd64/aes-x86_64.S
+0-2,597secure/lib/libcrypto/amd64/bsaes-x86_64.S
+0-20,8941,134 files not shown
+34,620-51,4651,140 files

HardenedBSD/src eba5d26crypto/openssl/crypto/aes/asm bsaes-x86_64.pl aes-586.pl, secure/lib/libcrypto/amd64 aes-x86_64.S bsaes-x86_64.S

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

* freebsd/current/master:
  Fix assumptions of only one device per SES slot.
  Remove struct ata_res_pass16, unneeded after r352082.
  - fix a minor typo
  Remove unnecessary entries from the previous commit.
  In am335x_dmtpps, use a spin mutex to interlock between PPS capture and PPS ioctl(2) handling.  This allows doing the pps_event() work in the polling routine, instead of using a taskqueue task to do that work.
  loader: vidconsole should set LINES and COLUMNS
  lualoader: Revert to ASCII menu frame for serial console
  gnop: Fix initial value for the wdelayprob
  cache: avoid excessive relocking on entry removal during lookup
  cache: change the formula for calculating lock array sizes
  cache: assorted cleanups
  Import OpenSSL 1.1.1d.
  Import OpenSSL 1.1.1c.
  Import OpenSSL 1.1.1c.
  Import OpenSSL 1.1.1b.
DeltaFile
+0-6,491secure/lib/libcrypto/i386/aes-586.S
+0-3,239crypto/openssl/crypto/aes/asm/bsaes-x86_64.pl
+0-3,000crypto/openssl/crypto/aes/asm/aes-586.pl
+0-2,916crypto/openssl/crypto/aes/asm/aes-x86_64.pl
+0-2,651secure/lib/libcrypto/amd64/aes-x86_64.S
+0-2,597secure/lib/libcrypto/amd64/bsaes-x86_64.S
+0-20,894797 files not shown
+5,053-23,811803 files

HardenedBSD/src 108dacacrypto/openssl/crypto/bn bn_lib.c, crypto/openssl/crypto/ec ec_lib.c ec_curve.c

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

* origin/hardened/11-stable/master:
  Merge OpenSSL 1.0.2t.
DeltaFile
+152-7crypto/openssl/crypto/ec/ec_lib.c
+112-12crypto/openssl/crypto/bn/bn_lib.c
+115-1crypto/openssl/crypto/ec/ec_curve.c
+72-6crypto/openssl/crypto/ec/ec_asn1.c
+30-38crypto/openssl/crypto/ec/ecp_nistp256.c
+30-38crypto/openssl/crypto/ec/ecp_nistp521.c
+511-102398 files not shown
+1,457-916404 files

HardenedBSD/src 9456f47crypto/openssl/crypto/bn bn_lib.c, crypto/openssl/crypto/ec ec_lib.c ec_curve.c

Merge branch 'freebsd/11-stable/master' into hardened/11-stable/master

* freebsd/11-stable/master:
  Merge OpenSSL 1.0.2t.
DeltaFile
+152-7crypto/openssl/crypto/ec/ec_lib.c
+112-12crypto/openssl/crypto/bn/bn_lib.c
+115-1crypto/openssl/crypto/ec/ec_curve.c
+72-6crypto/openssl/crypto/ec/ec_asn1.c
+30-38crypto/openssl/crypto/ec/ecp_nistp256.c
+30-38crypto/openssl/crypto/ec/ecp_nistp521.c
+511-102398 files not shown
+1,457-916404 files

HardenedBSD/src e3d07f7crypto/openssl/crypto/bn bn_lib.c, crypto/openssl/crypto/ec ec_lib.c ec_curve.c

Merge OpenSSL 1.0.2t.
DeltaFile
+152-7crypto/openssl/crypto/ec/ec_lib.c
+112-12crypto/openssl/crypto/bn/bn_lib.c
+115-1crypto/openssl/crypto/ec/ec_curve.c
+72-6crypto/openssl/crypto/ec/ec_asn1.c
+30-38crypto/openssl/crypto/ec/ecp_nistp256.c
+30-38crypto/openssl/crypto/ec/ecp_nistp521.c
+511-102398 files not shown
+1,457-916404 files

HardenedBSD/src f3f95f0crypto/openssl/crypto/aes/asm bsaes-x86_64.pl aes-586.pl, secure/lib/libcrypto/amd64 aes-x86_64.S bsaes-x86_64.S

MFC:    r352191

Merge OpenSSL 1.1.1d.
DeltaFile
+0-6,491secure/lib/libcrypto/i386/aes-586.S
+0-3,239crypto/openssl/crypto/aes/asm/bsaes-x86_64.pl
+0-3,000crypto/openssl/crypto/aes/asm/aes-586.pl
+0-2,916crypto/openssl/crypto/aes/asm/aes-x86_64.pl
+0-2,651secure/lib/libcrypto/amd64/aes-x86_64.S
+0-2,597secure/lib/libcrypto/amd64/bsaes-x86_64.S
+0-20,894787 files not shown
+4,892-23,706793 files

HardenedBSD/src 153295bcrypto/openssl/crypto/aes/asm bsaes-x86_64.pl aes-586.pl, secure/lib/libcrypto/amd64 aes-x86_64.S bsaes-x86_64.S

MFC:    r352191

Merge OpenSSL 1.1.1d.
DeltaFile
+0-6,491secure/lib/libcrypto/i386/aes-586.S
+0-3,239crypto/openssl/crypto/aes/asm/bsaes-x86_64.pl
+0-3,000crypto/openssl/crypto/aes/asm/aes-586.pl
+0-2,916crypto/openssl/crypto/aes/asm/aes-x86_64.pl
+0-2,651secure/lib/libcrypto/amd64/aes-x86_64.S
+0-2,597secure/lib/libcrypto/amd64/bsaes-x86_64.S
+0-20,894787 files not shown
+4,892-23,706793 files

HardenedBSD/src 556ce8dcrypto/openssl/crypto/aes/asm bsaes-x86_64.pl aes-586.pl, secure/lib/libcrypto/amd64 aes-x86_64.S bsaes-x86_64.S

Merge OpenSSL 1.1.1d.
DeltaFile
+0-6,491secure/lib/libcrypto/i386/aes-586.S
+0-3,239crypto/openssl/crypto/aes/asm/bsaes-x86_64.pl
+0-3,000crypto/openssl/crypto/aes/asm/aes-586.pl
+0-2,916crypto/openssl/crypto/aes/asm/aes-x86_64.pl
+0-2,651secure/lib/libcrypto/amd64/aes-x86_64.S
+0-2,597secure/lib/libcrypto/amd64/bsaes-x86_64.S
+0-20,894787 files not shown
+4,892-23,706793 files

HardenedBSD/src da327cd (r352191)crypto/openssl/crypto/aes/asm bsaes-x86_64.pl aes-586.pl, secure/lib/libcrypto/amd64 aes-x86_64.S bsaes-x86_64.S

Merge OpenSSL 1.1.1d.
DeltaFile
+0-6,491secure/lib/libcrypto/i386/aes-586.S
+0-3,239crypto/openssl/crypto/aes/asm/bsaes-x86_64.pl
+0-3,000crypto/openssl/crypto/aes/asm/aes-586.pl
+0-2,916crypto/openssl/crypto/aes/asm/aes-x86_64.pl
+0-2,651secure/lib/libcrypto/amd64/aes-x86_64.S
+0-2,597secure/lib/libcrypto/amd64/bsaes-x86_64.S
+0-20,894787 files not shown
+4,892-23,706793 files

HardenedBSD/src 52ab12econtrib/llvm/include/llvm/IR IntrinsicsHexagon.td, contrib/sqlite3 sqlite3.c

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

Conflicts:
        share/mk/src.opts.mk (unresolved)
DeltaFile
+10,316-7,062contrib/sqlite3/sqlite3.c
+5,871-10,490contrib/llvm/include/llvm/IR/IntrinsicsHexagon.td
+12,378-0sys/dev/cxgbe/firmware/t6fw-1.23.0.0.bin.uu
+0-12,235sys/dev/cxgbe/firmware/t6fw-1.22.0.3.bin.uu
+0-11,648sys/dev/drm/mga_ucode.h
+11,489-0sys/dev/cxgbe/firmware/t5fw-1.23.0.0.bin.uu
+40,054-41,43514,845 files not shown
+1,218,861-802,80714,851 files

HardenedBSD/src 1655e35contrib/libarchive/libarchive archive_read_support_format_rar5.c, sys/dev/de if_de.c

MFHead @348740

Sponsored by:   The FreeBSD Foundation
DeltaFile
+2,899-2,366contrib/libarchive/libarchive/archive_read_support_format_rar5.c
+0-5,009sys/dev/de/if_de.c
+0-4,300sys/dev/txp/3c990img.h
+0-3,021sys/dev/txp/if_txp.c
+0-2,740sys/dev/sf/if_sf.c
+0-2,281sys/dev/tl/if_tl.c
+2,899-19,7171,899 files not shown
+32,154-76,8541,905 files

HardenedBSD/src 0269ae4 (r348744)contrib/libarchive/libarchive archive_read_support_format_rar5.c, sys/dev/de if_de.c

MFHead @348740

Sponsored by:   The FreeBSD Foundation
DeltaFile
+2,899-2,366contrib/libarchive/libarchive/archive_read_support_format_rar5.c
+0-5,009sys/dev/de/if_de.c
+0-4,300sys/dev/txp/3c990img.h
+0-3,021sys/dev/txp/if_txp.c
+0-2,740sys/dev/sf/if_sf.c
+0-2,281sys/dev/tl/if_tl.c
+2,899-19,7171,899 files not shown
+32,154-76,8541,905 files

HardenedBSD/src 9de4061crypto/openssl/crypto/ec ectest.c ec_lib.c, crypto/openssl/crypto/err err.c

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

* origin/hardened/11-stable/master:
  Merge OpenSSL 1.0.2s.
DeltaFile
+91-7crypto/openssl/crypto/ec/ectest.c
+29-26crypto/openssl/crypto/rsa/rsa_ssl.c
+24-25crypto/openssl/crypto/err/err.c
+23-23crypto/openssl/crypto/rsa/rsa_oaep.c
+22-22crypto/openssl/crypto/rsa/rsa_pk1.c
+19-3crypto/openssl/crypto/ec/ec_lib.c
+208-106391 files not shown
+657-533397 files

HardenedBSD/src 6839cb4crypto/openssl/crypto/ec ectest.c ec_lib.c, crypto/openssl/crypto/err err.c

Merge branch 'freebsd/11-stable/master' into hardened/11-stable/master

* freebsd/11-stable/master:
  Merge OpenSSL 1.0.2s.
DeltaFile
+91-7crypto/openssl/crypto/ec/ectest.c
+29-26crypto/openssl/crypto/rsa/rsa_ssl.c
+24-25crypto/openssl/crypto/err/err.c
+23-23crypto/openssl/crypto/rsa/rsa_oaep.c
+22-22crypto/openssl/crypto/rsa/rsa_pk1.c
+19-3crypto/openssl/crypto/ec/ec_lib.c
+208-106391 files not shown
+657-533397 files

HardenedBSD/src a2a5c9dcrypto/openssl Configure, crypto/openssl/apps s_cb.c

Merge branch 'freebsd/12-stable/master' into hardened/12-stable/master

* freebsd/12-stable/master:
  MFC r345405,345406,346228,346657,348195,348198: UART SPCR fixes.
  MFC:  r348340
DeltaFile
+1,345-337crypto/openssl/crypto/ec/curve448/curve448_tables.c
+716-713crypto/openssl/Configure
+84-84secure/lib/libcrypto/man/PEM_read_bio_PrivateKey.3
+164-0sys/dev/uart/uart_cpu_acpi.c
+70-70crypto/openssl/doc/man3/PEM_read_bio_PrivateKey.pod
+81-25crypto/openssl/apps/s_cb.c
+2,460-1,229683 files not shown
+4,713-3,084689 files

HardenedBSD/src 0ff6ec1crypto/openssl Configure, crypto/openssl/apps s_cb.c speed.c

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

* origin/hardened/current/master:
  Merge OpenSSL 1.1.1c.
  pseudofs: Ignore unsupported commands in vop_setattr.
  style.9: Correct usage's definition to match its declaration
  Fix array out of bound panic introduced in r306219.
  [ath_hal] Fix queue bits a bit
DeltaFile
+1,345-337crypto/openssl/crypto/ec/curve448/curve448_tables.c
+716-713crypto/openssl/Configure
+84-84secure/lib/libcrypto/man/PEM_read_bio_PrivateKey.3
+70-70crypto/openssl/doc/man3/PEM_read_bio_PrivateKey.pod
+81-25crypto/openssl/apps/s_cb.c
+55-28crypto/openssl/apps/speed.c
+2,351-1,257680 files not shown
+4,542-3,005686 files