Module Name: src
Committed By: christos
Date: Fri Dec 4 18:42:50 UTC 2020
Modified Files:
src/crypto/external/bsd/openssh: openssh2netbsd
src/crypto/external/bsd/openssh/dist: PROTOCOL PROTOCOL.agent
auth-options.c auth-options.h auth.c auth2-pubkey.c authfd.c
authfd.h authfile.c channels.c channels.h clientloop.c compat.c
compat.h hostfile.c hostfile.h kex.c kexdh.c krl.c log.c match.c
match.h misc.c misc.h monitor.c monitor_wrap.c monitor_wrap.h msg.c
mux.c packet.c readconf.c readconf.h readpass.c scp.1 scp.c
servconf.c servconf.h serverloop.c session.c sftp-client.c
sftp-server.8 sftp-server.c sftp.1 sftp.c sk-usbhid.c ssh-add.1
ssh-add.c ssh-agent.1 ssh-agent.c ssh-ecdsa-sk.c ssh-keygen.1
ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-pkcs11.c
ssh-sk-helper.c ssh-sk.c ssh.1 ssh.c ssh.h ssh_api.c ssh_config
ssh_config.5 sshbuf-getput-basic.c sshbuf-misc.c sshbuf.h
sshconnect.c sshconnect2.c sshd.8 sshd.c sshd_config.5 sshkey.c
sshkey.h sshsig.c version.h
src/crypto/external/bsd/openssh/dist/moduli-gen: moduli.2048
moduli.3072 moduli.4096 moduli.6144 moduli.7680 moduli.8192
src/crypto/external/bsd/openssh/lib: shlib_version
Removed Files:
src/crypto/external/bsd/openssh/dist/ssh-sk-helper: Makefile
Log Message:
Merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/openssh2netbsd
cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssh/dist/PROTOCOL \
src/crypto/external/bsd/openssh/dist/authfd.h \
src/crypto/external/bsd/openssh/dist/readpass.c \
src/crypto/external/bsd/openssh/dist/ssh_config \
src/crypto/external/bsd/openssh/dist/sshbuf.h
cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssh/dist/PROTOCOL.agent \
src/crypto/external/bsd/openssh/dist/hostfile.h \
src/crypto/external/bsd/openssh/dist/msg.c
cvs rdiff -u -r1.23 -r1.24 \
src/crypto/external/bsd/openssh/dist/auth-options.c \
src/crypto/external/bsd/openssh/dist/misc.c \
src/crypto/external/bsd/openssh/dist/sshkey.c
cvs rdiff -u -r1.13 -r1.14 \
src/crypto/external/bsd/openssh/dist/auth-options.h \
src/crypto/external/bsd/openssh/dist/match.c
cvs rdiff -u -r1.27 -r1.28 src/crypto/external/bsd/openssh/dist/auth.c \
src/crypto/external/bsd/openssh/dist/channels.c \
src/crypto/external/bsd/openssh/dist/kex.c \
src/crypto/external/bsd/openssh/dist/monitor_wrap.c \
src/crypto/external/bsd/openssh/dist/scp.c \
src/crypto/external/bsd/openssh/dist/serverloop.c \
src/crypto/external/bsd/openssh/dist/ssh.1 \
src/crypto/external/bsd/openssh/dist/ssh_config.5 \
src/crypto/external/bsd/openssh/dist/sshconnect.c
cvs rdiff -u -r1.25 -r1.26 \
src/crypto/external/bsd/openssh/dist/auth2-pubkey.c
cvs rdiff -u -r1.21 -r1.22 src/crypto/external/bsd/openssh/dist/authfd.c \
src/crypto/external/bsd/openssh/dist/scp.1 \
src/crypto/external/bsd/openssh/dist/sftp-server.c
cvs rdiff -u -r1.24 -r1.25 src/crypto/external/bsd/openssh/dist/authfile.c \
src/crypto/external/bsd/openssh/dist/readconf.h \
src/crypto/external/bsd/openssh/dist/sftp-client.c
cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/openssh/dist/channels.h \
src/crypto/external/bsd/openssh/dist/hostfile.c \
src/crypto/external/bsd/openssh/dist/krl.c
cvs rdiff -u -r1.29 -r1.30 src/crypto/external/bsd/openssh/dist/clientloop.c \
src/crypto/external/bsd/openssh/dist/sftp.c \
src/crypto/external/bsd/openssh/dist/ssh-agent.c
cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssh/dist/compat.c \
src/crypto/external/bsd/openssh/dist/log.c \
src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c
cvs rdiff -u -r1.12 -r1.13 src/crypto/external/bsd/openssh/dist/compat.h \
src/crypto/external/bsd/openssh/dist/sftp-server.8 \
src/crypto/external/bsd/openssh/dist/ssh.h \
src/crypto/external/bsd/openssh/dist/sshkey.h
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssh/dist/kexdh.c
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssh/dist/match.h \
src/crypto/external/bsd/openssh/dist/ssh_api.c \
src/crypto/external/bsd/openssh/dist/sshbuf-getput-basic.c
cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/openssh/dist/misc.h
cvs rdiff -u -r1.34 -r1.35 src/crypto/external/bsd/openssh/dist/monitor.c
cvs rdiff -u -r1.19 -r1.20 \
src/crypto/external/bsd/openssh/dist/monitor_wrap.h \
src/crypto/external/bsd/openssh/dist/ssh-keysign.c
cvs rdiff -u -r1.26 -r1.27 src/crypto/external/bsd/openssh/dist/mux.c \
src/crypto/external/bsd/openssh/dist/ssh-keygen.1 \
src/crypto/external/bsd/openssh/dist/ssh-keyscan.c
cvs rdiff -u -r1.41 -r1.42 src/crypto/external/bsd/openssh/dist/packet.c
cvs rdiff -u -r1.31 -r1.32 src/crypto/external/bsd/openssh/dist/readconf.c \
src/crypto/external/bsd/openssh/dist/session.c \
src/crypto/external/bsd/openssh/dist/sshd_config.5
cvs rdiff -u -r1.33 -r1.34 src/crypto/external/bsd/openssh/dist/servconf.c \
src/crypto/external/bsd/openssh/dist/ssh.c \
src/crypto/external/bsd/openssh/dist/version.h
cvs rdiff -u -r1.22 -r1.23 src/crypto/external/bsd/openssh/dist/servconf.h \
src/crypto/external/bsd/openssh/dist/sftp.1 \
src/crypto/external/bsd/openssh/dist/ssh-add.c \
src/crypto/external/bsd/openssh/dist/sshd.8
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/dist/sk-usbhid.c \
src/crypto/external/bsd/openssh/dist/ssh-sk.c
cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssh/dist/ssh-add.1 \
src/crypto/external/bsd/openssh/dist/ssh-agent.1
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/dist/ssh-ecdsa-sk.c \
src/crypto/external/bsd/openssh/dist/ssh-sk-helper.c
cvs rdiff -u -r1.36 -r1.37 src/crypto/external/bsd/openssh/dist/ssh-keygen.c
cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/openssh/dist/sshbuf-misc.c
cvs rdiff -u -r1.37 -r1.38 src/crypto/external/bsd/openssh/dist/sshconnect2.c
cvs rdiff -u -r1.39 -r1.40 src/crypto/external/bsd/openssh/dist/sshd.c
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/dist/sshsig.c
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.2048
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.3072 \
src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.4096 \
src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.6144 \
src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.7680 \
src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.8192
cvs rdiff -u -r1.1.1.1 -r0 \
src/crypto/external/bsd/openssh/dist/ssh-sk-helper/Makefile
cvs rdiff -u -r1.26 -r1.27 src/crypto/external/bsd/openssh/lib/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
