Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/crypto/external/bsd/openssh merge openssh-6.7
details: https://anonhg.NetBSD.org/src/rev/60471da5fc21
branches: trunk
changeset: 803255:60471da5fc21
user: christos <christos%NetBSD.org@localhost>
date: Sun Oct 19 16:30:58 2014 +0000
description:
merge openssh-6.7
diffstat:
crypto/external/bsd/openssh/Makefile.inc | 6 +-
crypto/external/bsd/openssh/bin/Makefile.inc | 3 +-
crypto/external/bsd/openssh/bin/sshd/Makefile | 3 +-
crypto/external/bsd/openssh/dist/LICENCE | 2 +-
crypto/external/bsd/openssh/dist/OVERVIEW | 2 +-
crypto/external/bsd/openssh/dist/PROTOCOL | 79 +-
crypto/external/bsd/openssh/dist/PROTOCOL.agent | 2 +-
crypto/external/bsd/openssh/dist/PROTOCOL.certkeys | 2 +-
crypto/external/bsd/openssh/dist/PROTOCOL.mux | 2 +-
crypto/external/bsd/openssh/dist/README | 2 +-
crypto/external/bsd/openssh/dist/addrmatch.c | 10 +-
crypto/external/bsd/openssh/dist/atomicio.c | 4 +-
crypto/external/bsd/openssh/dist/atomicio.h | 2 +-
crypto/external/bsd/openssh/dist/auth-bsdauth.c | 13 +-
crypto/external/bsd/openssh/dist/auth-chall.c | 10 +-
crypto/external/bsd/openssh/dist/auth-krb5.c | 5 +-
crypto/external/bsd/openssh/dist/auth-options.c | 37 +-
crypto/external/bsd/openssh/dist/auth-options.h | 2 +-
crypto/external/bsd/openssh/dist/auth-pam.c | 2 +-
crypto/external/bsd/openssh/dist/auth-pam.h | 2 +-
crypto/external/bsd/openssh/dist/auth-passwd.c | 7 +-
crypto/external/bsd/openssh/dist/auth-rh-rsa.c | 7 +-
crypto/external/bsd/openssh/dist/auth-rhosts.c | 8 +-
crypto/external/bsd/openssh/dist/auth-rsa.c | 31 +-
crypto/external/bsd/openssh/dist/auth-skey.c | 4 +-
crypto/external/bsd/openssh/dist/auth.c | 25 +-
crypto/external/bsd/openssh/dist/auth.h | 8 +-
crypto/external/bsd/openssh/dist/auth1.c | 15 +-
crypto/external/bsd/openssh/dist/auth2-chall.c | 13 +-
crypto/external/bsd/openssh/dist/auth2-gss.c | 14 +-
crypto/external/bsd/openssh/dist/auth2-hostbased.c | 13 +-
crypto/external/bsd/openssh/dist/auth2-jpake.c | 564 ---
crypto/external/bsd/openssh/dist/auth2-kbdint.c | 7 +-
crypto/external/bsd/openssh/dist/auth2-krb5.c | 5 +-
crypto/external/bsd/openssh/dist/auth2-none.c | 9 +-
crypto/external/bsd/openssh/dist/auth2-passwd.c | 11 +-
crypto/external/bsd/openssh/dist/auth2-pubkey.c | 18 +-
crypto/external/bsd/openssh/dist/auth2.c | 28 +-
crypto/external/bsd/openssh/dist/authfd.c | 83 +-
crypto/external/bsd/openssh/dist/authfd.h | 2 +-
crypto/external/bsd/openssh/dist/authfile.c | 1040 ++----
crypto/external/bsd/openssh/dist/authfile.h | 60 +-
crypto/external/bsd/openssh/dist/blocks.c | 2 +
crypto/external/bsd/openssh/dist/bufaux.c | 280 +-
crypto/external/bsd/openssh/dist/bufbn.c | 203 +-
crypto/external/bsd/openssh/dist/bufec.c | 106 +-
crypto/external/bsd/openssh/dist/buffer.c | 247 +-
crypto/external/bsd/openssh/dist/buffer.h | 68 +-
crypto/external/bsd/openssh/dist/canohost.c | 33 +-
crypto/external/bsd/openssh/dist/canohost.h | 2 +-
crypto/external/bsd/openssh/dist/chacha.c | 4 +
crypto/external/bsd/openssh/dist/channels.c | 734 +++-
crypto/external/bsd/openssh/dist/channels.h | 35 +-
crypto/external/bsd/openssh/dist/cipher-3des1.c | 45 +-
crypto/external/bsd/openssh/dist/cipher-bf1.c | 4 +-
crypto/external/bsd/openssh/dist/cipher-chachapoly.c | 2 +
crypto/external/bsd/openssh/dist/cipher-ctr-mt.c | 2 +-
crypto/external/bsd/openssh/dist/cipher.c | 461 +-
crypto/external/bsd/openssh/dist/cipher.h | 65 +-
crypto/external/bsd/openssh/dist/cleanup.c | 2 +-
crypto/external/bsd/openssh/dist/clientloop.c | 102 +-
crypto/external/bsd/openssh/dist/clientloop.h | 2 +-
crypto/external/bsd/openssh/dist/compat.c | 97 +-
crypto/external/bsd/openssh/dist/compat.h | 11 +-
crypto/external/bsd/openssh/dist/compress.c | 4 +-
crypto/external/bsd/openssh/dist/compress.h | 2 +-
crypto/external/bsd/openssh/dist/crc32.c | 4 +-
crypto/external/bsd/openssh/dist/crc32.h | 2 +-
crypto/external/bsd/openssh/dist/deattack.c | 4 +-
crypto/external/bsd/openssh/dist/deattack.h | 2 +-
crypto/external/bsd/openssh/dist/dh.c | 57 +-
crypto/external/bsd/openssh/dist/dh.h | 5 +-
crypto/external/bsd/openssh/dist/digest-libc.c | 2 +
crypto/external/bsd/openssh/dist/digest-openssl.c | 2 +
crypto/external/bsd/openssh/dist/dispatch.c | 4 +-
crypto/external/bsd/openssh/dist/dispatch.h | 2 +-
crypto/external/bsd/openssh/dist/dns.c | 13 +-
crypto/external/bsd/openssh/dist/dns.h | 7 +-
crypto/external/bsd/openssh/dist/ed25519.c | 2 +
crypto/external/bsd/openssh/dist/fatal.c | 4 +-
crypto/external/bsd/openssh/dist/fe25519.c | 2 +
crypto/external/bsd/openssh/dist/fmt_scaled.c | 2 +-
crypto/external/bsd/openssh/dist/fmt_scaled.h | 2 +-
crypto/external/bsd/openssh/dist/ge25519.c | 6 +-
crypto/external/bsd/openssh/dist/getpeereid.c | 4 +-
crypto/external/bsd/openssh/dist/getpeereid.h | 2 +-
crypto/external/bsd/openssh/dist/getrrsetbyname.c | 4 +-
crypto/external/bsd/openssh/dist/getrrsetbyname.h | 2 +-
crypto/external/bsd/openssh/dist/groupaccess.c | 4 +-
crypto/external/bsd/openssh/dist/groupaccess.h | 2 +-
crypto/external/bsd/openssh/dist/gss-genr.c | 4 +-
crypto/external/bsd/openssh/dist/gss-serv-krb5.c | 5 +-
crypto/external/bsd/openssh/dist/gss-serv.c | 33 +-
crypto/external/bsd/openssh/dist/hash.c | 2 +
crypto/external/bsd/openssh/dist/hmac.c | 2 +
crypto/external/bsd/openssh/dist/hostfile.c | 46 +-
crypto/external/bsd/openssh/dist/hostfile.h | 2 +-
crypto/external/bsd/openssh/dist/includes.h | 8 +-
crypto/external/bsd/openssh/dist/jpake.c | 457 --
crypto/external/bsd/openssh/dist/jpake.h | 115 -
crypto/external/bsd/openssh/dist/kex.c | 156 +-
crypto/external/bsd/openssh/dist/kex.h | 38 +-
crypto/external/bsd/openssh/dist/kexc25519.c | 2 +
crypto/external/bsd/openssh/dist/kexc25519c.c | 6 +-
crypto/external/bsd/openssh/dist/kexc25519s.c | 6 +-
crypto/external/bsd/openssh/dist/kexdh.c | 21 +-
crypto/external/bsd/openssh/dist/kexdhc.c | 14 +-
crypto/external/bsd/openssh/dist/kexdhs.c | 18 +-
crypto/external/bsd/openssh/dist/kexecdh.c | 22 +-
crypto/external/bsd/openssh/dist/kexecdhc.c | 18 +-
crypto/external/bsd/openssh/dist/kexecdhs.c | 21 +-
crypto/external/bsd/openssh/dist/kexgex.c | 28 +-
crypto/external/bsd/openssh/dist/kexgexc.c | 18 +-
crypto/external/bsd/openssh/dist/kexgexs.c | 16 +-
crypto/external/bsd/openssh/dist/key.c | 2326 +-------------
crypto/external/bsd/openssh/dist/key.h | 164 +-
crypto/external/bsd/openssh/dist/krl.c | 31 +-
crypto/external/bsd/openssh/dist/ldapauth.c | 6 +-
crypto/external/bsd/openssh/dist/ldapauth.h | 4 +-
crypto/external/bsd/openssh/dist/log.c | 4 +-
crypto/external/bsd/openssh/dist/log.h | 2 +-
crypto/external/bsd/openssh/dist/mac.c | 110 +-
crypto/external/bsd/openssh/dist/mac.h | 6 +-
crypto/external/bsd/openssh/dist/match.c | 10 +-
crypto/external/bsd/openssh/dist/match.h | 2 +-
crypto/external/bsd/openssh/dist/md-sha256.c | 4 +-
crypto/external/bsd/openssh/dist/misc.c | 86 +-
crypto/external/bsd/openssh/dist/misc.h | 68 +-
crypto/external/bsd/openssh/dist/moduli | 2 +-
crypto/external/bsd/openssh/dist/moduli.5 | 2 +-
crypto/external/bsd/openssh/dist/moduli.c | 110 +-
crypto/external/bsd/openssh/dist/monitor.c | 268 +-
crypto/external/bsd/openssh/dist/monitor.h | 4 +-
crypto/external/bsd/openssh/dist/monitor_fdpass.c | 4 +-
crypto/external/bsd/openssh/dist/monitor_fdpass.h | 2 +-
crypto/external/bsd/openssh/dist/monitor_mm.c | 35 +-
crypto/external/bsd/openssh/dist/monitor_mm.h | 6 +-
crypto/external/bsd/openssh/dist/monitor_wrap.c | 24 +-
crypto/external/bsd/openssh/dist/monitor_wrap.h | 4 +-
crypto/external/bsd/openssh/dist/msg.c | 4 +-
crypto/external/bsd/openssh/dist/msg.h | 2 +-
crypto/external/bsd/openssh/dist/mux.c | 282 +-
crypto/external/bsd/openssh/dist/myproposal.h | 108 +-
crypto/external/bsd/openssh/dist/namespace.h | 2 +-
crypto/external/bsd/openssh/dist/nchan.c | 4 +-
crypto/external/bsd/openssh/dist/nchan.ms | 2 +-
crypto/external/bsd/openssh/dist/nchan2.ms | 2 +-
crypto/external/bsd/openssh/dist/openssh2netbsd | 2 +-
crypto/external/bsd/openssh/dist/packet.c | 125 +-
crypto/external/bsd/openssh/dist/packet.h | 7 +-
crypto/external/bsd/openssh/dist/pathnames.h | 6 +-
crypto/external/bsd/openssh/dist/pkcs11.h | 20 +-
crypto/external/bsd/openssh/dist/poly1305.c | 2 +
crypto/external/bsd/openssh/dist/progressmeter.c | 12 +-
crypto/external/bsd/openssh/dist/progressmeter.h | 2 +-
crypto/external/bsd/openssh/dist/random.h | 2 +-
crypto/external/bsd/openssh/dist/readconf.c | 869 ++++-
crypto/external/bsd/openssh/dist/readconf.h | 62 +-
crypto/external/bsd/openssh/dist/readpass.c | 12 +-
crypto/external/bsd/openssh/dist/readpassphrase.3 | 2 +-
crypto/external/bsd/openssh/dist/readpassphrase.c | 2 +-
crypto/external/bsd/openssh/dist/readpassphrase.h | 2 +-
crypto/external/bsd/openssh/dist/roaming.h | 2 +-
crypto/external/bsd/openssh/dist/roaming_client.c | 27 +-
crypto/external/bsd/openssh/dist/roaming_common.c | 22 +-
crypto/external/bsd/openssh/dist/roaming_dummy.c | 2 +-
crypto/external/bsd/openssh/dist/roaming_serv.c | 2 +-
crypto/external/bsd/openssh/dist/rsa.c | 119 +-
crypto/external/bsd/openssh/dist/rsa.h | 8 +-
crypto/external/bsd/openssh/dist/sandbox-rlimit.c | 2 +-
crypto/external/bsd/openssh/dist/sc25519.c | 2 +
crypto/external/bsd/openssh/dist/schnorr.c | 676 ----
crypto/external/bsd/openssh/dist/schnorr.h | 61 -
crypto/external/bsd/openssh/dist/scp.1 | 24 +-
crypto/external/bsd/openssh/dist/scp.c | 16 +-
crypto/external/bsd/openssh/dist/servconf.c | 209 +-
crypto/external/bsd/openssh/dist/servconf.h | 14 +-
crypto/external/bsd/openssh/dist/serverloop.c | 118 +-
crypto/external/bsd/openssh/dist/serverloop.h | 2 +-
crypto/external/bsd/openssh/dist/session.c | 115 +-
crypto/external/bsd/openssh/dist/session.h | 5 +-
crypto/external/bsd/openssh/dist/sftp-client.c | 222 +-
crypto/external/bsd/openssh/dist/sftp-client.h | 18 +-
crypto/external/bsd/openssh/dist/sftp-common.c | 12 +-
crypto/external/bsd/openssh/dist/sftp-common.h | 2 +-
crypto/external/bsd/openssh/dist/sftp-glob.c | 7 +-
crypto/external/bsd/openssh/dist/sftp-server-main.c | 4 +-
crypto/external/bsd/openssh/dist/sftp-server.8 | 46 +-
crypto/external/bsd/openssh/dist/sftp-server.c | 462 +-
crypto/external/bsd/openssh/dist/sftp.1 | 72 +-
crypto/external/bsd/openssh/dist/sftp.c | 292 +-
crypto/external/bsd/openssh/dist/sftp.h | 2 +-
crypto/external/bsd/openssh/dist/smult_curve25519_ref.c | 3 +
crypto/external/bsd/openssh/dist/ssh-add.1 | 10 +-
crypto/external/bsd/openssh/dist/ssh-add.c | 52 +-
crypto/external/bsd/openssh/dist/ssh-agent.1 | 54 +-
crypto/external/bsd/openssh/dist/ssh-agent.c | 226 +-
crypto/external/bsd/openssh/dist/ssh-dss.c | 243 +-
crypto/external/bsd/openssh/dist/ssh-ecdsa.c | 233 +-
crypto/external/bsd/openssh/dist/ssh-ed25519.c | 3 +
crypto/external/bsd/openssh/dist/ssh-gss.h | 6 +-
crypto/external/bsd/openssh/dist/ssh-keygen.1 | 71 +-
crypto/external/bsd/openssh/dist/ssh-keygen.c | 316 +-
crypto/external/bsd/openssh/dist/ssh-keyscan.1 | 41 +-
crypto/external/bsd/openssh/dist/ssh-keyscan.c | 30 +-
crypto/external/bsd/openssh/dist/ssh-keysign.8 | 8 +-
crypto/external/bsd/openssh/dist/ssh-keysign.c | 28 +-
crypto/external/bsd/openssh/dist/ssh-pkcs11-client.c | 8 +-
crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.8 | 2 +-
crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.c | 12 +-
crypto/external/bsd/openssh/dist/ssh-pkcs11.c | 134 +-
crypto/external/bsd/openssh/dist/ssh-pkcs11.h | 8 +-
crypto/external/bsd/openssh/dist/ssh-rsa.c | 304 +-
crypto/external/bsd/openssh/dist/ssh.1 | 88 +-
crypto/external/bsd/openssh/dist/ssh.c | 534 ++-
crypto/external/bsd/openssh/dist/ssh.h | 2 +-
crypto/external/bsd/openssh/dist/ssh1.h | 2 +-
crypto/external/bsd/openssh/dist/ssh2.h | 10 +-
crypto/external/bsd/openssh/dist/ssh_config | 6 +-
crypto/external/bsd/openssh/dist/ssh_config.5 | 302 +-
crypto/external/bsd/openssh/dist/sshbuf-getput-basic.c | 4 +-
crypto/external/bsd/openssh/dist/sshbuf-getput-crypto.c | 2 +
crypto/external/bsd/openssh/dist/sshbuf-misc.c | 2 +
crypto/external/bsd/openssh/dist/sshbuf.c | 2 +
crypto/external/bsd/openssh/dist/sshbuf.h | 28 +-
crypto/external/bsd/openssh/dist/sshconnect.c | 360 +-
crypto/external/bsd/openssh/dist/sshconnect.h | 10 +-
crypto/external/bsd/openssh/dist/sshconnect1.c | 62 +-
crypto/external/bsd/openssh/dist/sshconnect2.c | 286 +-
crypto/external/bsd/openssh/dist/sshd.8 | 47 +-
crypto/external/bsd/openssh/dist/sshd.c | 239 +-
crypto/external/bsd/openssh/dist/sshd_config | 17 +-
crypto/external/bsd/openssh/dist/sshd_config.5 | 244 +-
crypto/external/bsd/openssh/dist/ssherr.c | 2 +
crypto/external/bsd/openssh/dist/sshkey.c | 19 +-
crypto/external/bsd/openssh/dist/sshlogin.c | 9 +-
crypto/external/bsd/openssh/dist/sshlogin.h | 2 +-
crypto/external/bsd/openssh/dist/sshpty.c | 4 +-
crypto/external/bsd/openssh/dist/sshpty.h | 2 +-
crypto/external/bsd/openssh/dist/sshtty.c | 4 +-
crypto/external/bsd/openssh/dist/strtonum.c | 4 +-
crypto/external/bsd/openssh/dist/ttymodes.c | 4 +-
crypto/external/bsd/openssh/dist/ttymodes.h | 2 +-
crypto/external/bsd/openssh/dist/uidswap.c | 7 +-
crypto/external/bsd/openssh/dist/uidswap.h | 2 +-
crypto/external/bsd/openssh/dist/umac.c | 63 +-
crypto/external/bsd/openssh/dist/umac.h | 2 +-
crypto/external/bsd/openssh/dist/uuencode.c | 4 +-
crypto/external/bsd/openssh/dist/uuencode.h | 2 +-
crypto/external/bsd/openssh/dist/verify.c | 2 +
crypto/external/bsd/openssh/dist/version.h | 8 +-
crypto/external/bsd/openssh/dist/xmalloc.c | 16 +-
crypto/external/bsd/openssh/dist/xmalloc.h | 2 +-
crypto/external/bsd/openssh/lib/Makefile | 47 +-
crypto/external/bsd/openssh/lib/shlib_version | 4 +-
255 files changed, 7962 insertions(+), 9543 deletions(-)
diffs (truncated from 30212 to 300 lines):
diff -r e27b5ccb0863 -r 60471da5fc21 crypto/external/bsd/openssh/Makefile.inc
--- a/crypto/external/bsd/openssh/Makefile.inc Sun Oct 19 16:28:33 2014 +0000
+++ b/crypto/external/bsd/openssh/Makefile.inc Sun Oct 19 16:30:58 2014 +0000
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile.inc,v 1.5 2011/10/13 17:23:28 plunky Exp $
+# $NetBSD: Makefile.inc,v 1.6 2014/10/19 16:30:58 christos Exp $
WARNS?= 4
.include <bsd.own.mk>
USE_FORT?= yes # network client/server
+WITH_OPENSSL=1
SSHDIST?= ${NETBSDSRCDIR}/crypto/external/bsd/openssh/dist
-CPPFLAGS+=-I${SSHDIST} -DHAVE_LOGIN_CAP -DHAVE_MMAP -DHAVE_OPENPTY -DENABLE_PKCS11
+CPPFLAGS+=-I${SSHDIST} -DHAVE_LOGIN_CAP -DHAVE_MMAP -DHAVE_OPENPTY
+CPPFLAGS+=-DWITH_SSH1 -DWITH_OPENSSL -DENABLE_PKCS11
.if !defined(NOPIC)
CPPFLAGS+=-DHAVE_DLOPEN
.endif
diff -r e27b5ccb0863 -r 60471da5fc21 crypto/external/bsd/openssh/bin/Makefile.inc
--- a/crypto/external/bsd/openssh/bin/Makefile.inc Sun Oct 19 16:28:33 2014 +0000
+++ b/crypto/external/bsd/openssh/bin/Makefile.inc Sun Oct 19 16:30:58 2014 +0000
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.2 2009/12/19 18:00:26 christos Exp $
+# $NetBSD: Makefile.inc,v 1.3 2014/10/19 16:30:58 christos Exp $
+CPPFLAGS+=-DWITH_OPENSSL
LDADD+= -lssh -lcrypto -lcrypt -lz
DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} ${LIBZ}
diff -r e27b5ccb0863 -r 60471da5fc21 crypto/external/bsd/openssh/bin/sshd/Makefile
--- a/crypto/external/bsd/openssh/bin/sshd/Makefile Sun Oct 19 16:28:33 2014 +0000
+++ b/crypto/external/bsd/openssh/bin/sshd/Makefile Sun Oct 19 16:30:58 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/08/10 12:20:12 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2014/10/19 16:30:58 christos Exp $
.include <bsd.own.mk>
@@ -15,7 +15,6 @@
auth2-none.c auth2-passwd.c auth2-pubkey.c \
monitor_mm.c monitor.c monitor_wrap.c \
kexdhs.c kexgexs.c kexecdhs.c sftp-server.c sftp-common.c \
- auth2-jpake.c \
roaming_common.c roaming_serv.c sandbox-rlimit.c
COPTS.auth-options.c= -Wno-pointer-sign
diff -r e27b5ccb0863 -r 60471da5fc21 crypto/external/bsd/openssh/dist/LICENCE
--- a/crypto/external/bsd/openssh/dist/LICENCE Sun Oct 19 16:28:33 2014 +0000
+++ b/crypto/external/bsd/openssh/dist/LICENCE Sun Oct 19 16:30:58 2014 +0000
@@ -204,4 +204,4 @@
------
$OpenBSD: LICENCE,v 1.19 2004/08/30 09:18:08 markus Exp $
-$NetBSD: LICENCE,v 1.2 2011/07/25 03:03:10 christos Exp $
+$NetBSD: LICENCE,v 1.3 2014/10/19 16:30:58 christos Exp $
diff -r e27b5ccb0863 -r 60471da5fc21 crypto/external/bsd/openssh/dist/OVERVIEW
--- a/crypto/external/bsd/openssh/dist/OVERVIEW Sun Oct 19 16:28:33 2014 +0000
+++ b/crypto/external/bsd/openssh/dist/OVERVIEW Sun Oct 19 16:30:58 2014 +0000
@@ -166,4 +166,4 @@
xmalloc.c "safe" malloc routines
$OpenBSD: OVERVIEW,v 1.11 2006/08/03 03:34:41 deraadt Exp $
-$NetBSD: OVERVIEW,v 1.2 2011/07/25 03:03:10 christos Exp $
+$NetBSD: OVERVIEW,v 1.3 2014/10/19 16:30:58 christos Exp $
diff -r e27b5ccb0863 -r 60471da5fc21 crypto/external/bsd/openssh/dist/PROTOCOL
--- a/crypto/external/bsd/openssh/dist/PROTOCOL Sun Oct 19 16:28:33 2014 +0000
+++ b/crypto/external/bsd/openssh/dist/PROTOCOL Sun Oct 19 16:30:58 2014 +0000
@@ -91,6 +91,17 @@
the exchanged MAC algorithms are ignored and there doesn't have to be
a matching MAC.
+1.7 transport: chacha20-poly1305%openssh.com@localhost authenticated encryption
+
+OpenSSH supports authenticated encryption using ChaCha20 and Poly1305
+as described in PROTOCOL.chacha20poly1305.
+
+1.8 transport: curve25519-sha256%libssh.org@localhost key exchange algorithm
+
+OpenSSH supports the use of ECDH in Curve25519 for key exchange as
+described at:
+http://git.libssh.org/users/aris/libssh.git/plain/doc/curve25519-sha256%libssh.org.txt@localhost?h=curve25519
+
2. Connection protocol changes
2.1. connection: Channel write close extension "eow%openssh.com@localhost"
@@ -221,6 +232,56 @@
The "frame" field contains an IEEE 802.3 Ethernet frame, including
header.
+2.4. connection: Unix domain socket forwarding
+
+OpenSSH supports local and remote Unix domain socket forwarding
+using the "streamlocal" extension. Forwarding is initiated as per
+TCP sockets but with a single path instead of a host and port.
+
+Similar to direct-tcpip, direct-streamlocal is sent by the client
+to request that the server make a connection to a Unix domain socket.
+
+ byte SSH_MSG_CHANNEL_OPEN
+ string "direct-streamlocal%openssh.com@localhost"
+ uint32 sender channel
+ uint32 initial window size
+ uint32 maximum packet size
+ string socket path
+ string reserved for future use
+
+Similar to forwarded-tcpip, forwarded-streamlocal is sent by the
+server when the client has previously send the server a streamlocal-forward
+GLOBAL_REQUEST.
+
+ byte SSH_MSG_CHANNEL_OPEN
+ string "forwarded-streamlocal%openssh.com@localhost"
+ uint32 sender channel
+ uint32 initial window size
+ uint32 maximum packet size
+ string socket path
+ string reserved for future use
+
+The reserved field is not currently defined and is ignored on the
+remote end. It is intended to be used in the future to pass
+information about the socket file, such as ownership and mode.
+The client currently sends the empty string for this field.
+
+Similar to tcpip-forward, streamlocal-forward is sent by the client
+to request remote forwarding of a Unix domain socket.
+
+ byte SSH2_MSG_GLOBAL_REQUEST
+ string "streamlocal-forward%openssh.com@localhost"
+ boolean TRUE
+ string socket path
+
+Similar to cancel-tcpip-forward, cancel-streamlocal-forward is sent
+by the client cancel the forwarding of a Unix domain socket.
+
+ byte SSH2_MSG_GLOBAL_REQUEST
+ string "cancel-streamlocal-forward%openssh.com@localhost"
+ boolean FALSE
+ string socket path
+
3. SFTP protocol changes
3.1. sftp: Reversal of arguments to SSH_FXP_SYMLINK
@@ -331,5 +392,19 @@
This extension is advertised in the SSH_FXP_VERSION hello with version
"1".
-$OpenBSD: PROTOCOL,v 1.20 2013/01/08 18:49:04 markus Exp $
-$NetBSD: PROTOCOL,v 1.3 2013/03/29 16:19:44 christos Exp $
+10. sftp: Extension request "fsync%openssh.com@localhost"
+
+This request asks the server to call fsync(2) on an open file handle.
+
+ uint32 id
+ string "fsync%openssh.com@localhost"
+ string handle
+
+One receiving this request, a server will call fsync(handle_fd) and will
+respond with a SSH_FXP_STATUS message.
+
+This extension is advertised in the SSH_FXP_VERSION hello with version
+"1".
+
+$OpenBSD: PROTOCOL,v 1.24 2014/07/15 15:54:14 millert Exp $
+$NetBSD: PROTOCOL,v 1.4 2014/10/19 16:30:58 christos Exp $
diff -r e27b5ccb0863 -r 60471da5fc21 crypto/external/bsd/openssh/dist/PROTOCOL.agent
--- a/crypto/external/bsd/openssh/dist/PROTOCOL.agent Sun Oct 19 16:28:33 2014 +0000
+++ b/crypto/external/bsd/openssh/dist/PROTOCOL.agent Sun Oct 19 16:30:58 2014 +0000
@@ -558,4 +558,4 @@
SSH_AGENT_CONSTRAIN_CONFIRM 2
$OpenBSD: PROTOCOL.agent,v 1.7 2013/01/02 00:33:49 djm Exp $
-$NetBSD: PROTOCOL.agent,v 1.3 2013/03/29 16:19:44 christos Exp $
+$NetBSD: PROTOCOL.agent,v 1.4 2014/10/19 16:30:58 christos Exp $
diff -r e27b5ccb0863 -r 60471da5fc21 crypto/external/bsd/openssh/dist/PROTOCOL.certkeys
--- a/crypto/external/bsd/openssh/dist/PROTOCOL.certkeys Sun Oct 19 16:28:33 2014 +0000
+++ b/crypto/external/bsd/openssh/dist/PROTOCOL.certkeys Sun Oct 19 16:30:58 2014 +0000
@@ -263,4 +263,4 @@
this option is not present.
$OpenBSD: PROTOCOL.certkeys,v 1.9 2012/03/28 07:23:22 djm Exp $
-$NetBSD: PROTOCOL.certkeys,v 1.3 2012/12/12 17:42:39 christos Exp $
+$NetBSD: PROTOCOL.certkeys,v 1.4 2014/10/19 16:30:58 christos Exp $
diff -r e27b5ccb0863 -r 60471da5fc21 crypto/external/bsd/openssh/dist/PROTOCOL.mux
--- a/crypto/external/bsd/openssh/dist/PROTOCOL.mux Sun Oct 19 16:28:33 2014 +0000
+++ b/crypto/external/bsd/openssh/dist/PROTOCOL.mux Sun Oct 19 16:30:58 2014 +0000
@@ -220,4 +220,4 @@
XXX send signals via mux
$OpenBSD: PROTOCOL.mux,v 1.9 2012/06/01 00:49:35 djm Exp $
-$NetBSD: PROTOCOL.mux,v 1.5 2012/12/12 17:42:39 christos Exp $
+$NetBSD: PROTOCOL.mux,v 1.6 2014/10/19 16:30:58 christos Exp $
diff -r e27b5ccb0863 -r 60471da5fc21 crypto/external/bsd/openssh/dist/README
--- a/crypto/external/bsd/openssh/dist/README Sun Oct 19 16:28:33 2014 +0000
+++ b/crypto/external/bsd/openssh/dist/README Sun Oct 19 16:30:58 2014 +0000
@@ -25,4 +25,4 @@
See http://www.openssh.com/ for more information.
$OpenBSD: README,v 1.7 2006/04/01 05:37:46 djm Exp $
-$NetBSD: README,v 1.2 2011/07/25 03:03:10 christos Exp $
+$NetBSD: README,v 1.3 2014/10/19 16:30:58 christos Exp $
diff -r e27b5ccb0863 -r 60471da5fc21 crypto/external/bsd/openssh/dist/addrmatch.c
--- a/crypto/external/bsd/openssh/dist/addrmatch.c Sun Oct 19 16:28:33 2014 +0000
+++ b/crypto/external/bsd/openssh/dist/addrmatch.c Sun Oct 19 16:30:58 2014 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: addrmatch.c,v 1.6 2013/11/08 19:18:24 christos Exp $ */
-/* $OpenBSD: addrmatch.c,v 1.7 2013/05/17 00:13:13 djm Exp $ */
+/* $NetBSD: addrmatch.c,v 1.7 2014/10/19 16:30:58 christos Exp $ */
+/* $OpenBSD: addrmatch.c,v 1.9 2014/01/19 11:21:51 dtucker Exp $ */
/*
* Copyright (c) 2004-2008 Damien Miller <djm%mindrot.org@localhost>
@@ -18,7 +18,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: addrmatch.c,v 1.6 2013/11/08 19:18:24 christos Exp $");
+__RCSID("$NetBSD: addrmatch.c,v 1.7 2014/10/19 16:30:58 christos Exp $");
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
@@ -89,13 +89,13 @@
switch (sa->sa_family) {
case AF_INET:
- if (slen < sizeof(*in4))
+ if (slen < (socklen_t)sizeof(*in4))
return -1;
xa->af = AF_INET;
memcpy(&xa->v4, &in4->sin_addr, sizeof(xa->v4));
break;
case AF_INET6:
- if (slen < sizeof(*in6))
+ if (slen < (socklen_t)sizeof(*in6))
return -1;
xa->af = AF_INET6;
memcpy(&xa->v6, &in6->sin6_addr, sizeof(xa->v6));
diff -r e27b5ccb0863 -r 60471da5fc21 crypto/external/bsd/openssh/dist/atomicio.c
--- a/crypto/external/bsd/openssh/dist/atomicio.c Sun Oct 19 16:28:33 2014 +0000
+++ b/crypto/external/bsd/openssh/dist/atomicio.c Sun Oct 19 16:30:58 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: atomicio.c,v 1.4 2011/08/01 15:55:00 christos Exp $ */
+/* $NetBSD: atomicio.c,v 1.5 2014/10/19 16:30:58 christos Exp $ */
/* $OpenBSD: atomicio.c,v 1.26 2010/09/22 22:58:51 djm Exp $ */
/*
* Copyright (c) 2006 Damien Miller. All rights reserved.
@@ -28,7 +28,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: atomicio.c,v 1.4 2011/08/01 15:55:00 christos Exp $");
+__RCSID("$NetBSD: atomicio.c,v 1.5 2014/10/19 16:30:58 christos Exp $");
#include <sys/param.h>
#include <sys/uio.h>
diff -r e27b5ccb0863 -r 60471da5fc21 crypto/external/bsd/openssh/dist/atomicio.h
--- a/crypto/external/bsd/openssh/dist/atomicio.h Sun Oct 19 16:28:33 2014 +0000
+++ b/crypto/external/bsd/openssh/dist/atomicio.h Sun Oct 19 16:30:58 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: atomicio.h,v 1.3 2011/07/25 03:03:10 christos Exp $ */
+/* $NetBSD: atomicio.h,v 1.4 2014/10/19 16:30:58 christos Exp $ */
/* $OpenBSD: atomicio.h,v 1.11 2010/09/22 22:58:51 djm Exp $ */
/*
diff -r e27b5ccb0863 -r 60471da5fc21 crypto/external/bsd/openssh/dist/auth-bsdauth.c
--- a/crypto/external/bsd/openssh/dist/auth-bsdauth.c Sun Oct 19 16:28:33 2014 +0000
+++ b/crypto/external/bsd/openssh/dist/auth-bsdauth.c Sun Oct 19 16:30:58 2014 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: auth-bsdauth.c,v 1.2 2009/06/07 22:38:46 christos Exp $ */
-/* $OpenBSD: auth-bsdauth.c,v 1.11 2007/09/21 08:15:29 djm Exp $ */
+/* $NetBSD: auth-bsdauth.c,v 1.3 2014/10/19 16:30:58 christos Exp $ */
+/* $OpenBSD: auth-bsdauth.c,v 1.13 2014/06/24 01:13:21 djm Exp $ */
/*
* Copyright (c) 2001 Markus Friedl. All rights reserved.
*
@@ -25,8 +25,10 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: auth-bsdauth.c,v 1.2 2009/06/07 22:38:46 christos Exp $");
+__RCSID("$NetBSD: auth-bsdauth.c,v 1.3 2014/10/19 16:30:58 christos Exp $");
#include <sys/types.h>
+#include <stdarg.h>
+#include <stdio.h>
#ifdef BSD_AUTH
#include "xmalloc.h"
@@ -53,6 +55,11 @@
Authctxt *authctxt = ctx;
char *challenge = NULL;
+ *infotxt = NULL;
+ *numprompts = 0;
+ *prompts = NULL;
+ *echo_on = NULL;
+
if (authctxt->as != NULL) {
Home |
Main Index |
Thread Index |
Old Index