Commit: d059297112922cabb0c674840589be8db821fd9a - Farhan-openssh (git)

Farhan/openssh

Commit MetaInfo

• Revision: d059297112922cabb0c674840589be8db821fd9a (tree)
• Time: 2015-04-08 09:50:50
• Author: Adam Langley <agl@goog...>
• Commiter: Adam Langley

Log Message

external/openssh: update to 6.8p1.

In preparation for some updates to external/openssh to make it work with
BoringSSL, this change updates the code to a recent version. The current
version (5.9p1) is coming up on four years old now.

• Confirmed that f5c67b478bef9992de9e9ec91ce10af4f6205e0d matches
  OpenSSH 5.9p1 exactly (save for the removal of the scard
  subdirectory).
  

• Downloaded openssh-6.8p1.tar.gz (SHA256:
  3ff64ce73ee124480b5bf767b9830d7d3c03bbcb6abe716b78f0192c37ce160e)
  and verified with PGP signature. (I've verified Damien's key in
  person previously.)
  

• Applied changes between f5c67b478bef9992de9e9ec91ce10af4f6205e0d and
  OpenSSH 5.9p1 to 6.8p1 and updated the build as best I can. The
  ugliest change is probably the duplication of umac.c to umac128.c
  because Android conditionally compiles that file twice. See the
  comment in those files.
  

Change-Id: I63cb07a8118afb5a377f116087a0882914cea486

Change Summary

• modified: Android.mk
• modified: ChangeLog
• modified: INSTALL
• modified: LICENCE
• modified: Makefile.in
• modified: PROTOCOL
• modified: PROTOCOL.agent
• modified: PROTOCOL.certkeys
• add: PROTOCOL.chacha20poly1305
• add: PROTOCOL.key
• add: PROTOCOL.krl
• modified: PROTOCOL.mux
• modified: README
• modified: aclocal.m4
• delete: acss.c
• delete: acss.h
• modified: addrmatch.c
• modified: atomicio.c
• modified: audit-bsm.c
• modified: auth-bsdauth.c
• modified: auth-chall.c
• modified: auth-krb5.c
• modified: auth-options.c
• modified: auth-options.h
• modified: auth-pam.c
• modified: auth-passwd.c
• modified: auth-rh-rsa.c
• modified: auth-rhosts.c
• modified: auth-rsa.c
• modified: auth.c
• modified: auth.h
• modified: auth1.c
• modified: auth2-chall.c
• modified: auth2-gss.c
• modified: auth2-hostbased.c
• delete: auth2-jpake.c
• modified: auth2-kbdint.c
• modified: auth2-none.c
• modified: auth2-passwd.c
• modified: auth2-pubkey.c
• modified: auth2.c
• modified: authfd.c
• modified: authfd.h
• modified: authfile.c
• modified: authfile.h
• add: bitmap.c
• add: bitmap.h
• add: blocks.c
• modified: bufaux.c
• modified: bufbn.c
• modified: bufec.c
• modified: buffer.c
• modified: buffer.h
• modified: buildpkg.sh.in
• modified: canohost.c
• add: chacha.c
• add: chacha.h
• modified: channels.c
• modified: channels.h
• modified: cipher-3des1.c
• delete: cipher-acss.c
• modified: cipher-aes.c
• add: cipher-aesctr.c
• add: cipher-aesctr.h
• modified: cipher-bf1.c
• add: cipher-chachapoly.c
• add: cipher-chachapoly.h
• modified: cipher-ctr.c
• modified: cipher.c
• modified: cipher.h
• modified: clientloop.c
• modified: clientloop.h
• modified: compat.c
• modified: compat.h
• delete: compress.c
• delete: compress.h
• modified: config.guess
• modified: config.h
• modified: config.h.in
• modified: config.sub
• modified: configure
• modified: configure.ac
• modified: contrib/Makefile
• delete: contrib/caldera/openssh.spec
• delete: contrib/caldera/ssh-host-keygen
• delete: contrib/caldera/sshd.init
• delete: contrib/caldera/sshd.pam
• modified: contrib/cygwin/Makefile
• modified: contrib/cygwin/README
• modified: contrib/cygwin/ssh-host-config
• modified: contrib/cygwin/ssh-user-config
• modified: contrib/redhat/openssh.spec
• modified: contrib/redhat/sshd.init
• modified: contrib/solaris/README
• modified: contrib/ssh-copy-id
• modified: contrib/ssh-copy-id.1
• modified: contrib/suse/openssh.spec
• modified: contrib/suse/rc.sshd
• add: crypto_api.h
• modified: deattack.c
• modified: deattack.h
• modified: defines.h
• modified: dh.c
• modified: dh.h
• add: digest-libc.c
• add: digest-openssl.c
• add: digest.h
• modified: dispatch.c
• modified: dispatch.h
• modified: dns.c
• modified: dns.h
• add: ed25519.c
• modified: entropy.c
• modified: entropy.h
• add: fe25519.c
• add: fe25519.h
• add: fixalgorithms
• add: ge25519.c
• add: ge25519.h
• add: ge25519_base.data
• modified: groupaccess.c
• modified: gss-genr.c
• modified: gss-serv-krb5.c
• modified: gss-serv.c
• add: hash.c
• add: hmac.c
• add: hmac.h
• modified: hostfile.c
• modified: hostfile.h
• modified: includes.h
• delete: jpake.c
• delete: jpake.h
• modified: kex.c
• modified: kex.h
• add: kexc25519.c
• add: kexc25519c.c
• add: kexc25519s.c
• modified: kexdh.c
• modified: kexdhc.c
• modified: kexdhs.c
• modified: kexecdh.c
• modified: kexecdhc.c
• modified: kexecdhs.c
• modified: kexgex.c
• modified: kexgexc.c
• modified: kexgexs.c
• modified: key.c
• modified: key.h
• add: krl.c
• add: krl.h
• modified: log.c
• modified: log.h
• modified: loginrec.c
• modified: mac.c
• modified: mac.h
• modified: match.c
• modified: misc.c
• modified: misc.h
• modified: moduli
• modified: moduli.0
• modified: moduli.5
• modified: moduli.c
• modified: monitor.c
• modified: monitor.h
• modified: monitor_fdpass.c
• modified: monitor_mm.c
• modified: monitor_mm.h
• modified: monitor_wrap.c
• modified: monitor_wrap.h
• modified: msg.c
• modified: msg.h
• modified: mux.c
• modified: myproposal.h
• add: opacket.c
• add: opacket.h
• add: openbsd-compat/.cvsignore
• modified: openbsd-compat/Makefile.in
• add: openbsd-compat/arc4random.c
• add: openbsd-compat/bcrypt_pbkdf.c
• add: openbsd-compat/blf.h
• add: openbsd-compat/blowfish.c
• delete: openbsd-compat/bsd-arc4random.c
• modified: openbsd-compat/bsd-cygwin_util.c
• modified: openbsd-compat/bsd-cygwin_util.h
• modified: openbsd-compat/bsd-misc.c
• modified: openbsd-compat/bsd-misc.h
• modified: openbsd-compat/bsd-openpty.c
• modified: openbsd-compat/bsd-poll.c
• add: openbsd-compat/bsd-setres_id.c
• add: openbsd-compat/bsd-setres_id.h
• modified: openbsd-compat/bsd-snprintf.c
• modified: openbsd-compat/bsd-statvfs.c
• modified: openbsd-compat/bsd-statvfs.h
• add: openbsd-compat/chacha_private.h
• add: openbsd-compat/explicit_bzero.c
• modified: openbsd-compat/fake-rfc2553.h
• modified: openbsd-compat/getcwd.c
• modified: openbsd-compat/getgrouplist.c
• delete: openbsd-compat/getopt.c
• add: openbsd-compat/getopt.h
• add: openbsd-compat/getopt_long.c
• add: openbsd-compat/getrrsetbyname-ldns.c
• modified: openbsd-compat/getrrsetbyname.c
• add: openbsd-compat/getrrsetbyname.c.orig
• modified: openbsd-compat/glob.c
• modified: openbsd-compat/inet_ntop.c
• add: openbsd-compat/kludge-fd_set.c
• add: openbsd-compat/md5.c
• add: openbsd-compat/md5.h
• modified: openbsd-compat/mktemp.c
• modified: openbsd-compat/openbsd-compat.h
• modified: openbsd-compat/openssl-compat.c
• modified: openbsd-compat/openssl-compat.h
• modified: openbsd-compat/port-aix.c
• modified: openbsd-compat/port-linux.c
• modified: openbsd-compat/port-tun.c
• modified: openbsd-compat/port-uw.c
• modified: openbsd-compat/readpassphrase.c
• add: openbsd-compat/readpassphrase.c.orig
• add: openbsd-compat/reallocarray.c
• add: openbsd-compat/regress/.cvsignore
• modified: openbsd-compat/regress/Makefile.in
• add: openbsd-compat/regress/opensslvertest.c
• add: openbsd-compat/rmd160.c
• add: openbsd-compat/rmd160.h
• modified: openbsd-compat/setenv.c
• modified: openbsd-compat/setproctitle.c
• add: openbsd-compat/sha1.c
• add: openbsd-compat/sha1.h
• modified: openbsd-compat/sha2.c
• modified: openbsd-compat/sha2.h
• modified: openbsd-compat/strlcpy.c
• add: openbsd-compat/strnlen.c
• add: openbsd-compat/strtoull.c
• modified: openbsd-compat/sys-queue.h
• modified: openbsd-compat/sys-tree.h
• modified: openbsd-compat/vis.c
• modified: openbsd-compat/vis.h
• modified: openbsd-compat/xcrypt.c
• modified: opensshd.init.in
• modified: packet.c
• modified: packet.h
• modified: pathnames.h
• modified: pkcs11.h
• modified: platform.c
• modified: platform.h
• add: poly1305.c
• add: poly1305.h
• modified: progressmeter.c
• modified: progressmeter.h
• modified: readconf.c
• modified: readconf.h
• modified: readpass.c
• delete: regress/Makefile
• delete: regress/README.regress
• delete: regress/addrmatch.sh
• delete: regress/agent-getpeereid.sh
• delete: regress/agent-pkcs11.sh
• delete: regress/agent-ptrace.sh
• delete: regress/agent-timeout.sh
• delete: regress/agent.sh
• delete: regress/banner.sh
• delete: regress/broken-pipe.sh
• delete: regress/brokenkeys.sh
• delete: regress/bsd.regress.mk
• delete: regress/cert-hostkey.sh
• delete: regress/cert-userkey.sh
• delete: regress/cfgmatch.sh
• delete: regress/cipher-speed.sh
• delete: regress/conch-ciphers.sh
• delete: regress/connect-privsep.sh
• delete: regress/connect.sh
• delete: regress/dsa_ssh2.prv
• delete: regress/dsa_ssh2.pub
• delete: regress/dynamic-forward.sh
• delete: regress/envpass.sh
• delete: regress/exit-status.sh
• delete: regress/forcecommand.sh
• delete: regress/forwarding.sh
• delete: regress/host-expand.sh
• delete: regress/kextype.sh
• delete: regress/key-options.sh
• delete: regress/keygen-change.sh
• delete: regress/keygen-convert.sh
• delete: regress/keyscan.sh
• delete: regress/keytype.sh
• delete: regress/localcommand.sh
• delete: regress/login-timeout.sh
• delete: regress/multiplex.sh
• delete: regress/portnum.sh
• delete: regress/proto-mismatch.sh
• delete: regress/proto-version.sh
• delete: regress/proxy-connect.sh
• delete: regress/putty-ciphers.sh
• delete: regress/putty-kex.sh
• delete: regress/putty-transfer.sh
• delete: regress/reconfigure.sh
• delete: regress/reexec.sh
• delete: regress/rekey.sh
• delete: regress/rsa_openssh.prv
• delete: regress/rsa_openssh.pub
• delete: regress/rsa_ssh2.prv
• delete: regress/runtests.sh
• delete: regress/scp-ssh-wrapper.sh
• delete: regress/scp.sh
• delete: regress/sftp-badcmds.sh
• delete: regress/sftp-batch.sh
• delete: regress/sftp-cmds.sh
• delete: regress/sftp-glob.sh
• delete: regress/sftp.sh
• delete: regress/ssh-com-client.sh
• delete: regress/ssh-com-keygen.sh
• delete: regress/ssh-com-sftp.sh
• delete: regress/ssh-com.sh
• delete: regress/ssh2putty.sh
• delete: regress/sshd-log-wrapper.sh
• delete: regress/stderr-after-eof.sh
• delete: regress/stderr-data.sh
• delete: regress/t4.ok
• delete: regress/t5.ok
• delete: regress/test-exec.sh
• delete: regress/transfer.sh
• delete: regress/try-ciphers.sh
• delete: regress/yes-head.sh
• modified: rijndael.c
• modified: rijndael.h
• modified: roaming.h
• modified: roaming_client.c
• modified: roaming_common.c
• modified: roaming_dummy.c
• modified: rsa.c
• modified: rsa.h
• add: sandbox-capsicum.c
• modified: sandbox-darwin.c
• modified: sandbox-null.c
• modified: sandbox-rlimit.c
• add: sandbox-seccomp-filter.c
• modified: sandbox-systrace.c
• add: sc25519.c
• add: sc25519.h
• delete: schnorr.c
• delete: schnorr.h
• modified: scp.0
• modified: scp.1
• modified: scp.c
• modified: servconf.c
• modified: servconf.h
• modified: serverloop.c
• modified: session.c
• modified: session.h
• modified: sftp-client.c
• modified: sftp-client.h
• modified: sftp-common.c
• modified: sftp-common.h
• modified: sftp-glob.c
• modified: sftp-server.0
• modified: sftp-server.8
• modified: sftp-server.c
• modified: sftp.0
• modified: sftp.1
• modified: sftp.c
• add: smult_curve25519_ref.c
• modified: ssh-add.0
• modified: ssh-add.1
• modified: ssh-add.c
• modified: ssh-agent.0
• modified: ssh-agent.1
• modified: ssh-agent.c
• modified: ssh-dss.c
• modified: ssh-ecdsa.c
• add: ssh-ed25519.c
• modified: ssh-gss.h
• modified: ssh-keygen.0
• modified: ssh-keygen.1
• modified: ssh-keygen.c
• modified: ssh-keyscan.0
• modified: ssh-keyscan.1
• modified: ssh-keyscan.c
• modified: ssh-keysign.0
• modified: ssh-keysign.8
• modified: ssh-keysign.c
• modified: ssh-pkcs11-client.c
• modified: ssh-pkcs11-helper.0
• modified: ssh-pkcs11-helper.8
• modified: ssh-pkcs11-helper.c
• modified: ssh-pkcs11.c
• modified: ssh-pkcs11.h
• modified: ssh-rsa.c
• modified: ssh-sandbox.h
• modified: ssh.0
• modified: ssh.1
• modified: ssh.c
• modified: ssh2.h
• add: ssh_api.c
• add: ssh_api.h
• modified: ssh_config
• modified: ssh_config.0
• modified: ssh_config.5
• add: sshbuf-getput-basic.c
• add: sshbuf-getput-crypto.c
• add: sshbuf-misc.c
• add: sshbuf.c
• add: sshbuf.h
• modified: sshconnect.c
• modified: sshconnect.h
• modified: sshconnect1.c
• modified: sshconnect2.c
• modified: sshd.0
• modified: sshd.8
• modified: sshd.c
• modified: sshd_config
• modified: sshd_config.0
• modified: sshd_config.5
• add: ssherr.c
• add: ssherr.h
• add: sshkey.c
• add: sshkey.h
• modified: sshlogin.c
• modified: sshlogin.h
• modified: sshpty.c
• modified: start-ssh
• modified: uidswap.c
• modified: umac.c
• modified: umac.h
• add: umac128.c
• modified: uuencode.c
• add: verify.c
• modified: version.h
• modified: xmalloc.c
• modified: xmalloc.h