git.osdn.net Git - android-x86/external-openssh.git/commit

(root) / android-x86 / external-openssh.git / commit

author	Adam Langley <agl@google.com>
	Mon, 30 Mar 2015 21:49:51 +0000 (14:49 -0700)
committer	Adam Langley <agl@google.com>
	Wed, 8 Apr 2015 00:50:50 +0000 (17:50 -0700)
commit	d059297112922cabb0c674840589be8db821fd9a
tree	9c2045d28ec1c8594090f38bc32e9f523dc6c68d	tree \| snapshot
parent	f5c67b478bef9992de9e9ec91ce10af4f6205e0d	commit \| diff

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

430 files changed:

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

external/openssh

RSS Atom

About OSDN

Find Software

Develop Software

Help