Module Name: src Committed By: christos Date: Wed Oct 25 20:14:36 UTC 2023
Update of /cvsroot/src/crypto/external/bsd/openssh/dist In directory ivanova.netbsd.org:/tmp/cvs-serv5266 Log Message: Import OpenSSH 9.5 (Last was OpenSSH 9.3) OpenSSH 9.5/9.5p1 (2023-10-04) OpenSSH 9.5 was released on 2023-10-04. It is available from the mirrors listed at https://www.openssh.com/. OpenSSH is a 100% complete SSH protocol 2.0 implementation and includes sftp client and server support. Once again, we would like to thank the OpenSSH community for their continued support of the project, especially those who contributed code or patches, reported bugs, tested snapshots or donated to the project. More information on donations may be found at: https://www.openssh.com/donations.html Changes since OpenSSH 9.4 ========================= This release fixes a number of bugs and adds some small features. Potentially incompatible changes -------------------------------- * ssh-keygen(1): generate Ed25519 keys by default. Ed25519 public keys are very convenient due to their small size. Ed25519 keys are specified in RFC 8709 and OpenSSH has supported them since version 6.5 (January 2014). * sshd(8): the Subsystem directive now accurately preserves quoting of subsystem commands and arguments. This may change behaviour for exotic configurations, but the most common subsystem configuration (sftp-server) is unlikely to be affected. New features ------------ * ssh(1): add keystroke timing obfuscation to the client. This attempts to hide inter-keystroke timings by sending interactive traffic at fixed intervals (default: every 20ms) when there is only a small amount of data being sent. It also sends fake "chaff" keystrokes for a random interval after the last real keystroke. These are controlled by a new ssh_config ObscureKeystrokeTiming keyword. * ssh(1), sshd(8): Introduce a transport-level ping facility. This adds a pair of SSH transport protocol messages SSH2_MSG_PING/PONG to implement a ping capability. These messages use numbers in the "local extensions" number space and are advertised using a "p...@openssh.com" ext-info message with a string version number of "0". * sshd(8): allow override of Subsystem directives in sshd Match blocks. Bugfixes -------- * scp(1): fix scp in SFTP mode recursive upload and download of directories that contain symlinks to other directories. In scp mode, the links would be followed, but in SFTP mode they were not. bz3611 * ssh-keygen(1): handle cr+lf (instead of just cr) line endings in sshsig signature files. * ssh(1): interactive mode for ControlPersist sessions if they originally requested a tty. * sshd(8): make PerSourceMaxStartups first-match-wins * sshd(8): limit artificial login delay to a reasonable maximum (5s) and don't delay at all for the "none" authentication mechanism.cw bz3602 * sshd(8): Log errors in kex_exchange_identification() with level verbose instead of error to reduce preauth log spam. All of those get logged with a more generic error message by sshpkt_fatal(). * sshd(8): correct math for ClientAliveInterval that caused the probes to be sent less frequently than configured. * ssh(1): fix regression in OpenSSH 9.4 (mux.c r1.99) that caused multiplexed sessions to ignore SIGINT under some circumstances. Portability ----------- * Avoid clang zero-call-used-regs=all bug on Apple compilers, which for some reason have version numbers that do not match the upstream clang version numbers. bz#3584 * Fix configure test for zlib 1.3 and later/development versions. bz3604 Checksums: ========== - SHA1 (openssh-9.5.tar.gz) = 8a0bd3a91fac338d97d91817af58df731f6509a3 - SHA256 (openssh-9.5.tar.gz) = sVMxeM3d6g65qBMktJIofxmK4Ipg9dblKif0VnhPeO0= - SHA1 (openssh-9.5p1.tar.gz) = 35c16dcc6e7d0a9465faa241476ef24f76b196cc - SHA256 (openssh-9.5p1.tar.gz) = 8Cbnt5un+1QPdRgq+W3IqPHbOV+SK7yfbKYDZyaGCGs= Please note that the SHA256 signatures are base64 encoded and not hexadecimal (which is the default for most checksum tools). The PGP key used to sign the releases is available from the mirror sites: https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/RELEASE_KEY.asc Reporting Bugs: =============== - Please read https://www.openssh.com/report.html Security bugs should be reported directly to open...@openssh.com OpenSSH 9.4/9.4p1 (2023-08-10) OpenSSH 9.4 was released on 2023-08-10. It is available from the mirrors listed at https://www.openssh.com/. OpenSSH is a 100% complete SSH protocol 2.0 implementation and includes sftp client and server support. Once again, we would like to thank the OpenSSH community for their continued support of the project, especially those who contributed code or patches, reported bugs, tested snapshots or donated to the project. More information on donations may be found at: https://www.openssh.com/donations.html Changes since OpenSSH 9.3p2 =========================== This release fixes a number of bugs and adds some small features. Potentially incompatible changes -------------------------------- * This release removes support for older versions of libcrypto. OpenSSH now requires LibreSSL >= 3.1.0 or OpenSSL >= 1.1.1. Note that these versions are already deprecated by their upstream vendors. * ssh-agent(1): PKCS#11 modules must now be specified by their full paths. Previously dlopen(3) could search for them in system library directories. New features ------------ * ssh(1): allow forwarding Unix Domain sockets via ssh -W. * ssh(1): add support for configuration tags to ssh(1). This adds a ssh_config(5) "Tag" directive and corresponding "Match tag" predicate that may be used to select blocks of configuration similar to the pf.conf(5) keywords of the same name. * ssh(1): add a "match localnetwork" predicate. This allows matching on the addresses of available network interfaces and may be used to vary the effective client configuration based on network location. * ssh(1), sshd(8), ssh-keygen(1): infrastructure support for KRL extensions. This defines wire formats for optional KRL extensions and implements parsing of the new submessages. No actual extensions are supported at this point. * sshd(8): AuthorizedPrincipalsCommand and AuthorizedKeysCommand now accept two additional %-expansion sequences: %D which expands to the routing domain of the connected session and %C which expands to the addresses and port numbers for the source and destination of the connection. * ssh-keygen(1): increase the default work factor (rounds) for the bcrypt KDF used to derive symmetric encryption keys for passphrase protected key files by 50%. Bugfixes -------- * ssh-agent(1): improve isolation between loaded PKCS#11 modules by running separate ssh-pkcs11-helpers for each loaded provider. * ssh(1): make -f (fork after authentication) work correctly with multiplexed connections, including ControlPersist. bz3589 bz3589 * ssh(1): make ConnectTimeout apply to multiplexing sockets and not just to network connections. * ssh-agent(1), ssh(1): improve defences against invalid PKCS#11 modules being loaded by checking that the requested module contains the required symbol before loading it. * sshd(8): fix AuthorizedPrincipalsCommand when AuthorizedKeysCommand appears before it in sshd_config. Since OpenSSH 8.7 the AuthorizedPrincipalsCommand directive was incorrectly ignored in this situation. bz3574 * sshd(8), ssh(1), ssh-keygen(1): remove vestigal support for KRL signatures When the KRL format was originally defined, it included support for signing of KRL objects. However, the code to sign KRLs and verify KRL signatues was never completed in OpenSSH. This release removes the partially-implemented code to verify KRLs. All OpenSSH tools now ignore KRL_SECTION_SIGNATURE sections in KRL files. * All: fix a number of memory leaks and unreachable/harmless integer overflows. * ssh-agent(1), ssh(1): don't truncate strings logged from PKCS#11 modules; GHPR406 * sshd(8), ssh(1): better validate CASignatureAlgorithms in ssh_config and sshd_config. Previously this directive would accept certificate algorithm names, but these were unusable in practice as OpenSSH does not support CA chains. bz3577 * ssh(1): make `ssh -Q CASignatureAlgorithms` only list signature algorithms that are valid for CA signing. Previous behaviour was to list all signing algorithms, including certificate algorithms. * ssh-keyscan(1): gracefully handle systems where rlimits or the maximum number of open files is larger than INT_MAX; bz3581 * ssh-keygen(1): fix "no comment" not showing on when running `ssh-keygen -l` on multiple keys where one has a comment and other following keys do not. bz3580 * scp(1), sftp(1): adjust ftruncate() logic to handle servers that reorder requests. Previously, if the server reordered requests then the resultant file would be erroneously truncated. * ssh(1): don't incorrectly disable hostname canonicalization when CanonicalizeHostname=yes and ProxyJump was expicitly set to "none". bz3567 * scp(1): when copying local->remote, check that the source file exists before opening an SFTP connection to the server. Based on GHPR#370 Portability ----------- * All: a number of build fixes for various platforms and configuration combinations. * sshd(8): provide a replacement for the SELinux matchpathcon() function, which is deprecated. * All: relax libcrypto version checks for OpenSSL >=3. Beyond OpenSSL 3.0, the ABI compatibility guarantees are wider (only the library major must match instead of major and minor in earlier versions). bz#3548. * Tests: fix build problems for the sk-dummy.so FIDO provider module used in some tests. Checksums: ========== - SHA1 (openssh-9.4.tar.gz) = d88126d8d7b8e5bf4656587ac4a16055560641cc - SHA256 (openssh-9.4.tar.gz) = 7eqFjx2hAunw+1Jy7f1JQXq//3AMr9B3dKtASDtq8go= - SHA1 (openssh-9.4p1.tar.gz) = 5dea1f3c88f9cfe53a711a3c893ee8b7d3ffecff - SHA256 (openssh-9.4p1.tar.gz) = Ngj9kIjbIWPOs+YAyFq3nQ3j0iHlkZLqGSPiMmOGaoU= Please note that the SHA256 signatures are base64 encoded and not hexadecimal (which is the default for most checksum tools). The PGP key used to sign the releases is available from the mirror sites: https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/RELEASE_KEY.asc Reporting Bugs: =============== - Please read https://www.openssh.com/report.html Security bugs should be reported directly to open...@openssh.com Status: Vendor Tag: OPENSSH Release Tags: v95-20231004 C src/crypto/external/bsd/openssh/dist/packet.h U src/crypto/external/bsd/openssh/dist/LICENCE U src/crypto/external/bsd/openssh/dist/OVERVIEW C src/crypto/external/bsd/openssh/dist/PROTOCOL C src/crypto/external/bsd/openssh/dist/PROTOCOL.agent U src/crypto/external/bsd/openssh/dist/PROTOCOL.certkeys U src/crypto/external/bsd/openssh/dist/PROTOCOL.chacha20poly1305 U src/crypto/external/bsd/openssh/dist/PROTOCOL.key U src/crypto/external/bsd/openssh/dist/PROTOCOL.krl U src/crypto/external/bsd/openssh/dist/PROTOCOL.mux U src/crypto/external/bsd/openssh/dist/PROTOCOL.sshsig U src/crypto/external/bsd/openssh/dist/PROTOCOL.u2f U src/crypto/external/bsd/openssh/dist/README C src/crypto/external/bsd/openssh/dist/addr.c U src/crypto/external/bsd/openssh/dist/addr.h U src/crypto/external/bsd/openssh/dist/addrmatch.c U src/crypto/external/bsd/openssh/dist/atomicio.c U src/crypto/external/bsd/openssh/dist/atomicio.h U src/crypto/external/bsd/openssh/dist/auth-bsdauth.c U src/crypto/external/bsd/openssh/dist/auth-krb5.c C src/crypto/external/bsd/openssh/dist/ssh-agent.c C src/crypto/external/bsd/openssh/dist/auth-options.c U src/crypto/external/bsd/openssh/dist/auth-options.h U src/crypto/external/bsd/openssh/dist/auth-passwd.c U src/crypto/external/bsd/openssh/dist/auth-rhosts.c U src/crypto/external/bsd/openssh/dist/auth.c U src/crypto/external/bsd/openssh/dist/auth.h U src/crypto/external/bsd/openssh/dist/auth2-chall.c C src/crypto/external/bsd/openssh/dist/auth2-gss.c U src/crypto/external/bsd/openssh/dist/auth2-hostbased.c U src/crypto/external/bsd/openssh/dist/auth2-kbdint.c U src/crypto/external/bsd/openssh/dist/auth2-none.c U src/crypto/external/bsd/openssh/dist/auth2-passwd.c C src/crypto/external/bsd/openssh/dist/auth2-pubkey.c U src/crypto/external/bsd/openssh/dist/auth2-pubkeyfile.c C src/crypto/external/bsd/openssh/dist/auth2.c U src/crypto/external/bsd/openssh/dist/authfd.c U src/crypto/external/bsd/openssh/dist/authfd.h U src/crypto/external/bsd/openssh/dist/authfile.c U src/crypto/external/bsd/openssh/dist/authfile.h U src/crypto/external/bsd/openssh/dist/bitmap.c U src/crypto/external/bsd/openssh/dist/bitmap.h C src/crypto/external/bsd/openssh/dist/canohost.c U src/crypto/external/bsd/openssh/dist/canohost.h C src/crypto/external/bsd/openssh/dist/chacha.c U src/crypto/external/bsd/openssh/dist/chacha.h C src/crypto/external/bsd/openssh/dist/channels.c C src/crypto/external/bsd/openssh/dist/channels.h U src/crypto/external/bsd/openssh/dist/cipher-aesctr.c U src/crypto/external/bsd/openssh/dist/cipher-aesctr.h C src/crypto/external/bsd/openssh/dist/cipher-chachapoly-libcrypto.c C src/crypto/external/bsd/openssh/dist/cipher-chachapoly.c U src/crypto/external/bsd/openssh/dist/cipher-chachapoly.h U src/crypto/external/bsd/openssh/dist/cipher.c U src/crypto/external/bsd/openssh/dist/cipher.h U src/crypto/external/bsd/openssh/dist/cleanup.c C src/crypto/external/bsd/openssh/dist/clientloop.c U src/crypto/external/bsd/openssh/dist/clientloop.h U src/crypto/external/bsd/openssh/dist/compat.c U src/crypto/external/bsd/openssh/dist/compat.h U src/crypto/external/bsd/openssh/dist/crypto_api.h U src/crypto/external/bsd/openssh/dist/dh.c U src/crypto/external/bsd/openssh/dist/dh.h U src/crypto/external/bsd/openssh/dist/digest-libc.c U src/crypto/external/bsd/openssh/dist/digest-openssl.c U src/crypto/external/bsd/openssh/dist/digest.h U src/crypto/external/bsd/openssh/dist/dispatch.c U src/crypto/external/bsd/openssh/dist/dispatch.h U src/crypto/external/bsd/openssh/dist/dns.c U src/crypto/external/bsd/openssh/dist/dns.h U src/crypto/external/bsd/openssh/dist/ed25519.c U src/crypto/external/bsd/openssh/dist/ed25519.sh U src/crypto/external/bsd/openssh/dist/fatal.c U src/crypto/external/bsd/openssh/dist/groupaccess.c U src/crypto/external/bsd/openssh/dist/groupaccess.h U src/crypto/external/bsd/openssh/dist/gss-genr.c U src/crypto/external/bsd/openssh/dist/gss-serv-krb5.c U src/crypto/external/bsd/openssh/dist/gss-serv.c U src/crypto/external/bsd/openssh/dist/hash.c U src/crypto/external/bsd/openssh/dist/hmac.c U src/crypto/external/bsd/openssh/dist/hmac.h U src/crypto/external/bsd/openssh/dist/hostfile.c U src/crypto/external/bsd/openssh/dist/hostfile.h C src/crypto/external/bsd/openssh/dist/kex.c C src/crypto/external/bsd/openssh/dist/kex.h U src/crypto/external/bsd/openssh/dist/kexc25519.c U src/crypto/external/bsd/openssh/dist/kexdh.c U src/crypto/external/bsd/openssh/dist/kexecdh.c U src/crypto/external/bsd/openssh/dist/kexgen.c U src/crypto/external/bsd/openssh/dist/kexgex.c U src/crypto/external/bsd/openssh/dist/kexgexc.c C src/crypto/external/bsd/openssh/dist/kexgexs.c C src/crypto/external/bsd/openssh/dist/krl.c U src/crypto/external/bsd/openssh/dist/kexsntrup761x25519.c C src/crypto/external/bsd/openssh/dist/krl.h U src/crypto/external/bsd/openssh/dist/log.c U src/crypto/external/bsd/openssh/dist/log.h U src/crypto/external/bsd/openssh/dist/mac.c U src/crypto/external/bsd/openssh/dist/mac.h C src/crypto/external/bsd/openssh/dist/match.c U src/crypto/external/bsd/openssh/dist/match.h C src/crypto/external/bsd/openssh/dist/misc.c C src/crypto/external/bsd/openssh/dist/misc.h U src/crypto/external/bsd/openssh/dist/moduli.c C src/crypto/external/bsd/openssh/dist/monitor.c U src/crypto/external/bsd/openssh/dist/monitor.h U src/crypto/external/bsd/openssh/dist/monitor_fdpass.c U src/crypto/external/bsd/openssh/dist/monitor_fdpass.h C src/crypto/external/bsd/openssh/dist/monitor_wrap.c U src/crypto/external/bsd/openssh/dist/monitor_wrap.h U src/crypto/external/bsd/openssh/dist/msg.c U src/crypto/external/bsd/openssh/dist/msg.h C src/crypto/external/bsd/openssh/dist/mux.c U src/crypto/external/bsd/openssh/dist/myproposal.h U src/crypto/external/bsd/openssh/dist/nchan.c U src/crypto/external/bsd/openssh/dist/nchan.ms U src/crypto/external/bsd/openssh/dist/nchan2.ms C src/crypto/external/bsd/openssh/dist/packet.c U src/crypto/external/bsd/openssh/dist/pathnames.h U src/crypto/external/bsd/openssh/dist/pkcs11.h C src/crypto/external/bsd/openssh/dist/poly1305.c U src/crypto/external/bsd/openssh/dist/poly1305.h C src/crypto/external/bsd/openssh/dist/progressmeter.c U src/crypto/external/bsd/openssh/dist/progressmeter.h C src/crypto/external/bsd/openssh/dist/readconf.c C src/crypto/external/bsd/openssh/dist/readconf.h U src/crypto/external/bsd/openssh/dist/readpass.c U src/crypto/external/bsd/openssh/dist/rijndael.c U src/crypto/external/bsd/openssh/dist/rijndael.h U src/crypto/external/bsd/openssh/dist/sandbox-pledge.c U src/crypto/external/bsd/openssh/dist/sandbox-rlimit.c U src/crypto/external/bsd/openssh/dist/scp.1 C src/crypto/external/bsd/openssh/dist/scp.c C src/crypto/external/bsd/openssh/dist/servconf.c C src/crypto/external/bsd/openssh/dist/servconf.h C src/crypto/external/bsd/openssh/dist/serverloop.c U src/crypto/external/bsd/openssh/dist/serverloop.h C src/crypto/external/bsd/openssh/dist/session.c U src/crypto/external/bsd/openssh/dist/session.h C src/crypto/external/bsd/openssh/dist/sftp-client.c C src/crypto/external/bsd/openssh/dist/sftp-client.h C src/crypto/external/bsd/openssh/dist/sftp-glob.c C src/crypto/external/bsd/openssh/dist/sftp-common.c U src/crypto/external/bsd/openssh/dist/sftp-common.h U src/crypto/external/bsd/openssh/dist/sftp-realpath.c U src/crypto/external/bsd/openssh/dist/sftp-server-main.c U src/crypto/external/bsd/openssh/dist/sftp-server.8 C src/crypto/external/bsd/openssh/dist/sftp-server.c C src/crypto/external/bsd/openssh/dist/sftp-usergroup.c U src/crypto/external/bsd/openssh/dist/sftp-usergroup.h U src/crypto/external/bsd/openssh/dist/sftp.1 C src/crypto/external/bsd/openssh/dist/sftp.c U src/crypto/external/bsd/openssh/dist/sftp.h U src/crypto/external/bsd/openssh/dist/sk-api.h C src/crypto/external/bsd/openssh/dist/sk-usbhid.c U src/crypto/external/bsd/openssh/dist/smult_curve25519_ref.c U src/crypto/external/bsd/openssh/dist/sntrup761.c U src/crypto/external/bsd/openssh/dist/sntrup761.sh U src/crypto/external/bsd/openssh/dist/srclimit.c U src/crypto/external/bsd/openssh/dist/srclimit.h U src/crypto/external/bsd/openssh/dist/ssh-add.1 C src/crypto/external/bsd/openssh/dist/ssh-add.c C src/crypto/external/bsd/openssh/dist/ssh-agent.1 U src/crypto/external/bsd/openssh/dist/ssh-dss.c U src/crypto/external/bsd/openssh/dist/ssh-ecdsa-sk.c U src/crypto/external/bsd/openssh/dist/ssh-ecdsa.c U src/crypto/external/bsd/openssh/dist/ssh-ed25519-sk.c U src/crypto/external/bsd/openssh/dist/ssh-ed25519.c U src/crypto/external/bsd/openssh/dist/ssh-gss.h C src/crypto/external/bsd/openssh/dist/ssh-keygen.1 C src/crypto/external/bsd/openssh/dist/ssh-keygen.c U src/crypto/external/bsd/openssh/dist/ssh-keyscan.1 C src/crypto/external/bsd/openssh/dist/ssh-keyscan.c U src/crypto/external/bsd/openssh/dist/ssh-keysign.8 U src/crypto/external/bsd/openssh/dist/ssh-keysign.c C src/crypto/external/bsd/openssh/dist/ssh-pkcs11-client.c U src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.8 U src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.c C src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c U src/crypto/external/bsd/openssh/dist/ssh-pkcs11.h U src/crypto/external/bsd/openssh/dist/ssh-rsa.c U src/crypto/external/bsd/openssh/dist/ssh-sandbox.h U src/crypto/external/bsd/openssh/dist/ssh-sk-client.c U src/crypto/external/bsd/openssh/dist/ssh-sk-helper.8 U src/crypto/external/bsd/openssh/dist/ssh-sk-helper.c C src/crypto/external/bsd/openssh/dist/ssh-sk.c U src/crypto/external/bsd/openssh/dist/ssh-sk.h U src/crypto/external/bsd/openssh/dist/ssh-xmss.c C src/crypto/external/bsd/openssh/dist/ssh.1 C src/crypto/external/bsd/openssh/dist/ssh.c U src/crypto/external/bsd/openssh/dist/ssh.h C src/crypto/external/bsd/openssh/dist/ssh2.h U src/crypto/external/bsd/openssh/dist/ssh_api.c U src/crypto/external/bsd/openssh/dist/ssh_api.h C src/crypto/external/bsd/openssh/dist/ssh_config C src/crypto/external/bsd/openssh/dist/ssh_config.5 U src/crypto/external/bsd/openssh/dist/sshbuf-getput-basic.c U src/crypto/external/bsd/openssh/dist/sshbuf-getput-crypto.c U src/crypto/external/bsd/openssh/dist/sshbuf-io.c U src/crypto/external/bsd/openssh/dist/sshbuf-misc.c U src/crypto/external/bsd/openssh/dist/sshbuf.c U src/crypto/external/bsd/openssh/dist/sshbuf.h U src/crypto/external/bsd/openssh/dist/sshconnect.c U src/crypto/external/bsd/openssh/dist/sshconnect.h C src/crypto/external/bsd/openssh/dist/sshconnect2.c C src/crypto/external/bsd/openssh/dist/sshd.8 U src/crypto/external/bsd/openssh/dist/sshd.c U src/crypto/external/bsd/openssh/dist/sshd_config C src/crypto/external/bsd/openssh/dist/sshd_config.5 U src/crypto/external/bsd/openssh/dist/ssherr.c U src/crypto/external/bsd/openssh/dist/ssherr.h U src/crypto/external/bsd/openssh/dist/sshkey-xmss.c U src/crypto/external/bsd/openssh/dist/sshkey-xmss.h C src/crypto/external/bsd/openssh/dist/sshkey.c C src/crypto/external/bsd/openssh/dist/sshkey.h U src/crypto/external/bsd/openssh/dist/sshlogin.c U src/crypto/external/bsd/openssh/dist/sshlogin.h U src/crypto/external/bsd/openssh/dist/sshpty.c U src/crypto/external/bsd/openssh/dist/sshpty.h C src/crypto/external/bsd/openssh/dist/sshsig.c U src/crypto/external/bsd/openssh/dist/sshsig.h U src/crypto/external/bsd/openssh/dist/sshtty.c U src/crypto/external/bsd/openssh/dist/ttymodes.c U src/crypto/external/bsd/openssh/dist/ttymodes.h U src/crypto/external/bsd/openssh/dist/uidswap.c U src/crypto/external/bsd/openssh/dist/uidswap.h U src/crypto/external/bsd/openssh/dist/umac.c U src/crypto/external/bsd/openssh/dist/umac.h U src/crypto/external/bsd/openssh/dist/umac128.c U src/crypto/external/bsd/openssh/dist/utf8.c U src/crypto/external/bsd/openssh/dist/utf8.h C src/crypto/external/bsd/openssh/dist/version.h U src/crypto/external/bsd/openssh/dist/xmalloc.c U src/crypto/external/bsd/openssh/dist/xmalloc.h U src/crypto/external/bsd/openssh/dist/xmss_fast.c U src/crypto/external/bsd/openssh/dist/xmss_commons.c U src/crypto/external/bsd/openssh/dist/xmss_commons.h U src/crypto/external/bsd/openssh/dist/xmss_fast.h U src/crypto/external/bsd/openssh/dist/xmss_hash.c U src/crypto/external/bsd/openssh/dist/xmss_hash.h U src/crypto/external/bsd/openssh/dist/xmss_hash_address.c U src/crypto/external/bsd/openssh/dist/xmss_hash_address.h U src/crypto/external/bsd/openssh/dist/xmss_wots.c U src/crypto/external/bsd/openssh/dist/xmss_wots.h U src/crypto/external/bsd/openssh/dist/moduli-gen/Makefile U src/crypto/external/bsd/openssh/dist/moduli-gen/moduli-gen.sh C src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.2048 C src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.3072 C src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.4096 C src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.6144 C src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.7680 C src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.8192 71 conflicts created by this import. Use the following command to help the merge: cvs checkout -jOPENSSH:yesterday -jOPENSSH src/crypto/external/bsd/openssh/dist
