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

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

Module Name:    src
Committed By:   christos
Date:           Tue Apr 18 18:41:46 UTC 2017

Modified Files:
        src/crypto/external/bsd/openssh/dist: addrmatch.c atomicio.c atomicio.h
            auth-bsdauth.c auth-krb5.c auth-options.c auth-options.h auth-pam.c
            auth-pam.h auth-passwd.c auth-rhosts.c auth-skey.c auth.c auth.h
            auth2-chall.c auth2-gss.c auth2-hostbased.c auth2-kbdint.c
            auth2-krb5.c auth2-none.c auth2-passwd.c auth2-pubkey.c auth2.c
            authfd.c authfd.h authfile.c authfile.h bcrypt_pbkdf.c bitmap.c
            bitmap.h blocks.c blowfish.c bufaux.c bufbn.c bufec.c buffer.c
            buffer.h canohost.c canohost.h chacha.c channels.c channels.h
            cipher-3des1.c cipher-bf1.c cipher-chachapoly.c cipher-ctr-mt.c
            cipher.c cipher.h cleanup.c clientloop.c clientloop.h compat.c
            compat.h crc32.c crc32.h deattack.c deattack.h dh.c dh.h
            digest-libc.c digest-openssl.c dispatch.c dispatch.h dns.c dns.h
            ed25519.c fatal.c fe25519.c fmt_scaled.c fmt_scaled.h ge25519.c
            getpeereid.c getpeereid.h getrrsetbyname.c getrrsetbyname.h
            groupaccess.c groupaccess.h gss-genr.c gss-serv-krb5.c gss-serv.c
            hash.c hmac.c hostfile.c hostfile.h includes.h kex.c kex.h
            kexc25519.c kexc25519c.c kexc25519s.c kexdh.c kexdhc.c kexdhs.c
            kexecdh.c kexecdhc.c kexecdhs.c kexgex.c kexgexc.c kexgexs.c key.c
            key.h krl.c ldapauth.c ldapauth.h log.c log.h mac.c mac.h match.c
            match.h md-sha256.c misc.c misc.h moduli.5 moduli.c monitor.c
            monitor.h monitor_fdpass.c monitor_fdpass.h monitor_wrap.c
            monitor_wrap.h msg.c msg.h mux.c myproposal.h namespace.h nchan.c
            opacket.c opacket.h packet.c packet.h pathnames.h pkcs11.h
            poly1305.c progressmeter.c progressmeter.h random.h readconf.c
            readconf.h readpass.c readpassphrase.3 readpassphrase.c
            readpassphrase.h rsa.c rsa.h sandbox-rlimit.c sc25519.c scp.1 scp.c
            servconf.c servconf.h serverloop.c serverloop.h session.c session.h
            sftp-client.c sftp-client.h sftp-common.c sftp-common.h sftp-glob.c
            sftp-server-main.c sftp-server.8 sftp-server.c sftp.1 sftp.c sftp.h
            smult_curve25519_ref.c ssh-add.1 ssh-add.c ssh-agent.1 ssh-agent.c
            ssh-dss.c ssh-ecdsa.c ssh-ed25519.c ssh-gss.h 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-rsa.c ssh.1 ssh.c
            ssh.h ssh1.h ssh2.h ssh_api.c ssh_api.h ssh_config.5
            sshbuf-getput-basic.c sshbuf-getput-crypto.c sshbuf-misc.c sshbuf.c
            sshconnect.c sshconnect.h sshconnect1.c sshconnect2.c sshd.8 sshd.c
            sshd_config sshd_config.5 ssherr.c sshkey.c sshkey.h sshlogin.c
            sshlogin.h sshpty.c sshpty.h sshtty.c ttymodes.c ttymodes.h
            uidswap.c uidswap.h umac.c umac.h utf8.c uuencode.c uuencode.h
            verify.c version.h xmalloc.c xmalloc.h

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssh/dist/addrmatch.c \
    src/crypto/external/bsd/openssh/dist/auth-krb5.c \
    src/crypto/external/bsd/openssh/dist/auth-pam.c \
    src/crypto/external/bsd/openssh/dist/auth2-hostbased.c \
    src/crypto/external/bsd/openssh/dist/sftp-server.8 \
    src/crypto/external/bsd/openssh/dist/ssh-dss.c \
    src/crypto/external/bsd/openssh/dist/ssh2.h
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssh/dist/atomicio.c \
    src/crypto/external/bsd/openssh/dist/auth-options.h \
    src/crypto/external/bsd/openssh/dist/auth-rhosts.c \
    src/crypto/external/bsd/openssh/dist/authfd.h \
    src/crypto/external/bsd/openssh/dist/authfile.h \
    src/crypto/external/bsd/openssh/dist/bufbn.c \
    src/crypto/external/bsd/openssh/dist/buffer.c \
    src/crypto/external/bsd/openssh/dist/canohost.h \
    src/crypto/external/bsd/openssh/dist/cipher-bf1.c \
    src/crypto/external/bsd/openssh/dist/cipher-ctr-mt.c \
    src/crypto/external/bsd/openssh/dist/dispatch.c \
    src/crypto/external/bsd/openssh/dist/groupaccess.c \
    src/crypto/external/bsd/openssh/dist/kexc25519s.c \
    src/crypto/external/bsd/openssh/dist/kexecdhs.c \
    src/crypto/external/bsd/openssh/dist/mac.h \
    src/crypto/external/bsd/openssh/dist/match.c \
    src/crypto/external/bsd/openssh/dist/match.h \
    src/crypto/external/bsd/openssh/dist/monitor_fdpass.c \
    src/crypto/external/bsd/openssh/dist/nchan.c \
    src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.8 \
    src/crypto/external/bsd/openssh/dist/sshbuf-getput-crypto.c \
    src/crypto/external/bsd/openssh/dist/sshbuf-misc.c \
    src/crypto/external/bsd/openssh/dist/umac.h
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssh/dist/atomicio.h \
    src/crypto/external/bsd/openssh/dist/auth-bsdauth.c \
    src/crypto/external/bsd/openssh/dist/auth-passwd.c \
    src/crypto/external/bsd/openssh/dist/auth2-kbdint.c \
    src/crypto/external/bsd/openssh/dist/auth2-none.c \
    src/crypto/external/bsd/openssh/dist/auth2-passwd.c \
    src/crypto/external/bsd/openssh/dist/bufec.c \
    src/crypto/external/bsd/openssh/dist/fmt_scaled.h \
    src/crypto/external/bsd/openssh/dist/kexc25519.c \
    src/crypto/external/bsd/openssh/dist/kexdh.c \
    src/crypto/external/bsd/openssh/dist/kexecdh.c \
    src/crypto/external/bsd/openssh/dist/kexecdhc.c \
    src/crypto/external/bsd/openssh/dist/ldapauth.c \
    src/crypto/external/bsd/openssh/dist/namespace.h \
    src/crypto/external/bsd/openssh/dist/opacket.c \
    src/crypto/external/bsd/openssh/dist/opacket.h \
    src/crypto/external/bsd/openssh/dist/readpassphrase.c \
    src/crypto/external/bsd/openssh/dist/rsa.c \
    src/crypto/external/bsd/openssh/dist/session.h \
    src/crypto/external/bsd/openssh/dist/sftp-common.h \
    src/crypto/external/bsd/openssh/dist/sftp-server-main.c \
    src/crypto/external/bsd/openssh/dist/ssh-gss.h \
    src/crypto/external/bsd/openssh/dist/ssh1.h \
    src/crypto/external/bsd/openssh/dist/sshbuf-getput-basic.c \
    src/crypto/external/bsd/openssh/dist/sshbuf.c \
    src/crypto/external/bsd/openssh/dist/sshpty.c \
    src/crypto/external/bsd/openssh/dist/sshpty.h \
    src/crypto/external/bsd/openssh/dist/sshtty.c \
    src/crypto/external/bsd/openssh/dist/ttymodes.c \
    src/crypto/external/bsd/openssh/dist/ttymodes.h \
    src/crypto/external/bsd/openssh/dist/uidswap.c \
    src/crypto/external/bsd/openssh/dist/uuencode.h
cvs rdiff -u -r1.14 -r1.15 \
    src/crypto/external/bsd/openssh/dist/auth-options.c \
    src/crypto/external/bsd/openssh/dist/auth.h \
    src/crypto/external/bsd/openssh/dist/kex.h \
    src/crypto/external/bsd/openssh/dist/misc.c \
    src/crypto/external/bsd/openssh/dist/packet.h \
    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.5 -r1.6 src/crypto/external/bsd/openssh/dist/auth-pam.h \
    src/crypto/external/bsd/openssh/dist/auth2-krb5.c \
    src/crypto/external/bsd/openssh/dist/cleanup.c \
    src/crypto/external/bsd/openssh/dist/crc32.c \
    src/crypto/external/bsd/openssh/dist/crc32.h \
    src/crypto/external/bsd/openssh/dist/deattack.c \
    src/crypto/external/bsd/openssh/dist/deattack.h \
    src/crypto/external/bsd/openssh/dist/digest-libc.c \
    src/crypto/external/bsd/openssh/dist/dispatch.h \
    src/crypto/external/bsd/openssh/dist/fatal.c \
    src/crypto/external/bsd/openssh/dist/fmt_scaled.c \
    src/crypto/external/bsd/openssh/dist/groupaccess.h \
    src/crypto/external/bsd/openssh/dist/hmac.c \
    src/crypto/external/bsd/openssh/dist/includes.h \
    src/crypto/external/bsd/openssh/dist/kexc25519c.c \
    src/crypto/external/bsd/openssh/dist/kexgex.c \
    src/crypto/external/bsd/openssh/dist/monitor_fdpass.h \
    src/crypto/external/bsd/openssh/dist/msg.c \
    src/crypto/external/bsd/openssh/dist/msg.h \
    src/crypto/external/bsd/openssh/dist/pkcs11.h \
    src/crypto/external/bsd/openssh/dist/progressmeter.h \
    src/crypto/external/bsd/openssh/dist/rsa.h \
    src/crypto/external/bsd/openssh/dist/sandbox-rlimit.c \
    src/crypto/external/bsd/openssh/dist/serverloop.h \
    src/crypto/external/bsd/openssh/dist/sftp.h \
    src/crypto/external/bsd/openssh/dist/ssh-ed25519.c \
    src/crypto/external/bsd/openssh/dist/ssh-pkcs11.h \
    src/crypto/external/bsd/openssh/dist/ssh_api.c \
    src/crypto/external/bsd/openssh/dist/ssherr.c \
    src/crypto/external/bsd/openssh/dist/sshlogin.h \
    src/crypto/external/bsd/openssh/dist/uidswap.h
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/dist/auth-skey.c \
    src/crypto/external/bsd/openssh/dist/bitmap.c \
    src/crypto/external/bsd/openssh/dist/blocks.c \
    src/crypto/external/bsd/openssh/dist/chacha.c \
    src/crypto/external/bsd/openssh/dist/cipher-chachapoly.c \
    src/crypto/external/bsd/openssh/dist/digest-openssl.c \
    src/crypto/external/bsd/openssh/dist/ed25519.c \
    src/crypto/external/bsd/openssh/dist/fe25519.c \
    src/crypto/external/bsd/openssh/dist/ge25519.c \
    src/crypto/external/bsd/openssh/dist/getpeereid.c \
    src/crypto/external/bsd/openssh/dist/getpeereid.h \
    src/crypto/external/bsd/openssh/dist/getrrsetbyname.c \
    src/crypto/external/bsd/openssh/dist/getrrsetbyname.h \
    src/crypto/external/bsd/openssh/dist/hash.c \
    src/crypto/external/bsd/openssh/dist/ldapauth.h \
    src/crypto/external/bsd/openssh/dist/md-sha256.c \
    src/crypto/external/bsd/openssh/dist/moduli.5 \
    src/crypto/external/bsd/openssh/dist/poly1305.c \
    src/crypto/external/bsd/openssh/dist/random.h \
    src/crypto/external/bsd/openssh/dist/readpassphrase.3 \
    src/crypto/external/bsd/openssh/dist/readpassphrase.h \
    src/crypto/external/bsd/openssh/dist/sc25519.c \
    src/crypto/external/bsd/openssh/dist/smult_curve25519_ref.c \
    src/crypto/external/bsd/openssh/dist/sshkey.h \
    src/crypto/external/bsd/openssh/dist/utf8.c \
    src/crypto/external/bsd/openssh/dist/verify.c
cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/openssh/dist/auth.c \
    src/crypto/external/bsd/openssh/dist/ssh-keygen.1 \
    src/crypto/external/bsd/openssh/dist/ssh-keyscan.c \
    src/crypto/external/bsd/openssh/dist/sshconnect.c
cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/openssh/dist/auth2-chall.c \
    src/crypto/external/bsd/openssh/dist/canohost.c \
    src/crypto/external/bsd/openssh/dist/dh.c \
    src/crypto/external/bsd/openssh/dist/kexdhs.c \
    src/crypto/external/bsd/openssh/dist/log.h \
    src/crypto/external/bsd/openssh/dist/misc.h \
    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/ssh-keysign.8 \
    src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.c \
    src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c \
    src/crypto/external/bsd/openssh/dist/ssh-rsa.c
cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssh/dist/auth2-gss.c \
    src/crypto/external/bsd/openssh/dist/cipher.c \
    src/crypto/external/bsd/openssh/dist/cipher.h \
    src/crypto/external/bsd/openssh/dist/gss-serv-krb5.c \
    src/crypto/external/bsd/openssh/dist/gss-serv.c \
    src/crypto/external/bsd/openssh/dist/hostfile.c \
    src/crypto/external/bsd/openssh/dist/krl.c \
    src/crypto/external/bsd/openssh/dist/moduli.c \
    src/crypto/external/bsd/openssh/dist/progressmeter.c \
    src/crypto/external/bsd/openssh/dist/sftp-client.h \
    src/crypto/external/bsd/openssh/dist/sftp-glob.c \
    src/crypto/external/bsd/openssh/dist/ssh-ecdsa.c \
    src/crypto/external/bsd/openssh/dist/sshconnect1.c \
    src/crypto/external/bsd/openssh/dist/sshkey.c \
    src/crypto/external/bsd/openssh/dist/uuencode.c
cvs rdiff -u -r1.16 -r1.17 \
    src/crypto/external/bsd/openssh/dist/auth2-pubkey.c \
    src/crypto/external/bsd/openssh/dist/monitor_wrap.c \
    src/crypto/external/bsd/openssh/dist/serverloop.c
cvs rdiff -u -r1.13 -r1.14 src/crypto/external/bsd/openssh/dist/auth2.c \
    src/crypto/external/bsd/openssh/dist/clientloop.h \
    src/crypto/external/bsd/openssh/dist/dns.c \
    src/crypto/external/bsd/openssh/dist/mac.c \
    src/crypto/external/bsd/openssh/dist/scp.1
cvs rdiff -u -r1.12 -r1.13 src/crypto/external/bsd/openssh/dist/authfd.c \
    src/crypto/external/bsd/openssh/dist/channels.h \
    src/crypto/external/bsd/openssh/dist/kexgexs.c \
    src/crypto/external/bsd/openssh/dist/key.h \
    src/crypto/external/bsd/openssh/dist/monitor_wrap.h \
    src/crypto/external/bsd/openssh/dist/ssh-keyscan.1 \
    src/crypto/external/bsd/openssh/dist/ssh-keysign.c \
    src/crypto/external/bsd/openssh/dist/umac.c
cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssh/dist/authfile.c \
    src/crypto/external/bsd/openssh/dist/compat.c \
    src/crypto/external/bsd/openssh/dist/log.c \
    src/crypto/external/bsd/openssh/dist/myproposal.h \
    src/crypto/external/bsd/openssh/dist/scp.c \
    src/crypto/external/bsd/openssh/dist/sftp-server.c
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/dist/bcrypt_pbkdf.c \
    src/crypto/external/bsd/openssh/dist/bitmap.h \
    src/crypto/external/bsd/openssh/dist/blowfish.c \
    src/crypto/external/bsd/openssh/dist/ssh_api.h
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssh/dist/bufaux.c \
    src/crypto/external/bsd/openssh/dist/buffer.h \
    src/crypto/external/bsd/openssh/dist/cipher-3des1.c \
    src/crypto/external/bsd/openssh/dist/compat.h \
    src/crypto/external/bsd/openssh/dist/dh.h \
    src/crypto/external/bsd/openssh/dist/dns.h \
    src/crypto/external/bsd/openssh/dist/gss-genr.c \
    src/crypto/external/bsd/openssh/dist/hostfile.h \
    src/crypto/external/bsd/openssh/dist/kexdhc.c \
    src/crypto/external/bsd/openssh/dist/kexgexc.c \
    src/crypto/external/bsd/openssh/dist/monitor.h \
    src/crypto/external/bsd/openssh/dist/readpass.c \
    src/crypto/external/bsd/openssh/dist/sftp-common.c \
    src/crypto/external/bsd/openssh/dist/ssh-pkcs11-client.c \
    src/crypto/external/bsd/openssh/dist/ssh.h \
    src/crypto/external/bsd/openssh/dist/sshconnect.h \
    src/crypto/external/bsd/openssh/dist/sshlogin.c \
    src/crypto/external/bsd/openssh/dist/xmalloc.c \
    src/crypto/external/bsd/openssh/dist/xmalloc.h
cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/openssh/dist/channels.c \
    src/crypto/external/bsd/openssh/dist/kex.c \
    src/crypto/external/bsd/openssh/dist/mux.c \
    src/crypto/external/bsd/openssh/dist/readconf.h \
    src/crypto/external/bsd/openssh/dist/sftp-client.c \
    src/crypto/external/bsd/openssh/dist/sshd.8
cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssh/dist/clientloop.c \
    src/crypto/external/bsd/openssh/dist/key.c \
    src/crypto/external/bsd/openssh/dist/readconf.c \
    src/crypto/external/bsd/openssh/dist/sftp.c
cvs rdiff -u -r1.21 -r1.22 src/crypto/external/bsd/openssh/dist/monitor.c \
    src/crypto/external/bsd/openssh/dist/session.c
cvs rdiff -u -r1.26 -r1.27 src/crypto/external/bsd/openssh/dist/packet.c \
    src/crypto/external/bsd/openssh/dist/sshd.c
cvs rdiff -u -r1.22 -r1.23 src/crypto/external/bsd/openssh/dist/servconf.c \
    src/crypto/external/bsd/openssh/dist/version.h
cvs rdiff -u -r1.19 -r1.20 src/crypto/external/bsd/openssh/dist/ssh-agent.c \
    src/crypto/external/bsd/openssh/dist/ssh.1 \
    src/crypto/external/bsd/openssh/dist/ssh_config.5 \
    src/crypto/external/bsd/openssh/dist/sshd_config
cvs rdiff -u -r1.25 -r1.26 src/crypto/external/bsd/openssh/dist/ssh-keygen.c
cvs rdiff -u -r1.24 -r1.25 src/crypto/external/bsd/openssh/dist/ssh.c
cvs rdiff -u -r1.27 -r1.28 src/crypto/external/bsd/openssh/dist/sshconnect2.c
cvs rdiff -u -r1.23 -r1.24 src/crypto/external/bsd/openssh/dist/sshd_config.5

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