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/967d9b54ba61
branches: trunk
changeset: 819966:967d9b54ba61
user: christos <christos%NetBSD.org@localhost>
date: Sun Dec 25 00:07:46 2016 +0000
description:
merge conflicts
diffstat:
crypto/external/bsd/openssh/bin/sshd/Makefile | 18 +-
crypto/external/bsd/openssh/dist/LICENCE | 2 +-
crypto/external/bsd/openssh/dist/OVERVIEW | 2 +-
crypto/external/bsd/openssh/dist/PROTOCOL | 2 +-
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 | 11 +-
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 | 103 --
crypto/external/bsd/openssh/dist/auth-krb5.c | 4 +-
crypto/external/bsd/openssh/dist/auth-options.c | 32 +-
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 | 21 +-
crypto/external/bsd/openssh/dist/auth-rh-rsa.c | 106 --
crypto/external/bsd/openssh/dist/auth-rhosts.c | 28 +-
crypto/external/bsd/openssh/dist/auth-rsa.c | 431 --------
crypto/external/bsd/openssh/dist/auth-skey.c | 4 +-
crypto/external/bsd/openssh/dist/auth.c | 38 +-
crypto/external/bsd/openssh/dist/auth.h | 21 +-
crypto/external/bsd/openssh/dist/auth1.c | 474 ---------
crypto/external/bsd/openssh/dist/auth2-chall.c | 4 +-
crypto/external/bsd/openssh/dist/auth2-gss.c | 4 +-
crypto/external/bsd/openssh/dist/auth2-hostbased.c | 4 +-
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 | 67 +-
crypto/external/bsd/openssh/dist/auth2.c | 4 +-
crypto/external/bsd/openssh/dist/authfd.c | 4 +-
crypto/external/bsd/openssh/dist/authfd.h | 2 +-
crypto/external/bsd/openssh/dist/authfile.c | 21 +-
crypto/external/bsd/openssh/dist/authfile.h | 2 +-
crypto/external/bsd/openssh/dist/bcrypt_pbkdf.c | 2 +-
crypto/external/bsd/openssh/dist/bitmap.c | 4 +-
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 | 4 +-
crypto/external/bsd/openssh/dist/canohost.h | 2 +-
crypto/external/bsd/openssh/dist/chacha.c | 2 +-
crypto/external/bsd/openssh/dist/channels.c | 475 ++++++++-
crypto/external/bsd/openssh/dist/channels.h | 15 +-
crypto/external/bsd/openssh/dist/cipher-3des1.c | 4 +-
crypto/external/bsd/openssh/dist/cipher-bf1.c | 4 +-
crypto/external/bsd/openssh/dist/cipher-chachapoly.c | 8 +-
crypto/external/bsd/openssh/dist/cipher-ctr-mt.c | 2 +-
crypto/external/bsd/openssh/dist/cipher.c | 169 ++-
crypto/external/bsd/openssh/dist/cipher.h | 25 +-
crypto/external/bsd/openssh/dist/cleanup.c | 2 +-
crypto/external/bsd/openssh/dist/clientloop.c | 78 +-
crypto/external/bsd/openssh/dist/clientloop.h | 7 +-
crypto/external/bsd/openssh/dist/compat.c | 4 +-
crypto/external/bsd/openssh/dist/compat.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 | 14 +-
crypto/external/bsd/openssh/dist/dh.h | 2 +-
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 | 4 +-
crypto/external/bsd/openssh/dist/dns.h | 2 +-
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 | 4 +-
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 | 4 +-
crypto/external/bsd/openssh/dist/hash.c | 2 +-
crypto/external/bsd/openssh/dist/hmac.c | 2 +-
crypto/external/bsd/openssh/dist/hostfile.c | 12 +-
crypto/external/bsd/openssh/dist/hostfile.h | 2 +-
crypto/external/bsd/openssh/dist/includes.h | 2 +-
crypto/external/bsd/openssh/dist/kex.c | 50 +-
crypto/external/bsd/openssh/dist/kex.h | 27 +-
crypto/external/bsd/openssh/dist/kexc25519.c | 2 +-
crypto/external/bsd/openssh/dist/kexc25519c.c | 2 +-
crypto/external/bsd/openssh/dist/kexc25519s.c | 4 +-
crypto/external/bsd/openssh/dist/kexdh.c | 4 +-
crypto/external/bsd/openssh/dist/kexdhc.c | 4 +-
crypto/external/bsd/openssh/dist/kexdhs.c | 4 +-
crypto/external/bsd/openssh/dist/kexecdh.c | 4 +-
crypto/external/bsd/openssh/dist/kexecdhc.c | 4 +-
crypto/external/bsd/openssh/dist/kexecdhs.c | 4 +-
crypto/external/bsd/openssh/dist/kexgex.c | 4 +-
crypto/external/bsd/openssh/dist/kexgexc.c | 10 +-
crypto/external/bsd/openssh/dist/kexgexs.c | 18 +-
crypto/external/bsd/openssh/dist/key.c | 4 +-
crypto/external/bsd/openssh/dist/key.h | 5 +-
crypto/external/bsd/openssh/dist/krl.c | 18 +-
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 | 4 +-
crypto/external/bsd/openssh/dist/mac.h | 2 +-
crypto/external/bsd/openssh/dist/match.c | 26 +-
crypto/external/bsd/openssh/dist/match.h | 2 +-
crypto/external/bsd/openssh/dist/md-sha256.c | 4 +-
crypto/external/bsd/openssh/dist/misc.c | 33 +-
crypto/external/bsd/openssh/dist/misc.h | 12 +-
crypto/external/bsd/openssh/dist/moduli | 2 +-
crypto/external/bsd/openssh/dist/moduli.5 | 2 +-
crypto/external/bsd/openssh/dist/moduli.c | 10 +-
crypto/external/bsd/openssh/dist/monitor.c | 444 +--------
crypto/external/bsd/openssh/dist/monitor.h | 8 +-
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 | 350 -------
crypto/external/bsd/openssh/dist/monitor_mm.h | 63 -
crypto/external/bsd/openssh/dist/monitor_wrap.c | 194 +---
crypto/external/bsd/openssh/dist/monitor_wrap.h | 22 +-
crypto/external/bsd/openssh/dist/msg.c | 4 +-
crypto/external/bsd/openssh/dist/msg.h | 2 +-
crypto/external/bsd/openssh/dist/mux.c | 83 +-
crypto/external/bsd/openssh/dist/myproposal.h | 10 +-
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 | 4 +-
crypto/external/bsd/openssh/dist/opacket.h | 9 +-
crypto/external/bsd/openssh/dist/packet.c | 333 +++---
crypto/external/bsd/openssh/dist/packet.h | 18 +-
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 | 4 +-
crypto/external/bsd/openssh/dist/progressmeter.h | 2 +-
crypto/external/bsd/openssh/dist/random.h | 2 +-
crypto/external/bsd/openssh/dist/readconf.c | 10 +-
crypto/external/bsd/openssh/dist/readconf.h | 2 +-
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/rsa.c | 4 +-
crypto/external/bsd/openssh/dist/rsa.h | 2 +-
crypto/external/bsd/openssh/dist/sandbox-rlimit.c | 5 +-
crypto/external/bsd/openssh/dist/sc25519.c | 2 +-
crypto/external/bsd/openssh/dist/scp.1 | 2 +-
crypto/external/bsd/openssh/dist/scp.c | 12 +-
crypto/external/bsd/openssh/dist/servconf.c | 183 +--
crypto/external/bsd/openssh/dist/servconf.h | 12 +-
crypto/external/bsd/openssh/dist/serverloop.c | 597 +-----------
crypto/external/bsd/openssh/dist/serverloop.h | 5 +-
crypto/external/bsd/openssh/dist/session.c | 452 +--------
crypto/external/bsd/openssh/dist/session.h | 5 +-
crypto/external/bsd/openssh/dist/sftp-client.c | 12 +-
crypto/external/bsd/openssh/dist/sftp-client.h | 2 +-
crypto/external/bsd/openssh/dist/sftp-common.c | 13 +-
crypto/external/bsd/openssh/dist/sftp-common.h | 2 +-
crypto/external/bsd/openssh/dist/sftp-glob.c | 4 +-
crypto/external/bsd/openssh/dist/sftp-server-main.c | 4 +-
crypto/external/bsd/openssh/dist/sftp-server.8 | 2 +-
crypto/external/bsd/openssh/dist/sftp-server.c | 9 +-
crypto/external/bsd/openssh/dist/sftp.1 | 2 +-
crypto/external/bsd/openssh/dist/sftp.c | 39 +-
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 | 2 +-
crypto/external/bsd/openssh/dist/ssh-add.c | 4 +-
crypto/external/bsd/openssh/dist/ssh-agent.1 | 39 +-
crypto/external/bsd/openssh/dist/ssh-agent.c | 55 +-
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 | 2 +-
crypto/external/bsd/openssh/dist/ssh-gss.h | 2 +-
crypto/external/bsd/openssh/dist/ssh-keygen.1 | 2 +-
crypto/external/bsd/openssh/dist/ssh-keygen.c | 14 +-
crypto/external/bsd/openssh/dist/ssh-keyscan.1 | 2 +-
crypto/external/bsd/openssh/dist/ssh-keyscan.c | 4 +-
crypto/external/bsd/openssh/dist/ssh-keysign.8 | 2 +-
crypto/external/bsd/openssh/dist/ssh-keysign.c | 4 +-
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 | 4 +-
crypto/external/bsd/openssh/dist/ssh-pkcs11.c | 45 +-
crypto/external/bsd/openssh/dist/ssh-pkcs11.h | 2 +-
crypto/external/bsd/openssh/dist/ssh-rsa.c | 13 +-
crypto/external/bsd/openssh/dist/ssh.1 | 2 +-
crypto/external/bsd/openssh/dist/ssh.c | 41 +-
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 | 4 +-
crypto/external/bsd/openssh/dist/ssh_api.h | 2 +-
crypto/external/bsd/openssh/dist/ssh_config | 2 +-
crypto/external/bsd/openssh/dist/ssh_config.5 | 784 +++++++--------
crypto/external/bsd/openssh/dist/sshbuf-getput-basic.c | 2 +-
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 | 82 +-
crypto/external/bsd/openssh/dist/sshbuf.h | 10 +-
crypto/external/bsd/openssh/dist/sshconnect.c | 9 +-
crypto/external/bsd/openssh/dist/sshconnect.h | 2 +-
crypto/external/bsd/openssh/dist/sshconnect1.c | 14 +-
crypto/external/bsd/openssh/dist/sshconnect2.c | 24 +-
crypto/external/bsd/openssh/dist/sshd.8 | 127 +-
crypto/external/bsd/openssh/dist/sshd.c | 573 +----------
crypto/external/bsd/openssh/dist/sshd_config | 19 +-
crypto/external/bsd/openssh/dist/sshd_config.5 | 724 ++++++--------
crypto/external/bsd/openssh/dist/ssherr.c | 2 +-
crypto/external/bsd/openssh/dist/sshkey.c | 75 +-
crypto/external/bsd/openssh/dist/sshkey.h | 4 +-
crypto/external/bsd/openssh/dist/sshlogin.c | 4 +-
crypto/external/bsd/openssh/dist/sshlogin.h | 2 +-
crypto/external/bsd/openssh/dist/sshpty.c | 19 +-
crypto/external/bsd/openssh/dist/sshpty.h | 5 +-
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 | 4 +-
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/utf8.c | 4 +-
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 | 6 +-
crypto/external/bsd/openssh/dist/xmalloc.c | 4 +-
crypto/external/bsd/openssh/dist/xmalloc.h | 2 +-
crypto/external/bsd/openssh/lib/shlib_version | 4 +-
248 files changed, 2715 insertions(+), 5739 deletions(-)
diffs (truncated from 16291 to 300 lines):
diff -r 379600cbd41c -r 967d9b54ba61 crypto/external/bsd/openssh/bin/sshd/Makefile
--- a/crypto/external/bsd/openssh/bin/sshd/Makefile Sun Dec 25 00:00:13 2016 +0000
+++ b/crypto/external/bsd/openssh/bin/sshd/Makefile Sun Dec 25 00:07:46 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2016/01/14 22:30:04 christos Exp $
+# $NetBSD: Makefile,v 1.14 2016/12/25 00:07:46 christos Exp $
.include <bsd.own.mk>
@@ -7,18 +7,18 @@
BINDIR= /usr/sbin
-SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
+SRCS= sshd.c auth-rhosts.c auth-passwd.c \
sshpty.c sshlogin.c servconf.c serverloop.c \
- auth.c auth1.c auth2.c auth-options.c session.c \
- auth-chall.c auth2-chall.c groupaccess.c \
- auth-skey.c auth-bsdauth.c auth2-hostbased.c auth2-kbdint.c \
+ auth.c auth2.c auth-options.c session.c \
+ auth-krb5.c auth2-chall.c groupaccess.c \
+ auth-bsdauth.c auth2-hostbased.c auth2-kbdint.c \
auth2-none.c auth2-passwd.c auth2-pubkey.c \
- monitor_mm.c monitor.c monitor_wrap.c \
+ monitor.c monitor_wrap.c \
kexdhs.c kexgexs.c kexecdhs.c sftp-server.c sftp-common.c \
sandbox-rlimit.c pfilter.c
-COPTS.auth-options.c= -Wno-pointer-sign
-COPTS.ldapauth.c= -Wno-format-nonliteral # XXX: should fix
+COPTS.auth-options.c+= -Wno-pointer-sign
+COPTS.ldapauth.c+= -Wno-format-nonliteral # XXX: should fix
.if (${USE_PAM} != "no")
SRCS+= auth-pam.c
@@ -47,7 +47,7 @@
LDADD+= -lkafs
DPADD+= ${LIBKAFS}
-SRCS+= auth-krb5.c auth2-krb5.c
+SRCS+= auth2-krb5.c
LDADD+= -lkrb5 -lasn1
DPADD+= ${LIBKRB5} ${LIBASN1}
diff -r 379600cbd41c -r 967d9b54ba61 crypto/external/bsd/openssh/dist/LICENCE
--- a/crypto/external/bsd/openssh/dist/LICENCE Sun Dec 25 00:00:13 2016 +0000
+++ b/crypto/external/bsd/openssh/dist/LICENCE Sun Dec 25 00:07:46 2016 +0000
@@ -204,4 +204,4 @@
------
$OpenBSD: LICENCE,v 1.19 2004/08/30 09:18:08 markus Exp $
-$NetBSD: LICENCE,v 1.4 2015/04/03 23:58:19 christos Exp $
+$NetBSD: LICENCE,v 1.5 2016/12/25 00:07:46 christos Exp $
diff -r 379600cbd41c -r 967d9b54ba61 crypto/external/bsd/openssh/dist/OVERVIEW
--- a/crypto/external/bsd/openssh/dist/OVERVIEW Sun Dec 25 00:00:13 2016 +0000
+++ b/crypto/external/bsd/openssh/dist/OVERVIEW Sun Dec 25 00:07:46 2016 +0000
@@ -166,4 +166,4 @@
xmalloc.c "safe" malloc routines
$OpenBSD: OVERVIEW,v 1.12 2015/07/08 19:01:15 markus Exp $
-$NetBSD: OVERVIEW,v 1.5 2015/08/13 10:33:21 christos Exp $
+$NetBSD: OVERVIEW,v 1.6 2016/12/25 00:07:46 christos Exp $
diff -r 379600cbd41c -r 967d9b54ba61 crypto/external/bsd/openssh/dist/PROTOCOL
--- a/crypto/external/bsd/openssh/dist/PROTOCOL Sun Dec 25 00:00:13 2016 +0000
+++ b/crypto/external/bsd/openssh/dist/PROTOCOL Sun Dec 25 00:07:46 2016 +0000
@@ -455,4 +455,4 @@
"1".
$OpenBSD: PROTOCOL,v 1.30 2016/04/08 06:35:54 djm Exp $
-$NetBSD: PROTOCOL,v 1.8 2016/08/02 13:45:12 christos Exp $
+$NetBSD: PROTOCOL,v 1.9 2016/12/25 00:07:46 christos Exp $
diff -r 379600cbd41c -r 967d9b54ba61 crypto/external/bsd/openssh/dist/PROTOCOL.agent
--- a/crypto/external/bsd/openssh/dist/PROTOCOL.agent Sun Dec 25 00:00:13 2016 +0000
+++ b/crypto/external/bsd/openssh/dist/PROTOCOL.agent Sun Dec 25 00:07:46 2016 +0000
@@ -580,4 +580,4 @@
SSH_AGENT_CONSTRAIN_CONFIRM 2
$OpenBSD: PROTOCOL.agent,v 1.11 2016/05/19 07:45:32 djm Exp $
-$NetBSD: PROTOCOL.agent,v 1.7 2016/08/02 13:45:12 christos Exp $
+$NetBSD: PROTOCOL.agent,v 1.8 2016/12/25 00:07:46 christos Exp $
diff -r 379600cbd41c -r 967d9b54ba61 crypto/external/bsd/openssh/dist/PROTOCOL.certkeys
--- a/crypto/external/bsd/openssh/dist/PROTOCOL.certkeys Sun Dec 25 00:00:13 2016 +0000
+++ b/crypto/external/bsd/openssh/dist/PROTOCOL.certkeys Sun Dec 25 00:07:46 2016 +0000
@@ -285,4 +285,4 @@
this option is not present.
$OpenBSD: PROTOCOL.certkeys,v 1.10 2016/05/03 10:27:59 djm Exp $
-$NetBSD: PROTOCOL.certkeys,v 1.6 2016/08/02 13:45:12 christos Exp $
+$NetBSD: PROTOCOL.certkeys,v 1.7 2016/12/25 00:07:46 christos Exp $
diff -r 379600cbd41c -r 967d9b54ba61 crypto/external/bsd/openssh/dist/PROTOCOL.mux
--- a/crypto/external/bsd/openssh/dist/PROTOCOL.mux Sun Dec 25 00:00:13 2016 +0000
+++ b/crypto/external/bsd/openssh/dist/PROTOCOL.mux Sun Dec 25 00:07:46 2016 +0000
@@ -226,4 +226,4 @@
XXX send signals via mux
$OpenBSD: PROTOCOL.mux,v 1.10 2015/07/17 03:04:27 djm Exp $
-$NetBSD: PROTOCOL.mux,v 1.8 2015/08/13 10:33:21 christos Exp $
+$NetBSD: PROTOCOL.mux,v 1.9 2016/12/25 00:07:46 christos Exp $
diff -r 379600cbd41c -r 967d9b54ba61 crypto/external/bsd/openssh/dist/README
--- a/crypto/external/bsd/openssh/dist/README Sun Dec 25 00:00:13 2016 +0000
+++ b/crypto/external/bsd/openssh/dist/README Sun Dec 25 00:07:46 2016 +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.4 2015/04/03 23:58:19 christos Exp $
+$NetBSD: README,v 1.5 2016/12/25 00:07:46 christos Exp $
diff -r 379600cbd41c -r 967d9b54ba61 crypto/external/bsd/openssh/dist/addrmatch.c
--- a/crypto/external/bsd/openssh/dist/addrmatch.c Sun Dec 25 00:00:13 2016 +0000
+++ b/crypto/external/bsd/openssh/dist/addrmatch.c Sun Dec 25 00:07:46 2016 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: addrmatch.c,v 1.9 2015/08/13 10:33:21 christos Exp $ */
-/* $OpenBSD: addrmatch.c,v 1.10 2015/07/08 19:04:21 markus Exp $ */
+/* $NetBSD: addrmatch.c,v 1.10 2016/12/25 00:07:46 christos Exp $ */
+/* $OpenBSD: addrmatch.c,v 1.13 2016/09/21 16:55:42 djm Exp $ */
/*
* Copyright (c) 2004-2008 Damien Miller <djm%mindrot.org@localhost>
@@ -18,7 +18,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: addrmatch.c,v 1.9 2015/08/13 10:33:21 christos Exp $");
+__RCSID("$NetBSD: addrmatch.c,v 1.10 2016/12/25 00:07:46 christos Exp $");
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
@@ -397,8 +397,8 @@
/* Prefer CIDR address matching */
r = addr_pton_cidr(cp, &match_addr, &masklen);
if (r == -2) {
- error("Inconsistent mask length for "
- "network \"%.100s\"", cp);
+ debug2("%s: inconsistent mask length for "
+ "match network \"%.100s\"", __func__, cp);
ret = -2;
break;
} else if (r == 0) {
diff -r 379600cbd41c -r 967d9b54ba61 crypto/external/bsd/openssh/dist/atomicio.c
--- a/crypto/external/bsd/openssh/dist/atomicio.c Sun Dec 25 00:00:13 2016 +0000
+++ b/crypto/external/bsd/openssh/dist/atomicio.c Sun Dec 25 00:07:46 2016 +0000
@@ -1,5 +1,6 @@
-/* $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 $ */
+/* $NetBSD: atomicio.c,v 1.7 2016/12/25 00:07:46 christos Exp $ */
+/* $OpenBSD: atomicio.c,v 1.28 2016/07/27 23:18:12 djm Exp $ */
+
/*
* Copyright (c) 2006 Damien Miller. All rights reserved.
* Copyright (c) 2005 Anil Madhavapeddy. All rights reserved.
@@ -28,7 +29,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: atomicio.c,v 1.6 2015/04/03 23:58:19 christos Exp $");
+__RCSID("$NetBSD: atomicio.c,v 1.7 2016/12/25 00:07:46 christos Exp $");
#include <sys/param.h>
#include <sys/uio.h>
@@ -102,12 +103,12 @@
struct iovec iov_array[IOV_MAX], *iov = iov_array;
struct pollfd pfd;
- if (iovcnt > IOV_MAX) {
+ if (iovcnt < 0 || iovcnt > IOV_MAX) {
errno = EINVAL;
return 0;
}
/* Make a copy of the iov array because we may modify it below */
- memcpy(iov, _iov, iovcnt * sizeof(*_iov));
+ memcpy(iov, _iov, (size_t)iovcnt * sizeof(*_iov));
pfd.fd = fd;
pfd.events = f == readv ? POLLIN : POLLOUT;
diff -r 379600cbd41c -r 967d9b54ba61 crypto/external/bsd/openssh/dist/atomicio.h
--- a/crypto/external/bsd/openssh/dist/atomicio.h Sun Dec 25 00:00:13 2016 +0000
+++ b/crypto/external/bsd/openssh/dist/atomicio.h Sun Dec 25 00:07:46 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: atomicio.h,v 1.5 2015/04/03 23:58:19 christos Exp $ */
+/* $NetBSD: atomicio.h,v 1.6 2016/12/25 00:07:46 christos Exp $ */
/* $OpenBSD: atomicio.h,v 1.11 2010/09/22 22:58:51 djm Exp $ */
/*
diff -r 379600cbd41c -r 967d9b54ba61 crypto/external/bsd/openssh/dist/auth-bsdauth.c
--- a/crypto/external/bsd/openssh/dist/auth-bsdauth.c Sun Dec 25 00:00:13 2016 +0000
+++ b/crypto/external/bsd/openssh/dist/auth-bsdauth.c Sun Dec 25 00:07:46 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: auth-bsdauth.c,v 1.5 2016/03/11 01:55:00 christos Exp $ */
+/* $NetBSD: auth-bsdauth.c,v 1.6 2016/12/25 00:07:46 christos Exp $ */
/* $OpenBSD: auth-bsdauth.c,v 1.14 2015/10/20 23:24:25 mmcc Exp $ */
/*
@@ -26,7 +26,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: auth-bsdauth.c,v 1.5 2016/03/11 01:55:00 christos Exp $");
+__RCSID("$NetBSD: auth-bsdauth.c,v 1.6 2016/12/25 00:07:46 christos Exp $");
#include <sys/types.h>
#include <stdarg.h>
#include <stdio.h>
diff -r 379600cbd41c -r 967d9b54ba61 crypto/external/bsd/openssh/dist/auth-chall.c
--- a/crypto/external/bsd/openssh/dist/auth-chall.c Sun Dec 25 00:00:13 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-/* $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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "includes.h"
-__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>
-#include <stdio.h>
-
-#include "xmalloc.h"
-#include "key.h"
-#include "hostfile.h"
-#include "auth.h"
-#include "log.h"
-#ifdef USE_PAM
-#include "misc.h"
-#include "buffer.h"
-#include "servconf.h"
-extern ServerOptions options;
-void remove_kbdint_device(const char *);
-#endif
-
-/* limited protocol v1 interface to kbd-interactive authentication */
-
-extern KbdintDevice *devices[];
-static KbdintDevice *device;
-
-char *
-get_challenge(Authctxt *authctxt)
-{
- char *challenge, *name, *info, **prompts;
- u_int i, numprompts;
- u_int *echo_on;
-
-#ifdef USE_PAM
- if (!options.use_pam)
- remove_kbdint_device("pam");
-#endif
-
- device = devices[0]; /* we always use the 1st device for protocol 1 */
- if (device == NULL)
- return NULL;
- if ((authctxt->kbdintctxt = device->init_ctx(authctxt)) == NULL)
- return NULL;
- if (device->query(authctxt->kbdintctxt, &name, &info,
- &numprompts, &prompts, &echo_on)) {
- device->free_ctx(authctxt->kbdintctxt);
- authctxt->kbdintctxt = NULL;
- return NULL;
- }
- if (numprompts < 1)
- fatal("get_challenge: numprompts < 1");
- challenge = xstrdup(prompts[0]);
- for (i = 0; i < numprompts; i++)
- free(prompts[i]);
- free(prompts);
- free(name);
- free(echo_on);
- free(info);
-
- return (challenge);
-}
-int
-verify_response(Authctxt *authctxt, const char *response)
-{
- char *resp[1];
- int authenticated = 0;
-
- if (device == NULL)
- return 0;
- if (authctxt->kbdintctxt == NULL)
Home |
Main Index |
Thread Index |
Old Index