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 conflicts
details: https://anonhg.NetBSD.org/src/rev/f5636895cf7a
branches: trunk
changeset: 337136:f5636895cf7a
user: christos <christos%NetBSD.org@localhost>
date: Fri Apr 03 23:58:19 2015 +0000
description:
Merge conflicts
diffstat:
crypto/external/bsd/openssh/bin/ssh-keyscan/Makefile | 4 +-
crypto/external/bsd/openssh/dist/LICENCE | 2 +-
crypto/external/bsd/openssh/dist/OVERVIEW | 2 +-
crypto/external/bsd/openssh/dist/PROTOCOL | 55 +-
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 | 4 +-
crypto/external/bsd/openssh/dist/atomicio.c | 7 +-
crypto/external/bsd/openssh/dist/atomicio.h | 2 +-
crypto/external/bsd/openssh/dist/auth-bsdauth.c | 4 +-
crypto/external/bsd/openssh/dist/auth-chall.c | 4 +-
crypto/external/bsd/openssh/dist/auth-krb5.c | 4 +-
crypto/external/bsd/openssh/dist/auth-options.c | 86 +-
crypto/external/bsd/openssh/dist/auth-options.h | 6 +-
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 | 4 +-
crypto/external/bsd/openssh/dist/auth-rh-rsa.c | 4 +-
crypto/external/bsd/openssh/dist/auth-rhosts.c | 68 +-
crypto/external/bsd/openssh/dist/auth-rsa.c | 19 +-
crypto/external/bsd/openssh/dist/auth-skey.c | 4 +-
crypto/external/bsd/openssh/dist/auth.c | 76 +-
crypto/external/bsd/openssh/dist/auth.h | 23 +-
crypto/external/bsd/openssh/dist/auth1.c | 4 +-
crypto/external/bsd/openssh/dist/auth2-chall.c | 11 +-
crypto/external/bsd/openssh/dist/auth2-gss.c | 26 +-
crypto/external/bsd/openssh/dist/auth2-hostbased.c | 40 +-
crypto/external/bsd/openssh/dist/auth2-kbdint.c | 4 +-
crypto/external/bsd/openssh/dist/auth2-krb5.c | 4 +-
crypto/external/bsd/openssh/dist/auth2-none.c | 4 +-
crypto/external/bsd/openssh/dist/auth2-passwd.c | 4 +-
crypto/external/bsd/openssh/dist/auth2-pubkey.c | 89 +-
crypto/external/bsd/openssh/dist/auth2.c | 22 +-
crypto/external/bsd/openssh/dist/authfd.c | 850 ++--
crypto/external/bsd/openssh/dist/authfd.h | 62 +-
crypto/external/bsd/openssh/dist/authfile.c | 131 +-
crypto/external/bsd/openssh/dist/authfile.h | 15 +-
crypto/external/bsd/openssh/dist/bcrypt_pbkdf.c | 2 +-
crypto/external/bsd/openssh/dist/bitmap.c | 5 +-
crypto/external/bsd/openssh/dist/bitmap.h | 2 +
crypto/external/bsd/openssh/dist/blocks.c | 2 +-
crypto/external/bsd/openssh/dist/blowfish.c | 2 +-
crypto/external/bsd/openssh/dist/bufaux.c | 4 +-
crypto/external/bsd/openssh/dist/bufbn.c | 4 +-
crypto/external/bsd/openssh/dist/bufec.c | 4 +-
crypto/external/bsd/openssh/dist/buffer.c | 4 +-
crypto/external/bsd/openssh/dist/buffer.h | 2 +-
crypto/external/bsd/openssh/dist/canohost.c | 33 +-
crypto/external/bsd/openssh/dist/canohost.h | 2 +-
crypto/external/bsd/openssh/dist/chacha.c | 2 +-
crypto/external/bsd/openssh/dist/channels.c | 85 +-
crypto/external/bsd/openssh/dist/channels.h | 30 +-
crypto/external/bsd/openssh/dist/cipher-3des1.c | 25 +-
crypto/external/bsd/openssh/dist/cipher-bf1.c | 23 +-
crypto/external/bsd/openssh/dist/cipher-chachapoly.c | 4 +-
crypto/external/bsd/openssh/dist/cipher-ctr-mt.c | 2 +-
crypto/external/bsd/openssh/dist/cipher.c | 14 +-
crypto/external/bsd/openssh/dist/cipher.h | 10 +-
crypto/external/bsd/openssh/dist/cleanup.c | 2 +-
crypto/external/bsd/openssh/dist/clientloop.c | 460 ++-
crypto/external/bsd/openssh/dist/clientloop.h | 2 +-
crypto/external/bsd/openssh/dist/compat.c | 21 +-
crypto/external/bsd/openssh/dist/compat.h | 6 +-
crypto/external/bsd/openssh/dist/compress.c | 168 -
crypto/external/bsd/openssh/dist/compress.h | 26 -
crypto/external/bsd/openssh/dist/crc32.c | 4 +-
crypto/external/bsd/openssh/dist/crc32.h | 2 +-
crypto/external/bsd/openssh/dist/deattack.c | 82 +-
crypto/external/bsd/openssh/dist/deattack.h | 13 +-
crypto/external/bsd/openssh/dist/dh.c | 65 +-
crypto/external/bsd/openssh/dist/dh.h | 8 +-
crypto/external/bsd/openssh/dist/digest-libc.c | 24 +-
crypto/external/bsd/openssh/dist/digest-openssl.c | 24 +-
crypto/external/bsd/openssh/dist/dispatch.c | 126 +-
crypto/external/bsd/openssh/dist/dispatch.h | 38 +-
crypto/external/bsd/openssh/dist/dns.c | 45 +-
crypto/external/bsd/openssh/dist/dns.h | 9 +-
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 | 2 +-
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 | 8 +-
crypto/external/bsd/openssh/dist/groupaccess.h | 2 +-
crypto/external/bsd/openssh/dist/gss-genr.c | 5 +-
crypto/external/bsd/openssh/dist/gss-serv-krb5.c | 4 +-
crypto/external/bsd/openssh/dist/gss-serv.c | 8 +-
crypto/external/bsd/openssh/dist/hash.c | 2 +-
crypto/external/bsd/openssh/dist/hmac.c | 8 +-
crypto/external/bsd/openssh/dist/hostfile.c | 641 ++-
crypto/external/bsd/openssh/dist/hostfile.h | 66 +-
crypto/external/bsd/openssh/dist/includes.h | 2 +-
crypto/external/bsd/openssh/dist/kex.c | 664 ++-
crypto/external/bsd/openssh/dist/kex.h | 168 +-
crypto/external/bsd/openssh/dist/kexc25519.c | 94 +-
crypto/external/bsd/openssh/dist/kexc25519c.c | 167 +-
crypto/external/bsd/openssh/dist/kexc25519s.c | 137 +-
crypto/external/bsd/openssh/dist/kexdh.c | 91 +-
crypto/external/bsd/openssh/dist/kexdhc.c | 200 +-
crypto/external/bsd/openssh/dist/kexdhs.c | 189 +-
crypto/external/bsd/openssh/dist/kexecdh.c | 85 +-
crypto/external/bsd/openssh/dist/kexecdhc.c | 210 +-
crypto/external/bsd/openssh/dist/kexecdhs.c | 188 +-
crypto/external/bsd/openssh/dist/kexgex.c | 109 +-
crypto/external/bsd/openssh/dist/kexgexc.c | 299 +-
crypto/external/bsd/openssh/dist/kexgexs.c | 262 +-
crypto/external/bsd/openssh/dist/key.c | 62 +-
crypto/external/bsd/openssh/dist/key.h | 10 +-
crypto/external/bsd/openssh/dist/krl.c | 858 ++--
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 | 102 +-
crypto/external/bsd/openssh/dist/mac.h | 32 +-
crypto/external/bsd/openssh/dist/match.c | 4 +-
crypto/external/bsd/openssh/dist/match.h | 2 +-
crypto/external/bsd/openssh/dist/md-sha256.c | 4 +-
crypto/external/bsd/openssh/dist/misc.c | 11 +-
crypto/external/bsd/openssh/dist/misc.h | 2 +-
crypto/external/bsd/openssh/dist/moduli | 2 +-
crypto/external/bsd/openssh/dist/moduli.5 | 2 +-
crypto/external/bsd/openssh/dist/moduli.c | 14 +-
crypto/external/bsd/openssh/dist/monitor.c | 392 +-
crypto/external/bsd/openssh/dist/monitor.h | 6 +-
crypto/external/bsd/openssh/dist/monitor_fdpass.c | 8 +-
crypto/external/bsd/openssh/dist/monitor_fdpass.h | 2 +-
crypto/external/bsd/openssh/dist/monitor_mm.c | 10 +-
crypto/external/bsd/openssh/dist/monitor_mm.h | 2 +-
crypto/external/bsd/openssh/dist/monitor_wrap.c | 253 +-
crypto/external/bsd/openssh/dist/monitor_wrap.h | 11 +-
crypto/external/bsd/openssh/dist/msg.c | 29 +-
crypto/external/bsd/openssh/dist/msg.h | 9 +-
crypto/external/bsd/openssh/dist/mux.c | 10 +-
crypto/external/bsd/openssh/dist/myproposal.h | 2 +-
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/opacket.c | 23 +-
crypto/external/bsd/openssh/dist/opacket.h | 8 +-
crypto/external/bsd/openssh/dist/openssh2netbsd | 2 +-
crypto/external/bsd/openssh/dist/packet.c | 2884 +++++++++-----
crypto/external/bsd/openssh/dist/packet.h | 234 +-
crypto/external/bsd/openssh/dist/pathnames.h | 2 +-
crypto/external/bsd/openssh/dist/pkcs11.h | 2 +-
crypto/external/bsd/openssh/dist/poly1305.c | 2 +-
crypto/external/bsd/openssh/dist/progressmeter.c | 10 +-
crypto/external/bsd/openssh/dist/progressmeter.h | 6 +-
crypto/external/bsd/openssh/dist/random.h | 2 +-
crypto/external/bsd/openssh/dist/readconf.c | 521 ++-
crypto/external/bsd/openssh/dist/readconf.h | 26 +-
crypto/external/bsd/openssh/dist/readpass.c | 4 +-
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 | 7 +-
crypto/external/bsd/openssh/dist/roaming_common.c | 7 +-
crypto/external/bsd/openssh/dist/roaming_dummy.c | 15 +-
crypto/external/bsd/openssh/dist/roaming_serv.c | 2 +-
crypto/external/bsd/openssh/dist/rsa.c | 4 +-
crypto/external/bsd/openssh/dist/rsa.h | 2 +-
crypto/external/bsd/openssh/dist/sandbox-rlimit.c | 2 +-
crypto/external/bsd/openssh/dist/sc25519.c | 2 +-
crypto/external/bsd/openssh/dist/scp.1 | 12 +-
crypto/external/bsd/openssh/dist/scp.c | 13 +-
crypto/external/bsd/openssh/dist/servconf.c | 129 +-
crypto/external/bsd/openssh/dist/servconf.h | 10 +-
crypto/external/bsd/openssh/dist/serverloop.c | 126 +-
crypto/external/bsd/openssh/dist/serverloop.h | 2 +-
crypto/external/bsd/openssh/dist/session.c | 20 +-
crypto/external/bsd/openssh/dist/session.h | 2 +-
crypto/external/bsd/openssh/dist/sftp-client.c | 849 ++-
crypto/external/bsd/openssh/dist/sftp-client.h | 38 +-
crypto/external/bsd/openssh/dist/sftp-common.c | 101 +-
crypto/external/bsd/openssh/dist/sftp-common.h | 9 +-
crypto/external/bsd/openssh/dist/sftp-glob.c | 8 +-
crypto/external/bsd/openssh/dist/sftp-server-main.c | 4 +-
crypto/external/bsd/openssh/dist/sftp-server.8 | 8 +-
crypto/external/bsd/openssh/dist/sftp-server.c | 586 +-
crypto/external/bsd/openssh/dist/sftp.1 | 8 +-
crypto/external/bsd/openssh/dist/sftp.c | 31 +-
crypto/external/bsd/openssh/dist/sftp.h | 2 +-
crypto/external/bsd/openssh/dist/smult_curve25519_ref.c | 2 +-
crypto/external/bsd/openssh/dist/ssh-add.1 | 16 +-
crypto/external/bsd/openssh/dist/ssh-add.c | 327 +-
crypto/external/bsd/openssh/dist/ssh-agent.1 | 17 +-
crypto/external/bsd/openssh/dist/ssh-agent.c | 563 +-
crypto/external/bsd/openssh/dist/ssh-dss.c | 4 +-
crypto/external/bsd/openssh/dist/ssh-ecdsa.c | 4 +-
crypto/external/bsd/openssh/dist/ssh-ed25519.c | 16 +-
crypto/external/bsd/openssh/dist/ssh-gss.h | 2 +-
crypto/external/bsd/openssh/dist/ssh-keygen.1 | 24 +-
crypto/external/bsd/openssh/dist/ssh-keygen.c | 1139 +++--
crypto/external/bsd/openssh/dist/ssh-keyscan.1 | 8 +-
crypto/external/bsd/openssh/dist/ssh-keyscan.c | 159 +-
crypto/external/bsd/openssh/dist/ssh-keysign.8 | 2 +-
crypto/external/bsd/openssh/dist/ssh-keysign.c | 147 +-
crypto/external/bsd/openssh/dist/ssh-pkcs11-client.c | 4 +-
crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.8 | 2 +-
crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.c | 8 +-
crypto/external/bsd/openssh/dist/ssh-pkcs11.c | 40 +-
crypto/external/bsd/openssh/dist/ssh-pkcs11.h | 4 +-
crypto/external/bsd/openssh/dist/ssh-rsa.c | 4 +-
crypto/external/bsd/openssh/dist/ssh.1 | 37 +-
crypto/external/bsd/openssh/dist/ssh.c | 223 +-
crypto/external/bsd/openssh/dist/ssh.h | 2 +-
crypto/external/bsd/openssh/dist/ssh1.h | 2 +-
crypto/external/bsd/openssh/dist/ssh2.h | 2 +-
crypto/external/bsd/openssh/dist/ssh_api.c | 12 +-
crypto/external/bsd/openssh/dist/ssh_api.h | 1 +
crypto/external/bsd/openssh/dist/ssh_config | 2 +-
crypto/external/bsd/openssh/dist/ssh_config.5 | 154 +-
crypto/external/bsd/openssh/dist/sshbuf-getput-basic.c | 59 +-
crypto/external/bsd/openssh/dist/sshbuf-getput-crypto.c | 23 +-
crypto/external/bsd/openssh/dist/sshbuf-misc.c | 5 +-
crypto/external/bsd/openssh/dist/sshbuf.c | 6 +-
crypto/external/bsd/openssh/dist/sshbuf.h | 4 +-
crypto/external/bsd/openssh/dist/sshconnect.c | 116 +-
crypto/external/bsd/openssh/dist/sshconnect.h | 2 +-
crypto/external/bsd/openssh/dist/sshconnect1.c | 76 +-
crypto/external/bsd/openssh/dist/sshconnect2.c | 582 +-
crypto/external/bsd/openssh/dist/sshd.8 | 18 +-
crypto/external/bsd/openssh/dist/sshd.c | 300 +-
crypto/external/bsd/openssh/dist/sshd_config | 6 +-
crypto/external/bsd/openssh/dist/sshd_config.5 | 109 +-
crypto/external/bsd/openssh/dist/ssherr.c | 21 +-
crypto/external/bsd/openssh/dist/sshkey.c | 423 +-
crypto/external/bsd/openssh/dist/sshlogin.c | 15 +-
crypto/external/bsd/openssh/dist/sshlogin.h | 2 +-
crypto/external/bsd/openssh/dist/sshpty.c | 15 +-
crypto/external/bsd/openssh/dist/sshpty.h | 2 +-
crypto/external/bsd/openssh/dist/sshtty.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 | 4 +-
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 | 15 +-
crypto/external/bsd/openssh/dist/xmalloc.h | 2 +-
crypto/external/bsd/openssh/lib/Makefile | 5 +-
crypto/external/bsd/openssh/lib/shlib_version | 4 +-
255 files changed, 11540 insertions(+), 7513 deletions(-)
diffs (truncated from 33204 to 300 lines):
diff -r 003525c6fa9b -r f5636895cf7a crypto/external/bsd/openssh/bin/ssh-keyscan/Makefile
--- a/crypto/external/bsd/openssh/bin/ssh-keyscan/Makefile Fri Apr 03 23:52:51 2015 +0000
+++ b/crypto/external/bsd/openssh/bin/ssh-keyscan/Makefile Fri Apr 03 23:58:19 2015 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2009/06/07 22:38:45 christos Exp $
+# $NetBSD: Makefile,v 1.2 2015/04/03 23:58:19 christos Exp $
BINDIR= /usr/bin
PROG= ssh-keyscan
-SRCS= ssh-keyscan.c
+SRCS= ssh-keyscan.c ssh_api.c kexdhs.c kexgexs.c kexecdhs.c
MAN= ssh-keyscan.1
.include <bsd.prog.mk>
diff -r 003525c6fa9b -r f5636895cf7a crypto/external/bsd/openssh/dist/LICENCE
--- a/crypto/external/bsd/openssh/dist/LICENCE Fri Apr 03 23:52:51 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/LICENCE Fri Apr 03 23:58:19 2015 +0000
@@ -204,4 +204,4 @@
------
$OpenBSD: LICENCE,v 1.19 2004/08/30 09:18:08 markus Exp $
-$NetBSD: LICENCE,v 1.3 2014/10/19 16:30:58 christos Exp $
+$NetBSD: LICENCE,v 1.4 2015/04/03 23:58:19 christos Exp $
diff -r 003525c6fa9b -r f5636895cf7a crypto/external/bsd/openssh/dist/OVERVIEW
--- a/crypto/external/bsd/openssh/dist/OVERVIEW Fri Apr 03 23:52:51 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/OVERVIEW Fri Apr 03 23:58:19 2015 +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.3 2014/10/19 16:30:58 christos Exp $
+$NetBSD: OVERVIEW,v 1.4 2015/04/03 23:58:19 christos Exp $
diff -r 003525c6fa9b -r f5636895cf7a crypto/external/bsd/openssh/dist/PROTOCOL
--- a/crypto/external/bsd/openssh/dist/PROTOCOL Fri Apr 03 23:52:51 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/PROTOCOL Fri Apr 03 23:58:19 2015 +0000
@@ -40,8 +40,8 @@
"ecdsa-sha2-nistp521-cert-v01%openssh.com@localhost"
OpenSSH introduces new public key algorithms to support certificate
-authentication for users and hostkeys. These methods are documented in
-the file PROTOCOL.certkeys
+authentication for users and host keys. These methods are documented
+in the file PROTOCOL.certkeys
1.4. transport: Elliptic Curve cryptography
@@ -282,6 +282,53 @@
boolean FALSE
string socket path
+2.5. connection: hostkey update and rotation "hostkeys-00%openssh.com@localhost"
+and "hostkeys-prove-00%openssh.com@localhost"
+
+OpenSSH supports a protocol extension allowing a server to inform
+a client of all its protocol v.2 host keys after user-authentication
+has completed.
+
+ byte SSH_MSG_GLOBAL_REQUEST
+ string "hostkeys-00%openssh.com@localhost"
+ string[] hostkeys
+
+Upon receiving this message, a client should check which of the
+supplied host keys are present in known_hosts. For keys that are
+not present, it should send a "hostkeys-prove%openssh.com@localhost" message
+to request the server prove ownership of the private half of the
+key.
+
+ byte SSH_MSG_GLOBAL_REQUEST
+ string "hostkeys-prove-00%openssh.com@localhost"
+ char 1 /* want-reply */
+ string[] hostkeys
+
+When a server receives this message, it should generate a signature
+using each requested key over the following:
+
+ string "hostkeys-prove-00%openssh.com@localhost"
+ string session identifier
+ string hostkey
+
+These signatures should be included in the reply, in the order matching
+the hostkeys in the request:
+
+ byte SSH_MSG_REQUEST_SUCCESS
+ string[] signatures
+
+When the client receives this reply (and not a failure), it should
+validate the signatures and may update its known_hosts file, adding keys
+that it has not seen before and deleting keys for the server host that
+are no longer offered.
+
+These extensions let a client learn key types that it had not previously
+encountered, thereby allowing it to potentially upgrade from weaker
+key algorithms to better ones. It also supports graceful key rotation:
+a server may offer multiple keys of the same type for a period (to
+give clients an opportunity to learn them using this extension) before
+removing the deprecated key from those offered.
+
3. SFTP protocol changes
3.1. sftp: Reversal of arguments to SSH_FXP_SYMLINK
@@ -406,5 +453,5 @@
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 $
+$OpenBSD: PROTOCOL,v 1.27 2015/02/20 22:17:21 djm Exp $
+$NetBSD: PROTOCOL,v 1.5 2015/04/03 23:58:19 christos Exp $
diff -r 003525c6fa9b -r f5636895cf7a crypto/external/bsd/openssh/dist/PROTOCOL.agent
--- a/crypto/external/bsd/openssh/dist/PROTOCOL.agent Fri Apr 03 23:52:51 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/PROTOCOL.agent Fri Apr 03 23:58:19 2015 +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.4 2014/10/19 16:30:58 christos Exp $
+$NetBSD: PROTOCOL.agent,v 1.5 2015/04/03 23:58:19 christos Exp $
diff -r 003525c6fa9b -r f5636895cf7a crypto/external/bsd/openssh/dist/PROTOCOL.certkeys
--- a/crypto/external/bsd/openssh/dist/PROTOCOL.certkeys Fri Apr 03 23:52:51 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/PROTOCOL.certkeys Fri Apr 03 23:58:19 2015 +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.4 2014/10/19 16:30:58 christos Exp $
+$NetBSD: PROTOCOL.certkeys,v 1.5 2015/04/03 23:58:19 christos Exp $
diff -r 003525c6fa9b -r f5636895cf7a crypto/external/bsd/openssh/dist/PROTOCOL.mux
--- a/crypto/external/bsd/openssh/dist/PROTOCOL.mux Fri Apr 03 23:52:51 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/PROTOCOL.mux Fri Apr 03 23:58:19 2015 +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.6 2014/10/19 16:30:58 christos Exp $
+$NetBSD: PROTOCOL.mux,v 1.7 2015/04/03 23:58:19 christos Exp $
diff -r 003525c6fa9b -r f5636895cf7a crypto/external/bsd/openssh/dist/README
--- a/crypto/external/bsd/openssh/dist/README Fri Apr 03 23:52:51 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/README Fri Apr 03 23:58:19 2015 +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.3 2014/10/19 16:30:58 christos Exp $
+$NetBSD: README,v 1.4 2015/04/03 23:58:19 christos Exp $
diff -r 003525c6fa9b -r f5636895cf7a crypto/external/bsd/openssh/dist/addrmatch.c
--- a/crypto/external/bsd/openssh/dist/addrmatch.c Fri Apr 03 23:52:51 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/addrmatch.c Fri Apr 03 23:58:19 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: addrmatch.c,v 1.7 2014/10/19 16:30:58 christos Exp $ */
+/* $NetBSD: addrmatch.c,v 1.8 2015/04/03 23:58:19 christos Exp $ */
/* $OpenBSD: addrmatch.c,v 1.9 2014/01/19 11:21:51 dtucker Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: addrmatch.c,v 1.7 2014/10/19 16:30:58 christos Exp $");
+__RCSID("$NetBSD: addrmatch.c,v 1.8 2015/04/03 23:58:19 christos Exp $");
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
diff -r 003525c6fa9b -r f5636895cf7a crypto/external/bsd/openssh/dist/atomicio.c
--- a/crypto/external/bsd/openssh/dist/atomicio.c Fri Apr 03 23:52:51 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/atomicio.c Fri Apr 03 23:58:19 2015 +0000
@@ -1,5 +1,5 @@
-/* $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 $ */
+/* $NetBSD: atomicio.c,v 1.6 2015/04/03 23:58:19 christos Exp $ */
+/* $OpenBSD: atomicio.c,v 1.27 2015/01/16 06:40:12 deraadt Exp $ */
/*
* Copyright (c) 2006 Damien Miller. All rights reserved.
* Copyright (c) 2005 Anil Madhavapeddy. All rights reserved.
@@ -28,7 +28,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: atomicio.c,v 1.5 2014/10/19 16:30:58 christos Exp $");
+__RCSID("$NetBSD: atomicio.c,v 1.6 2015/04/03 23:58:19 christos Exp $");
#include <sys/param.h>
#include <sys/uio.h>
@@ -36,6 +36,7 @@
#include <poll.h>
#include <string.h>
#include <unistd.h>
+#include <limits.h>
#include "atomicio.h"
diff -r 003525c6fa9b -r f5636895cf7a crypto/external/bsd/openssh/dist/atomicio.h
--- a/crypto/external/bsd/openssh/dist/atomicio.h Fri Apr 03 23:52:51 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/atomicio.h Fri Apr 03 23:58:19 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: atomicio.h,v 1.4 2014/10/19 16:30:58 christos Exp $ */
+/* $NetBSD: atomicio.h,v 1.5 2015/04/03 23:58:19 christos Exp $ */
/* $OpenBSD: atomicio.h,v 1.11 2010/09/22 22:58:51 djm Exp $ */
/*
diff -r 003525c6fa9b -r f5636895cf7a crypto/external/bsd/openssh/dist/auth-bsdauth.c
--- a/crypto/external/bsd/openssh/dist/auth-bsdauth.c Fri Apr 03 23:52:51 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/auth-bsdauth.c Fri Apr 03 23:58:19 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: auth-bsdauth.c,v 1.3 2014/10/19 16:30:58 christos Exp $ */
+/* $NetBSD: auth-bsdauth.c,v 1.4 2015/04/03 23:58:19 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,7 +25,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: auth-bsdauth.c,v 1.3 2014/10/19 16:30:58 christos Exp $");
+__RCSID("$NetBSD: auth-bsdauth.c,v 1.4 2015/04/03 23:58:19 christos Exp $");
#include <sys/types.h>
#include <stdarg.h>
#include <stdio.h>
diff -r 003525c6fa9b -r f5636895cf7a crypto/external/bsd/openssh/dist/auth-chall.c
--- a/crypto/external/bsd/openssh/dist/auth-chall.c Fri Apr 03 23:52:51 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/auth-chall.c Fri Apr 03 23:58:19 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: auth-chall.c,v 1.5 2014/10/19 16:30:58 christos Exp $ */
+/* $NetBSD: auth-chall.c,v 1.6 2015/04/03 23:58:19 christos Exp $ */
/* $OpenBSD: auth-chall.c,v 1.14 2014/06/24 01:13:21 djm Exp $ */
/*
* Copyright (c) 2001 Markus Friedl. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: auth-chall.c,v 1.5 2014/10/19 16:30:58 christos Exp $");
+__RCSID("$NetBSD: auth-chall.c,v 1.6 2015/04/03 23:58:19 christos Exp $");
#include <sys/types.h>
#include <stdarg.h>
#include <stdlib.h>
diff -r 003525c6fa9b -r f5636895cf7a crypto/external/bsd/openssh/dist/auth-krb5.c
--- a/crypto/external/bsd/openssh/dist/auth-krb5.c Fri Apr 03 23:52:51 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/auth-krb5.c Fri Apr 03 23:58:19 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: auth-krb5.c,v 1.6 2014/10/19 16:30:58 christos Exp $ */
+/* $NetBSD: auth-krb5.c,v 1.7 2015/04/03 23:58:19 christos Exp $ */
/* $OpenBSD: auth-krb5.c,v 1.20 2013/07/20 01:55:13 djm Exp $ */
/*
* Kerberos v5 authentication and ticket-passing routines.
@@ -30,7 +30,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: auth-krb5.c,v 1.6 2014/10/19 16:30:58 christos Exp $");
+__RCSID("$NetBSD: auth-krb5.c,v 1.7 2015/04/03 23:58:19 christos Exp $");
#include <sys/types.h>
#include <pwd.h>
#include <stdarg.h>
diff -r 003525c6fa9b -r f5636895cf7a crypto/external/bsd/openssh/dist/auth-options.c
--- a/crypto/external/bsd/openssh/dist/auth-options.c Fri Apr 03 23:52:51 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/auth-options.c Fri Apr 03 23:58:19 2015 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: auth-options.c,v 1.8 2014/10/19 16:30:58 christos Exp $ */
-/* $OpenBSD: auth-options.c,v 1.64 2014/07/15 15:54:14 millert Exp $ */
+/* $NetBSD: auth-options.c,v 1.9 2015/04/03 23:58:19 christos Exp $ */
+/* $OpenBSD: auth-options.c,v 1.65 2015/01/14 10:30:34 markus Exp $ */
/*
* Author: Tatu Ylonen <ylo%cs.hut.fi@localhost>
* Copyright (c) 1995 Tatu Ylonen <ylo%cs.hut.fi@localhost>, Espoo, Finland
@@ -12,7 +12,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: auth-options.c,v 1.8 2014/10/19 16:30:58 christos Exp $");
+__RCSID("$NetBSD: auth-options.c,v 1.9 2015/04/03 23:58:19 christos Exp $");
#include <sys/types.h>
#include <sys/queue.h>
@@ -23,15 +23,18 @@
#include <stdarg.h>
#include <time.h>
+#include "key.h" /* XXX for typedef */
+#include "buffer.h" /* XXX for typedef */
#include "xmalloc.h"
#include "match.h"
+#include "ssherr.h"
#include "log.h"
#include "canohost.h"
-#include "buffer.h"
+#include "sshbuf.h"
#include "misc.h"
#include "channels.h"
#include "servconf.h"
-#include "key.h"
+#include "sshkey.h"
#include "auth-options.h"
#include "hostfile.h"
#include "auth.h"
@@ -420,7 +423,7 @@
#define OPTIONS_CRITICAL 1
#define OPTIONS_EXTENSIONS 2
static int
-parse_option_list(u_char *optblob, size_t optblob_len, struct passwd *pw,
Home |
Main Index |
Thread Index |
Old Index