Module Name: src
Committed By: christos
Date: Fri Apr 6 18:59:00 UTC 2018
Modified Files:
src/crypto/external/bsd/openssh: Makefile.inc
src/crypto/external/bsd/openssh/bin/ssh: Makefile
src/crypto/external/bsd/openssh/dist: PROTOCOL PROTOCOL.certkeys
auth-options.c auth-options.h auth-pam.c auth-pam.h auth-passwd.c
auth.c auth.h auth2-hostbased.c auth2-none.c auth2-passwd.c
auth2-pubkey.c auth2.c authfd.c authfd.h authfile.c bitmap.c
bitmap.h blf.h chacha.h channels.c cipher-aesctr.c cipher-aesctr.h
cipher-chachapoly.h cipher-ctr-mt.c cipher.c cleanup.c clientloop.c
clientloop.h compat.c compat.h crypto_api.h dh.c digest.h dns.c
dns.h fe25519.h fmt_scaled.c ge25519.h hash.c hmac.h includes.h
kex.c kexc25519c.c kexdhc.c kexdhs.c kexecdhc.c kexecdhs.c
kexgexc.c kexgexs.c key.c key.h krl.c krl.h misc.c misc.h moduli.c
monitor.c monitor_wrap.c monitor_wrap.h opacket.c opacket.h
packet.c packet.h pathnames.h pfilter.c pfilter.h poly1305.h
readconf.c readconf.h readpassphrase.c rijndael.c rijndael.h
sandbox-pledge.c sc25519.h scp.1 scp.c servconf.c servconf.h
serverloop.c session.c sftp-client.c sftp.1 sftp.c ssh-add.c
ssh-agent.c ssh-dss.c ssh-ecdsa.c ssh-keygen.1 ssh-keygen.c
ssh-keyscan.1 ssh-keyscan.c ssh-keysign.c ssh-pkcs11-client.c
ssh-pkcs11-helper.c ssh-pkcs11.c ssh-rsa.c ssh-sandbox.h ssh-xmss.c
ssh.1 ssh.c ssh_config.5 sshbuf.h sshconnect.c sshconnect.h
sshconnect2.c sshd.8 sshd.c sshd_config sshd_config.5 ssherr.h
sshkey-xmss.c sshkey-xmss.h sshkey.c sshkey.h ttymodes.c umac.c
umac128.c utf8.h version.h xmss_commons.c xmss_commons.h
xmss_fast.c xmss_fast.h xmss_hash.c xmss_hash.h xmss_hash_address.c
xmss_hash_address.h xmss_wots.c xmss_wots.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/dist: freezero.c
Removed Files:
src/crypto/external/bsd/openssh/dist: blocks.c
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/crypto/external/bsd/openssh/Makefile.inc
cvs rdiff -u -r1.13 -r1.14 src/crypto/external/bsd/openssh/bin/ssh/Makefile
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssh/dist/PROTOCOL \
src/crypto/external/bsd/openssh/dist/compat.h \
src/crypto/external/bsd/openssh/dist/dns.h \
src/crypto/external/bsd/openssh/dist/moduli.c \
src/crypto/external/bsd/openssh/dist/sshconnect.h
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssh/dist/PROTOCOL.certkeys \
src/crypto/external/bsd/openssh/dist/auth2-none.c \
src/crypto/external/bsd/openssh/dist/auth2-passwd.c \
src/crypto/external/bsd/openssh/dist/cipher-ctr-mt.c \
src/crypto/external/bsd/openssh/dist/kexecdhc.c \
src/crypto/external/bsd/openssh/dist/opacket.c \
src/crypto/external/bsd/openssh/dist/opacket.h \
src/crypto/external/bsd/openssh/dist/sshbuf.h \
src/crypto/external/bsd/openssh/dist/ttymodes.c
cvs rdiff -u -r1.16 -r1.17 \
src/crypto/external/bsd/openssh/dist/auth-options.c \
src/crypto/external/bsd/openssh/dist/auth.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.9 -r1.10 src/crypto/external/bsd/openssh/dist/auth-options.h \
src/crypto/external/bsd/openssh/dist/authfd.h \
src/crypto/external/bsd/openssh/dist/kexecdhs.c
cvs rdiff -u -r1.13 -r1.14 src/crypto/external/bsd/openssh/dist/auth-pam.c \
src/crypto/external/bsd/openssh/dist/dh.c \
src/crypto/external/bsd/openssh/dist/misc.h \
src/crypto/external/bsd/openssh/dist/pathnames.h \
src/crypto/external/bsd/openssh/dist/ssh-dss.c \
src/crypto/external/bsd/openssh/dist/ssh-keysign.c \
src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.c \
src/crypto/external/bsd/openssh/dist/sshkey.c
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssh/dist/auth-pam.h \
src/crypto/external/bsd/openssh/dist/bitmap.c \
src/crypto/external/bsd/openssh/dist/cleanup.c \
src/crypto/external/bsd/openssh/dist/fmt_scaled.c \
src/crypto/external/bsd/openssh/dist/sshkey.h
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssh/dist/auth-passwd.c \
src/crypto/external/bsd/openssh/dist/includes.h \
src/crypto/external/bsd/openssh/dist/kexc25519c.c \
src/crypto/external/bsd/openssh/dist/readpassphrase.c
cvs rdiff -u -r1.20 -r1.21 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/ssh-keygen.1 \
src/crypto/external/bsd/openssh/dist/ssh-keyscan.c \
src/crypto/external/bsd/openssh/dist/sshconnect.c
cvs rdiff -u -r1.12 -r1.13 \
src/crypto/external/bsd/openssh/dist/auth2-hostbased.c \
src/crypto/external/bsd/openssh/dist/cipher.c
cvs rdiff -u -r1.18 -r1.19 \
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.15 -r1.16 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/kexgexs.c \
src/crypto/external/bsd/openssh/dist/scp.1
cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssh/dist/authfd.c \
src/crypto/external/bsd/openssh/dist/kexdhs.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-pkcs11.c \
src/crypto/external/bsd/openssh/dist/ssh-rsa.c \
src/crypto/external/bsd/openssh/dist/umac.c
cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/openssh/dist/authfile.c \
src/crypto/external/bsd/openssh/dist/compat.c \
src/crypto/external/bsd/openssh/dist/scp.c
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/dist/bitmap.h \
src/crypto/external/bsd/openssh/dist/pfilter.c
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssh/dist/blf.h \
src/crypto/external/bsd/openssh/dist/pfilter.h \
src/crypto/external/bsd/openssh/dist/umac128.c
cvs rdiff -u -r1.5 -r0 src/crypto/external/bsd/openssh/dist/blocks.c
cvs rdiff -u -r1.1.1.2 -r1.2 src/crypto/external/bsd/openssh/dist/chacha.h \
src/crypto/external/bsd/openssh/dist/cipher-aesctr.c \
src/crypto/external/bsd/openssh/dist/crypto_api.h \
src/crypto/external/bsd/openssh/dist/ge25519.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/openssh/dist/cipher-aesctr.h \
src/crypto/external/bsd/openssh/dist/cipher-chachapoly.h \
src/crypto/external/bsd/openssh/dist/fe25519.h \
src/crypto/external/bsd/openssh/dist/hmac.h \
src/crypto/external/bsd/openssh/dist/poly1305.h \
src/crypto/external/bsd/openssh/dist/rijndael.h \
src/crypto/external/bsd/openssh/dist/sandbox-pledge.c \
src/crypto/external/bsd/openssh/dist/sc25519.h \
src/crypto/external/bsd/openssh/dist/ssh-sandbox.h \
src/crypto/external/bsd/openssh/dist/ssh-xmss.c \
src/crypto/external/bsd/openssh/dist/sshkey-xmss.c \
src/crypto/external/bsd/openssh/dist/sshkey-xmss.h \
src/crypto/external/bsd/openssh/dist/xmss_commons.c \
src/crypto/external/bsd/openssh/dist/xmss_commons.h \
src/crypto/external/bsd/openssh/dist/xmss_fast.c \
src/crypto/external/bsd/openssh/dist/xmss_fast.h \
src/crypto/external/bsd/openssh/dist/xmss_hash.c \
src/crypto/external/bsd/openssh/dist/xmss_hash.h \
src/crypto/external/bsd/openssh/dist/xmss_hash_address.c \
src/crypto/external/bsd/openssh/dist/xmss_hash_address.h \
src/crypto/external/bsd/openssh/dist/xmss_wots.c \
src/crypto/external/bsd/openssh/dist/xmss_wots.h
cvs rdiff -u -r1.22 -r1.23 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.1.1.3 -r1.2 src/crypto/external/bsd/openssh/dist/digest.h \
src/crypto/external/bsd/openssh/dist/krl.h \
src/crypto/external/bsd/openssh/dist/rijndael.c \
src/crypto/external/bsd/openssh/dist/ssherr.h
cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/openssh/dist/freezero.c
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssh/dist/hash.c
cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/openssh/dist/kexdhc.c \
src/crypto/external/bsd/openssh/dist/kexgexc.c \
src/crypto/external/bsd/openssh/dist/krl.c \
src/crypto/external/bsd/openssh/dist/ssh-ecdsa.c \
src/crypto/external/bsd/openssh/dist/ssh-pkcs11-client.c
cvs rdiff -u -r1.24 -r1.25 src/crypto/external/bsd/openssh/dist/monitor.c \
src/crypto/external/bsd/openssh/dist/version.h
cvs rdiff -u -r1.30 -r1.31 src/crypto/external/bsd/openssh/dist/packet.c
cvs rdiff -u -r1.19 -r1.20 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.25 -r1.26 src/crypto/external/bsd/openssh/dist/servconf.c \
src/crypto/external/bsd/openssh/dist/sshd_config.5
cvs rdiff -u -r1.23 -r1.24 src/crypto/external/bsd/openssh/dist/session.c
cvs rdiff -u -r1.21 -r1.22 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.29 -r1.30 src/crypto/external/bsd/openssh/dist/ssh-keygen.c \
src/crypto/external/bsd/openssh/dist/sshconnect2.c
cvs rdiff -u -r1.26 -r1.27 src/crypto/external/bsd/openssh/dist/ssh.c
cvs rdiff -u -r1.28 -r1.29 src/crypto/external/bsd/openssh/dist/sshd.c
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/dist/utf8.h
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.2048 \
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.24 -r1.25 src/crypto/external/bsd/openssh/lib/Makefile
cvs rdiff -u -r1.20 -r1.21 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.
