NetBSD/src dUCzaPUcrypto/external/bsd/openssh/bin/ssh-keyscan Makefile, crypto/external/bsd/openssh/bin/sshd Makefile

   merge conflicts.
VersionDeltaFile
1.17+1,330-260crypto/external/bsd/openssh/dist/ssh-pkcs11.c
1.19+395-709crypto/external/bsd/openssh/dist/sshkey.c
1.33+248-195crypto/external/bsd/openssh/dist/sshconnect2.c
1.34+204-235crypto/external/bsd/openssh/dist/sshd.c
1.33+224-184crypto/external/bsd/openssh/dist/ssh-keygen.c
1.26+227-166crypto/external/bsd/openssh/dist/clientloop.c
1.25+221-162crypto/external/bsd/openssh/dist/serverloop.c
1.24+311-41crypto/external/bsd/openssh/dist/kex.c
1.23+298-16crypto/external/bsd/openssh/dist/scp.c
1.24+75-220crypto/external/bsd/openssh/dist/sshconnect.c
1.29+146-118crypto/external/bsd/openssh/dist/monitor.c
1.28+173-67crypto/external/bsd/openssh/dist/session.c
1.8+162-51crypto/external/bsd/openssh/dist/kexecdh.c
1.8+153-49crypto/external/bsd/openssh/dist/kexdh.c
1.8+124-58crypto/external/bsd/openssh/dist/kexc25519.c
1.8+94-76crypto/external/bsd/openssh/dist/ssh_api.c
1.15+136-29crypto/external/bsd/openssh/dist/ssh-pkcs11-client.c
1.6+75-80crypto/external/bsd/openssh/dist/moduli-gen/moduli.3072
1.19+43-112crypto/external/bsd/openssh/dist/kexgexs.c
1.24+95-59crypto/external/bsd/openssh/dist/channels.c
1.10+106-36crypto/external/bsd/openssh/dist/PROTOCOL.mux
1.6+73-69crypto/external/bsd/openssh/dist/moduli-gen/moduli.7680
1.14+39-100crypto/external/bsd/openssh/dist/kexgexc.c
1.6+67-71crypto/external/bsd/openssh/dist/moduli-gen/moduli.8192
1.6+73-65crypto/external/bsd/openssh/dist/moduli-gen/moduli.4096
1.30+91-44crypto/external/bsd/openssh/dist/ssh.c
1.19+82-53crypto/external/bsd/openssh/dist/auth2.c
1.6+69-65crypto/external/bsd/openssh/dist/moduli-gen/moduli.6144
1.14+97-29crypto/external/bsd/openssh/dist/krl.c
1.19+99-25crypto/external/bsd/openssh/dist/ssh-add.c
1.20+113-10crypto/external/bsd/openssh/dist/misc.c
1.26+76-42crypto/external/bsd/openssh/dist/sftp.c
1.37+69-45crypto/external/bsd/openssh/dist/packet.c
1.27+72-30crypto/external/bsd/openssh/dist/readconf.c
1.23+50-52crypto/external/bsd/openssh/dist/mux.c
1.16+68-33crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.c
1.17+43-48crypto/external/bsd/openssh/dist/dh.c
1.30+60-27crypto/external/bsd/openssh/dist/servconf.c
1.18+52-31crypto/external/bsd/openssh/dist/kex.h
1.20+72-8crypto/external/bsd/openssh/dist/sftp-server.c
1.24+38-37crypto/external/bsd/openssh/dist/ssh.1
1.24+60-13crypto/external/bsd/openssh/dist/ssh_config.5
1.10+52-19crypto/external/bsd/openssh/dist/nchan.c
1.23+54-15crypto/external/bsd/openssh/dist/ssh-keygen.1
1.9+12-51crypto/external/bsd/openssh/dist/sshbuf-getput-crypto.c
1.19+43-17crypto/external/bsd/openssh/dist/auth-pam.c
1.11+26-34crypto/external/bsd/openssh/dist/progressmeter.c
1.23+47-12crypto/external/bsd/openssh/dist/sftp-client.c
1.18+33-25crypto/external/bsd/openssh/dist/ssh-rsa.c
1.19+49-6crypto/external/bsd/openssh/dist/sftp.1
1.24+27-25crypto/external/bsd/openssh/dist/auth.c
1.14+16-26crypto/external/bsd/openssh/dist/ssh-ecdsa.c
1.16+19-18crypto/external/bsd/openssh/dist/ssh-dss.c
1.18+28-3crypto/external/bsd/openssh/dist/scp.1
1.7+15-15crypto/external/bsd/openssh/dist/kexgex.c
1.23+25-4crypto/external/bsd/openssh/dist/auth2-pubkey.c
1.25+10-17crypto/external/bsd/openssh/dist/monitor_wrap.c
1.9+25-2crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.8
1.19+16-9crypto/external/bsd/openssh/dist/myproposal.h
1.26+19-6crypto/external/bsd/openssh/dist/ssh-agent.c
1.27+11-13crypto/external/bsd/openssh/lib/Makefile
1.24+14-10crypto/external/bsd/openssh/dist/ssh-keyscan.c
1.19+12-12crypto/external/bsd/openssh/dist/auth.h
1.14+20-3crypto/external/bsd/openssh/dist/ssh-add.1
1.13+14-7crypto/external/bsd/openssh/dist/moduli.c
1.9+15-6crypto/external/bsd/openssh/dist/atomicio.c
1.16+13-7crypto/external/bsd/openssh/dist/auth2-hostbased.c
1.8+11-9crypto/external/bsd/openssh/dist/digest-openssl.c
1.28+15-4crypto/external/bsd/openssh/dist/sshd_config.5
1.17+8-10crypto/external/bsd/openssh/dist/monitor_wrap.h
1.3+17-1crypto/external/bsd/openssh/dist/crypto_api.h
1.20+10-8crypto/external/bsd/openssh/dist/auth-options.c
1.7+17-1crypto/external/bsd/openssh/dist/ssh-pkcs11.h
1.10+10-7crypto/external/bsd/openssh/dist/sshbuf.c
1.13+6-10crypto/external/bsd/openssh/dist/sshconnect.h
1.12+11-5crypto/external/bsd/openssh/dist/readpass.c
1.21+10-5crypto/external/bsd/openssh/dist/authfile.c
1.19+6-8crypto/external/bsd/openssh/dist/packet.h
1.18+7-6crypto/external/bsd/openssh/dist/authfd.c
1.11+8-5crypto/external/bsd/openssh/dist/monitor.h
1.15+7-5crypto/external/bsd/openssh/dist/cipher.c
1.16+10-2crypto/external/bsd/openssh/dist/misc.h
1.9+6-5crypto/external/bsd/openssh/dist/sshkey.h
1.11+9-2crypto/external/bsd/openssh/dist/match.c
1.13+8-1crypto/external/bsd/openssh/dist/PROTOCOL
1.8+1-8crypto/external/bsd/openssh/dist/dispatch.h
1.19+6-3crypto/external/bsd/openssh/dist/servconf.h
1.11+2-5crypto/external/bsd/openssh/dist/sshbuf.h
1.7+5-2crypto/external/bsd/openssh/dist/pfilter.c
1.22+4-3crypto/external/bsd/openssh/dist/readconf.h
1.8+4-3crypto/external/bsd/openssh/dist/OVERVIEW
1.27+3-3crypto/external/bsd/openssh/dist/version.h
1.3+4-2crypto/external/bsd/openssh/dist/krl.h
1.17+3-3crypto/external/bsd/openssh/dist/ssh-keysign.c
1.12+5-1crypto/external/bsd/openssh/dist/ssh.h
1.13+3-3crypto/external/bsd/openssh/dist/cipher.h
1.10+3-3crypto/external/bsd/openssh/dist/dispatch.c
1.11+4-1crypto/external/bsd/openssh/dist/sftp-client.h
1.14+3-2crypto/external/bsd/openssh/dist/auth-krb5.c
1.9+3-2crypto/external/bsd/openssh/dist/groupaccess.c
1.10+2-2crypto/external/bsd/openssh/dist/kexc25519s.c
1.11+2-2crypto/external/bsd/openssh/dist/dh.h
1.8+3-1crypto/external/bsd/openssh/dist/atomicio.h
1.3+2-2crypto/external/bsd/openssh/bin/ssh-keyscan/Makefile
1.17+2-2crypto/external/bsd/openssh/bin/sshd/Makefile
1.23+2-2crypto/external/bsd/openssh/lib/shlib_version
1.14+2-2crypto/external/bsd/openssh/dist/kexdhc.c
1.18+2-2crypto/external/bsd/openssh/dist/kexdhs.c
1.11+2-2crypto/external/bsd/openssh/dist/kexecdhc.c
1.12+2-2crypto/external/bsd/openssh/dist/kexecdhs.c
1.11+2-2crypto/external/bsd/openssh/dist/opacket.c
1.2+3-0crypto/external/bsd/openssh/dist/kexsntrup4591761x25519.c
1.9+2-1crypto/external/bsd/openssh/dist/session.h
1.10+2-1crypto/external/bsd/openssh/dist/match.h
1.12+1-2crypto/external/bsd/openssh/dist/ssh_config
1.16+2-1crypto/external/bsd/openssh/dist/channels.h
1.11+2-1crypto/external/bsd/openssh/dist/PROTOCOL.certkeys
1.2+3-0crypto/external/bsd/openssh/dist/sntrup4591761.c
1.7+2-1crypto/external/bsd/openssh/dist/progressmeter.h
1.2+3-0crypto/external/bsd/openssh/dist/kexgen.c
1.9+1-1crypto/external/bsd/openssh/dist/auth2-krb5.c
1.11+1-1crypto/external/bsd/openssh/dist/opacket.h
1.9+1-1crypto/external/bsd/openssh/dist/kexc25519c.c
1.11+1-1crypto/external/bsd/openssh/dist/sftp-common.c
1.9+1-1crypto/external/bsd/openssh/dist/auth-pam.h
1.8+0-0crypto/external/bsd/openssh/dist/namespace.h
1.12+0-0crypto/external/bsd/openssh/dist/authfd.h
1.12+0-0crypto/external/bsd/openssh/dist/ssh2.h
+7,195-4,353128 files

UnifiedSplitRaw