CVS commit: src/crypto/external/bsd/openssh

["Christos Zoulas" <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Thu Feb 27 00:24:41 UTC 2020

Modified Files:
        src/crypto/external/bsd/openssh: Makefile
        src/crypto/external/bsd/openssh/bin/scp: Makefile
        src/crypto/external/bsd/openssh/bin/sftp: Makefile
        src/crypto/external/bsd/openssh/bin/sftp-server: Makefile
        src/crypto/external/bsd/openssh/bin/ssh: Makefile
        src/crypto/external/bsd/openssh/bin/ssh-add: Makefile
        src/crypto/external/bsd/openssh/bin/ssh-agent: Makefile
        src/crypto/external/bsd/openssh/bin/ssh-keygen: Makefile
        src/crypto/external/bsd/openssh/bin/ssh-keyscan: Makefile
        src/crypto/external/bsd/openssh/bin/ssh-keysign: Makefile
        src/crypto/external/bsd/openssh/bin/ssh-pkcs11-helper: Makefile
        src/crypto/external/bsd/openssh/bin/sshd: Makefile
        src/crypto/external/bsd/openssh/dist: PROTOCOL.certkeys auth-options.c
            auth-options.h auth.c auth2-chall.c auth2-gss.c auth2-hostbased.c
            auth2-kbdint.c auth2-pubkey.c authfd.c authfd.h authfile.c
            authfile.h channels.c channels.h cipher.c cipher.h clientloop.c
            gss-serv.c hash.c hostfile.c kex.c kexgen.c kexgexc.c krl.c match.c
            misc.c misc.h moduli.c monitor.c monitor_wrap.c monitor_wrap.h
            msg.c mux.c myproposal.h packet.c pathnames.h progressmeter.c
            readconf.c readconf.h readpass.c scp.1 scp.c servconf.c servconf.h
            serverloop.c session.c sftp-glob.c sftp-realpath.c sftp-server.8
            sftp.1 sftp.c sk-usbhid.c ssh-add.1 ssh-add.c ssh-agent.1
            ssh-agent.c ssh-ecdsa-sk.c ssh-ed25519-sk.c ssh-keygen.1
            ssh-keygen.c ssh-keyscan.1 ssh-keyscan.c ssh-keysign.8
            ssh-keysign.c ssh-pkcs11-client.c ssh-pkcs11-helper.8
            ssh-pkcs11-helper.c ssh-pkcs11.c ssh-pkcs11.h ssh-sk-client.c
            ssh-sk-helper.c ssh-sk.c ssh.1 ssh.c ssh_api.c ssh_config.5
            sshbuf-getput-basic.c sshbuf-getput-crypto.c sshbuf-io.c
            sshbuf-misc.c sshbuf.c sshbuf.h sshconnect.c sshconnect.h
            sshconnect2.c sshd.8 sshd.c sshd_config.5 ssherr.c ssherr.h
            sshkey-xmss.c sshkey.c sshkey.h sshsig.c umac.c version.h xmalloc.c
            xmalloc.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: Makefile shlib_version
Added Files:
        src/crypto/external/bsd/openssh/libexec: Makefile Makefile.inc
        src/crypto/external/bsd/openssh/libexec/ssh-sk-helper: Makefile

Log Message:
Merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssh/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssh/bin/scp/Makefile
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssh/bin/sftp/Makefile
cvs rdiff -u -r1.2 -r1.3 \
    src/crypto/external/bsd/openssh/bin/sftp-server/Makefile
cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssh/bin/ssh/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssh/bin/ssh-add/Makefile
cvs rdiff -u -r1.3 -r1.4 \
    src/crypto/external/bsd/openssh/bin/ssh-agent/Makefile
cvs rdiff -u -r1.6 -r1.7 \
    src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile
cvs rdiff -u -r1.3 -r1.4 \
    src/crypto/external/bsd/openssh/bin/ssh-keyscan/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/crypto/external/bsd/openssh/bin/ssh-keysign/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/crypto/external/bsd/openssh/bin/ssh-pkcs11-helper/Makefile
cvs rdiff -u -r1.19 -r1.20 src/crypto/external/bsd/openssh/bin/sshd/Makefile
cvs rdiff -u -r1.11 -r1.12 \
    src/crypto/external/bsd/openssh/dist/PROTOCOL.certkeys \
    src/crypto/external/bsd/openssh/dist/auth2-kbdint.c \
    src/crypto/external/bsd/openssh/dist/sftp-glob.c \
    src/crypto/external/bsd/openssh/dist/sftp-server.8 \
    src/crypto/external/bsd/openssh/dist/xmalloc.c \
    src/crypto/external/bsd/openssh/dist/xmalloc.h
cvs rdiff -u -r1.21 -r1.22 \
    src/crypto/external/bsd/openssh/dist/auth-options.c \
    src/crypto/external/bsd/openssh/dist/misc.c \
    src/crypto/external/bsd/openssh/dist/sshd.8 \
    src/crypto/external/bsd/openssh/dist/sshkey.c
cvs rdiff -u -r1.12 -r1.13 \
    src/crypto/external/bsd/openssh/dist/auth-options.h \
    src/crypto/external/bsd/openssh/dist/match.c \
    src/crypto/external/bsd/openssh/dist/progressmeter.c \
    src/crypto/external/bsd/openssh/dist/ssh-keysign.8 \
    src/crypto/external/bsd/openssh/dist/sshbuf.h
cvs rdiff -u -r1.26 -r1.27 src/crypto/external/bsd/openssh/dist/auth.c \
    src/crypto/external/bsd/openssh/dist/monitor_wrap.c \
    src/crypto/external/bsd/openssh/dist/serverloop.c
cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssh/dist/auth2-chall.c \
    src/crypto/external/bsd/openssh/dist/channels.h \
    src/crypto/external/bsd/openssh/dist/cipher.c
cvs rdiff -u -r1.13 -r1.14 src/crypto/external/bsd/openssh/dist/auth2-gss.c \
    src/crypto/external/bsd/openssh/dist/authfd.h \
    src/crypto/external/bsd/openssh/dist/gss-serv.c \
    src/crypto/external/bsd/openssh/dist/readpass.c
cvs rdiff -u -r1.17 -r1.18 \
    src/crypto/external/bsd/openssh/dist/auth2-hostbased.c \
    src/crypto/external/bsd/openssh/dist/misc.h \
    src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.c \
    src/crypto/external/bsd/openssh/dist/umac.c
cvs rdiff -u -r1.24 -r1.25 \
    src/crypto/external/bsd/openssh/dist/auth2-pubkey.c \
    src/crypto/external/bsd/openssh/dist/mux.c \
    src/crypto/external/bsd/openssh/dist/scp.c \
    src/crypto/external/bsd/openssh/dist/ssh-keygen.1
cvs rdiff -u -r1.19 -r1.20 src/crypto/external/bsd/openssh/dist/authfd.c \
    src/crypto/external/bsd/openssh/dist/myproposal.h \
    src/crypto/external/bsd/openssh/dist/scp.1
cvs rdiff -u -r1.22 -r1.23 src/crypto/external/bsd/openssh/dist/authfile.c \
    src/crypto/external/bsd/openssh/dist/readconf.h
cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssh/dist/authfile.h \
    src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.8 \
    src/crypto/external/bsd/openssh/dist/ssh_api.c \
    src/crypto/external/bsd/openssh/dist/sshbuf-getput-basic.c \
    src/crypto/external/bsd/openssh/dist/sshbuf-getput-crypto.c \
    src/crypto/external/bsd/openssh/dist/sshbuf-misc.c
cvs rdiff -u -r1.25 -r1.26 src/crypto/external/bsd/openssh/dist/channels.c \
    src/crypto/external/bsd/openssh/dist/kex.c \
    src/crypto/external/bsd/openssh/dist/ssh-keyscan.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.14 -r1.15 src/crypto/external/bsd/openssh/dist/cipher.h \
    src/crypto/external/bsd/openssh/dist/kexgexc.c \
    src/crypto/external/bsd/openssh/dist/moduli.c \
    src/crypto/external/bsd/openssh/dist/pathnames.h \
    src/crypto/external/bsd/openssh/dist/ssh-add.1 \
    src/crypto/external/bsd/openssh/dist/ssh-agent.1 \
    src/crypto/external/bsd/openssh/dist/sshconnect.h
cvs rdiff -u -r1.27 -r1.28 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.6 -r1.7 src/crypto/external/bsd/openssh/dist/hash.c
cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssh/dist/hostfile.c \
    src/crypto/external/bsd/openssh/dist/krl.c \
    src/crypto/external/bsd/openssh/dist/ssh-keyscan.1 \
    src/crypto/external/bsd/openssh/dist/ssh-pkcs11-client.c
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/dist/kexgen.c \
    src/crypto/external/bsd/openssh/dist/ssherr.h
cvs rdiff -u -r1.32 -r1.33 src/crypto/external/bsd/openssh/dist/monitor.c
cvs rdiff -u -r1.18 -r1.19 \
    src/crypto/external/bsd/openssh/dist/monitor_wrap.h \
    src/crypto/external/bsd/openssh/dist/ssh-keysign.c \
    src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssh/dist/msg.c \
    src/crypto/external/bsd/openssh/dist/ssherr.c
cvs rdiff -u -r1.39 -r1.40 src/crypto/external/bsd/openssh/dist/packet.c
cvs rdiff -u -r1.28 -r1.29 src/crypto/external/bsd/openssh/dist/readconf.c
cvs rdiff -u -r1.31 -r1.32 src/crypto/external/bsd/openssh/dist/servconf.c \
    src/crypto/external/bsd/openssh/dist/ssh.c
cvs rdiff -u -r1.20 -r1.21 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
cvs rdiff -u -r1.29 -r1.30 src/crypto/external/bsd/openssh/dist/session.c \
    src/crypto/external/bsd/openssh/dist/sshd_config.5 \
    src/crypto/external/bsd/openssh/dist/version.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/crypto/external/bsd/openssh/dist/sftp-realpath.c \
    src/crypto/external/bsd/openssh/dist/sk-usbhid.c \
    src/crypto/external/bsd/openssh/dist/ssh-ecdsa-sk.c \
    src/crypto/external/bsd/openssh/dist/ssh-ed25519-sk.c \
    src/crypto/external/bsd/openssh/dist/ssh-sk-client.c \
    src/crypto/external/bsd/openssh/dist/ssh-sk-helper.c \
    src/crypto/external/bsd/openssh/dist/ssh-sk.c \
    src/crypto/external/bsd/openssh/dist/sshbuf-io.c
cvs rdiff -u -r1.34 -r1.35 src/crypto/external/bsd/openssh/dist/ssh-keygen.c
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssh/dist/ssh-pkcs11.h
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssh/dist/sshbuf.c \
    src/crypto/external/bsd/openssh/dist/sshkey.h
cvs rdiff -u -r1.35 -r1.36 src/crypto/external/bsd/openssh/dist/sshconnect2.c
cvs rdiff -u -r1.37 -r1.38 src/crypto/external/bsd/openssh/dist/sshd.c
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssh/dist/sshkey-xmss.c
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/dist/sshsig.c
cvs rdiff -u -r1.5 -r1.6 \
    src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.2048
cvs rdiff -u -r1.7 -r1.8 \
    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.30 -r1.31 src/crypto/external/bsd/openssh/lib/Makefile
cvs rdiff -u -r1.24 -r1.25 src/crypto/external/bsd/openssh/lib/shlib_version
cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/openssh/libexec/Makefile \
    src/crypto/external/bsd/openssh/libexec/Makefile.inc
cvs rdiff -u -r0 -r1.1 \
    src/crypto/external/bsd/openssh/libexec/ssh-sk-helper/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.