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/dist merge conflicts



details:   https://anonhg.NetBSD.org/src/rev/63f90863f286
branches:  trunk
changeset: 353049:63f90863f286
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Apr 18 18:41:46 2017 +0000

description:
merge conflicts

diffstat:

 crypto/external/bsd/openssh/dist/addrmatch.c            |   4 +-
 crypto/external/bsd/openssh/dist/atomicio.c             |   4 +-
 crypto/external/bsd/openssh/dist/atomicio.h             |   2 +-
 crypto/external/bsd/openssh/dist/auth-bsdauth.c         |   4 +-
 crypto/external/bsd/openssh/dist/auth-krb5.c            |   4 +-
 crypto/external/bsd/openssh/dist/auth-options.c         |   4 +-
 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          |   4 +-
 crypto/external/bsd/openssh/dist/auth-rhosts.c          |   4 +-
 crypto/external/bsd/openssh/dist/auth-skey.c            |   4 +-
 crypto/external/bsd/openssh/dist/auth.c                 |   4 +-
 crypto/external/bsd/openssh/dist/auth.h                 |   2 +-
 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         |  28 +++-
 crypto/external/bsd/openssh/dist/auth2.c                |  17 +-
 crypto/external/bsd/openssh/dist/authfd.c               |   4 +-
 crypto/external/bsd/openssh/dist/authfd.h               |   2 +-
 crypto/external/bsd/openssh/dist/authfile.c             |   4 +-
 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             |  38 ++++-
 crypto/external/bsd/openssh/dist/channels.h             |   7 +-
 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    |   2 +-
 crypto/external/bsd/openssh/dist/cipher-ctr-mt.c        |   2 +-
 crypto/external/bsd/openssh/dist/cipher.c               |   4 +-
 crypto/external/bsd/openssh/dist/cipher.h               |   2 +-
 crypto/external/bsd/openssh/dist/cleanup.c              |   2 +-
 crypto/external/bsd/openssh/dist/clientloop.c           |  34 ++++-
 crypto/external/bsd/openssh/dist/clientloop.h           |   2 +-
 crypto/external/bsd/openssh/dist/compat.c               |  52 ++------
 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                   |   4 +-
 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       |   6 +-
 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             |   2 +-
 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             |  24 ++-
 crypto/external/bsd/openssh/dist/hostfile.h             |   2 +-
 crypto/external/bsd/openssh/dist/includes.h             |   2 +-
 crypto/external/bsd/openssh/dist/kex.c                  |  47 ++++---
 crypto/external/bsd/openssh/dist/kex.h                  |   2 +-
 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              |   4 +-
 crypto/external/bsd/openssh/dist/kexgexs.c              |   4 +-
 crypto/external/bsd/openssh/dist/key.c                  |   4 +-
 crypto/external/bsd/openssh/dist/key.h                  |   2 +-
 crypto/external/bsd/openssh/dist/krl.c                  |  12 +-
 crypto/external/bsd/openssh/dist/ldapauth.c             |   6 +-
 crypto/external/bsd/openssh/dist/ldapauth.h             |   4 +-
 crypto/external/bsd/openssh/dist/log.c                  |   9 +-
 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                |  51 +++++++-
 crypto/external/bsd/openssh/dist/match.h                |   5 +-
 crypto/external/bsd/openssh/dist/md-sha256.c            |   4 +-
 crypto/external/bsd/openssh/dist/misc.c                 |  22 ++-
 crypto/external/bsd/openssh/dist/misc.h                 |   2 +-
 crypto/external/bsd/openssh/dist/moduli.5               |   2 +-
 crypto/external/bsd/openssh/dist/moduli.c               |   4 +-
 crypto/external/bsd/openssh/dist/monitor.c              |  12 +-
 crypto/external/bsd/openssh/dist/monitor.h              |   2 +-
 crypto/external/bsd/openssh/dist/monitor_fdpass.c       |   4 +-
 crypto/external/bsd/openssh/dist/monitor_fdpass.h       |   2 +-
 crypto/external/bsd/openssh/dist/monitor_wrap.c         |   4 +-
 crypto/external/bsd/openssh/dist/monitor_wrap.h         |   2 +-
 crypto/external/bsd/openssh/dist/msg.c                  |   4 +-
 crypto/external/bsd/openssh/dist/msg.h                  |   2 +-
 crypto/external/bsd/openssh/dist/mux.c                  |  11 +-
 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/opacket.c              |   4 +-
 crypto/external/bsd/openssh/dist/opacket.h              |   2 +-
 crypto/external/bsd/openssh/dist/packet.c               |  85 +++++++++----
 crypto/external/bsd/openssh/dist/packet.h               |  11 +-
 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             |  99 +++++++++++-----
 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       |   2 +-
 crypto/external/bsd/openssh/dist/sc25519.c              |   2 +-
 crypto/external/bsd/openssh/dist/scp.1                  |   2 +-
 crypto/external/bsd/openssh/dist/scp.c                  |   4 +-
 crypto/external/bsd/openssh/dist/servconf.c             |  39 +++---
 crypto/external/bsd/openssh/dist/servconf.h             |   2 +-
 crypto/external/bsd/openssh/dist/serverloop.c           |  41 ++++--
 crypto/external/bsd/openssh/dist/serverloop.h           |   2 +-
 crypto/external/bsd/openssh/dist/session.c              |   4 +-
 crypto/external/bsd/openssh/dist/session.h              |   2 +-
 crypto/external/bsd/openssh/dist/sftp-client.c          |   9 +-
 crypto/external/bsd/openssh/dist/sftp-client.h          |   2 +-
 crypto/external/bsd/openssh/dist/sftp-common.c          |   4 +-
 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          |   4 +-
 crypto/external/bsd/openssh/dist/sftp.1                 |   2 +-
 crypto/external/bsd/openssh/dist/sftp.c                 |  45 ++++---
 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            |   2 +-
 crypto/external/bsd/openssh/dist/ssh-agent.c            |  23 ++-
 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           |  47 +++++--
 crypto/external/bsd/openssh/dist/ssh-keyscan.1          |   2 +-
 crypto/external/bsd/openssh/dist/ssh-keyscan.c          |  29 ++--
 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           |   4 +-
 crypto/external/bsd/openssh/dist/ssh-pkcs11.h           |   2 +-
 crypto/external/bsd/openssh/dist/ssh-rsa.c              |   4 +-
 crypto/external/bsd/openssh/dist/ssh.1                  |   2 +-
 crypto/external/bsd/openssh/dist/ssh.c                  |  15 +-
 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.5           |  32 ++++-
 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               |   2 +-
 crypto/external/bsd/openssh/dist/sshconnect.c           |   9 +-
 crypto/external/bsd/openssh/dist/sshconnect.h           |   2 +-
 crypto/external/bsd/openssh/dist/sshconnect1.c          |  13 +-
 crypto/external/bsd/openssh/dist/sshconnect2.c          |  82 ++++++++++---
 crypto/external/bsd/openssh/dist/sshd.8                 |   8 +-
 crypto/external/bsd/openssh/dist/sshd.c                 |  28 +++-
 crypto/external/bsd/openssh/dist/sshd_config            |   7 +-
 crypto/external/bsd/openssh/dist/sshd_config.5          |  52 ++++----
 crypto/external/bsd/openssh/dist/ssherr.c               |   2 +-
 crypto/external/bsd/openssh/dist/sshkey.c               |  67 +++++++++-
 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               |   4 +-
 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              |   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                 |   9 +-
 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              |   4 +-
 crypto/external/bsd/openssh/dist/xmalloc.h              |   2 +-
 228 files changed, 1001 insertions(+), 686 deletions(-)

diffs (truncated from 5606 to 300 lines):

diff -r be942d87bfea -r 63f90863f286 crypto/external/bsd/openssh/dist/addrmatch.c
--- a/crypto/external/bsd/openssh/dist/addrmatch.c      Tue Apr 18 18:07:29 2017 +0000
+++ b/crypto/external/bsd/openssh/dist/addrmatch.c      Tue Apr 18 18:41:46 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: addrmatch.c,v 1.10 2016/12/25 00:07:46 christos Exp $  */
+/*     $NetBSD: addrmatch.c,v 1.11 2017/04/18 18:41:46 christos Exp $  */
 /*     $OpenBSD: addrmatch.c,v 1.13 2016/09/21 16:55:42 djm Exp $ */
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: addrmatch.c,v 1.10 2016/12/25 00:07:46 christos Exp $");
+__RCSID("$NetBSD: addrmatch.c,v 1.11 2017/04/18 18:41:46 christos Exp $");
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
diff -r be942d87bfea -r 63f90863f286 crypto/external/bsd/openssh/dist/atomicio.c
--- a/crypto/external/bsd/openssh/dist/atomicio.c       Tue Apr 18 18:07:29 2017 +0000
+++ b/crypto/external/bsd/openssh/dist/atomicio.c       Tue Apr 18 18:41:46 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: atomicio.c,v 1.7 2016/12/25 00:07:46 christos Exp $    */
+/*     $NetBSD: atomicio.c,v 1.8 2017/04/18 18:41:46 christos Exp $    */
 /* $OpenBSD: atomicio.c,v 1.28 2016/07/27 23:18:12 djm Exp $ */
 
 /*
@@ -29,7 +29,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: atomicio.c,v 1.7 2016/12/25 00:07:46 christos Exp $");
+__RCSID("$NetBSD: atomicio.c,v 1.8 2017/04/18 18:41:46 christos Exp $");
 #include <sys/param.h>
 #include <sys/uio.h>
 
diff -r be942d87bfea -r 63f90863f286 crypto/external/bsd/openssh/dist/atomicio.h
--- a/crypto/external/bsd/openssh/dist/atomicio.h       Tue Apr 18 18:07:29 2017 +0000
+++ b/crypto/external/bsd/openssh/dist/atomicio.h       Tue Apr 18 18:41:46 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: atomicio.h,v 1.6 2016/12/25 00:07:46 christos Exp $    */
+/*     $NetBSD: atomicio.h,v 1.7 2017/04/18 18:41:46 christos Exp $    */
 /* $OpenBSD: atomicio.h,v 1.11 2010/09/22 22:58:51 djm Exp $ */
 
 /*
diff -r be942d87bfea -r 63f90863f286 crypto/external/bsd/openssh/dist/auth-bsdauth.c
--- a/crypto/external/bsd/openssh/dist/auth-bsdauth.c   Tue Apr 18 18:07:29 2017 +0000
+++ b/crypto/external/bsd/openssh/dist/auth-bsdauth.c   Tue Apr 18 18:41:46 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: auth-bsdauth.c,v 1.6 2016/12/25 00:07:46 christos Exp $        */
+/*     $NetBSD: auth-bsdauth.c,v 1.7 2017/04/18 18:41: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.6 2016/12/25 00:07:46 christos Exp $");
+__RCSID("$NetBSD: auth-bsdauth.c,v 1.7 2017/04/18 18:41:46 christos Exp $");
 #include <sys/types.h>
 #include <stdarg.h>
 #include <stdio.h>
diff -r be942d87bfea -r 63f90863f286 crypto/external/bsd/openssh/dist/auth-krb5.c
--- a/crypto/external/bsd/openssh/dist/auth-krb5.c      Tue Apr 18 18:07:29 2017 +0000
+++ b/crypto/external/bsd/openssh/dist/auth-krb5.c      Tue Apr 18 18:41:46 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: auth-krb5.c,v 1.10 2016/12/25 00:07:46 christos Exp $  */
+/*     $NetBSD: auth-krb5.c,v 1.11 2017/04/18 18:41:46 christos Exp $  */
 /* $OpenBSD: auth-krb5.c,v 1.22 2016/05/04 14:22:33 markus Exp $ */
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: auth-krb5.c,v 1.10 2016/12/25 00:07:46 christos Exp $");
+__RCSID("$NetBSD: auth-krb5.c,v 1.11 2017/04/18 18:41:46 christos Exp $");
 #include <sys/types.h>
 #include <pwd.h>
 #include <stdarg.h>
diff -r be942d87bfea -r 63f90863f286 crypto/external/bsd/openssh/dist/auth-options.c
--- a/crypto/external/bsd/openssh/dist/auth-options.c   Tue Apr 18 18:07:29 2017 +0000
+++ b/crypto/external/bsd/openssh/dist/auth-options.c   Tue Apr 18 18:41:46 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: auth-options.c,v 1.14 2016/12/25 00:07:46 christos Exp $       */
+/*     $NetBSD: auth-options.c,v 1.15 2017/04/18 18:41:46 christos Exp $       */
 /* $OpenBSD: auth-options.c,v 1.72 2016/11/30 02:57:40 djm Exp $ */
 
 /*
@@ -13,7 +13,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: auth-options.c,v 1.14 2016/12/25 00:07:46 christos Exp $");
+__RCSID("$NetBSD: auth-options.c,v 1.15 2017/04/18 18:41:46 christos Exp $");
 #include <sys/types.h>
 #include <sys/queue.h>
 
diff -r be942d87bfea -r 63f90863f286 crypto/external/bsd/openssh/dist/auth-options.h
--- a/crypto/external/bsd/openssh/dist/auth-options.h   Tue Apr 18 18:07:29 2017 +0000
+++ b/crypto/external/bsd/openssh/dist/auth-options.h   Tue Apr 18 18:41:46 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: auth-options.h,v 1.7 2016/12/25 00:07:46 christos Exp $        */
+/*     $NetBSD: auth-options.h,v 1.8 2017/04/18 18:41:46 christos Exp $        */
 /* $OpenBSD: auth-options.h,v 1.22 2016/11/30 02:57:40 djm Exp $ */
 
 /*
diff -r be942d87bfea -r 63f90863f286 crypto/external/bsd/openssh/dist/auth-pam.c
--- a/crypto/external/bsd/openssh/dist/auth-pam.c       Tue Apr 18 18:07:29 2017 +0000
+++ b/crypto/external/bsd/openssh/dist/auth-pam.c       Tue Apr 18 18:41:46 2017 +0000
@@ -50,7 +50,7 @@
 /*
  * NetBSD local changes
  */
-__RCSID("$NetBSD: auth-pam.c,v 1.10 2016/12/25 00:07:46 christos Exp $");
+__RCSID("$NetBSD: auth-pam.c,v 1.11 2017/04/18 18:41:46 christos Exp $");
 #undef USE_POSIX_THREADS /* Not yet */
 #define HAVE_SECURITY_PAM_APPL_H
 #define HAVE_PAM_GETENVLIST
diff -r be942d87bfea -r 63f90863f286 crypto/external/bsd/openssh/dist/auth-pam.h
--- a/crypto/external/bsd/openssh/dist/auth-pam.h       Tue Apr 18 18:07:29 2017 +0000
+++ b/crypto/external/bsd/openssh/dist/auth-pam.h       Tue Apr 18 18:41:46 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: auth-pam.h,v 1.5 2016/12/25 00:07:46 christos Exp $    */
+/*     $NetBSD: auth-pam.h,v 1.6 2017/04/18 18:41:46 christos Exp $    */
 /* Id: auth-pam.h,v 1.27 2004/09/11 12:17:26 dtucker Exp  */
 
 /*
diff -r be942d87bfea -r 63f90863f286 crypto/external/bsd/openssh/dist/auth-passwd.c
--- a/crypto/external/bsd/openssh/dist/auth-passwd.c    Tue Apr 18 18:07:29 2017 +0000
+++ b/crypto/external/bsd/openssh/dist/auth-passwd.c    Tue Apr 18 18:41:46 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: auth-passwd.c,v 1.6 2016/12/25 00:07:46 christos Exp $ */
+/*     $NetBSD: auth-passwd.c,v 1.7 2017/04/18 18:41:46 christos Exp $ */
 /* $OpenBSD: auth-passwd.c,v 1.45 2016/07/21 01:39:35 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo%cs.hut.fi@localhost>
@@ -38,7 +38,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: auth-passwd.c,v 1.6 2016/12/25 00:07:46 christos Exp $");
+__RCSID("$NetBSD: auth-passwd.c,v 1.7 2017/04/18 18:41:46 christos Exp $");
 #include <sys/types.h>
 
 #include <login_cap.h>
diff -r be942d87bfea -r 63f90863f286 crypto/external/bsd/openssh/dist/auth-rhosts.c
--- a/crypto/external/bsd/openssh/dist/auth-rhosts.c    Tue Apr 18 18:07:29 2017 +0000
+++ b/crypto/external/bsd/openssh/dist/auth-rhosts.c    Tue Apr 18 18:41:46 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: auth-rhosts.c,v 1.7 2016/12/25 00:07:46 christos Exp $ */
+/*     $NetBSD: auth-rhosts.c,v 1.8 2017/04/18 18:41:46 christos Exp $ */
 /* $OpenBSD: auth-rhosts.c,v 1.48 2016/08/13 17:47:41 markus Exp $ */
 
 /*
@@ -17,7 +17,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: auth-rhosts.c,v 1.7 2016/12/25 00:07:46 christos Exp $");
+__RCSID("$NetBSD: auth-rhosts.c,v 1.8 2017/04/18 18:41:46 christos Exp $");
 #include <sys/types.h>
 #include <sys/stat.h>
 
diff -r be942d87bfea -r 63f90863f286 crypto/external/bsd/openssh/dist/auth-skey.c
--- a/crypto/external/bsd/openssh/dist/auth-skey.c      Tue Apr 18 18:07:29 2017 +0000
+++ b/crypto/external/bsd/openssh/dist/auth-skey.c      Tue Apr 18 18:41:46 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: auth-skey.c,v 1.4 2016/12/25 00:07:46 christos Exp $   */
+/*     $NetBSD: auth-skey.c,v 1.5 2017/04/18 18:41:46 christos Exp $   */
 /* $OpenBSD: auth-skey.c,v 1.27 2007/01/21 01:41:54 stevesk Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "includes.h"
-__RCSID("$NetBSD: auth-skey.c,v 1.4 2016/12/25 00:07:46 christos Exp $");
+__RCSID("$NetBSD: auth-skey.c,v 1.5 2017/04/18 18:41:46 christos Exp $");
 
 #ifdef SKEY
 
diff -r be942d87bfea -r 63f90863f286 crypto/external/bsd/openssh/dist/auth.c
--- a/crypto/external/bsd/openssh/dist/auth.c   Tue Apr 18 18:07:29 2017 +0000
+++ b/crypto/external/bsd/openssh/dist/auth.c   Tue Apr 18 18:41:46 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: auth.c,v 1.18 2016/12/25 00:07:46 christos Exp $       */
+/*     $NetBSD: auth.c,v 1.19 2017/04/18 18:41:46 christos Exp $       */
 /* $OpenBSD: auth.c,v 1.119 2016/12/15 21:29:05 dtucker Exp $ */
 
 /*
@@ -26,7 +26,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: auth.c,v 1.18 2016/12/25 00:07:46 christos Exp $");
+__RCSID("$NetBSD: auth.c,v 1.19 2017/04/18 18:41:46 christos Exp $");
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
diff -r be942d87bfea -r 63f90863f286 crypto/external/bsd/openssh/dist/auth.h
--- a/crypto/external/bsd/openssh/dist/auth.h   Tue Apr 18 18:07:29 2017 +0000
+++ b/crypto/external/bsd/openssh/dist/auth.h   Tue Apr 18 18:41:46 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: auth.h,v 1.14 2016/12/25 00:07:46 christos Exp $       */
+/*     $NetBSD: auth.h,v 1.15 2017/04/18 18:41:46 christos Exp $       */
 /* $OpenBSD: auth.h,v 1.89 2016/08/13 17:47:41 markus Exp $ */
 
 /*
diff -r be942d87bfea -r 63f90863f286 crypto/external/bsd/openssh/dist/auth2-chall.c
--- a/crypto/external/bsd/openssh/dist/auth2-chall.c    Tue Apr 18 18:07:29 2017 +0000
+++ b/crypto/external/bsd/openssh/dist/auth2-chall.c    Tue Apr 18 18:41:46 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: auth2-chall.c,v 1.11 2016/12/25 00:07:46 christos Exp $        */
+/*     $NetBSD: auth2-chall.c,v 1.12 2017/04/18 18:41:46 christos Exp $        */
 /* $OpenBSD: auth2-chall.c,v 1.44 2016/05/02 08:49:03 djm Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: auth2-chall.c,v 1.11 2016/12/25 00:07:46 christos Exp $");
+__RCSID("$NetBSD: auth2-chall.c,v 1.12 2017/04/18 18:41:46 christos Exp $");
 #include <sys/types.h>
 
 #include <stdio.h>
diff -r be942d87bfea -r 63f90863f286 crypto/external/bsd/openssh/dist/auth2-gss.c
--- a/crypto/external/bsd/openssh/dist/auth2-gss.c      Tue Apr 18 18:07:29 2017 +0000
+++ b/crypto/external/bsd/openssh/dist/auth2-gss.c      Tue Apr 18 18:41:46 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: auth2-gss.c,v 1.9 2016/12/25 00:07:46 christos Exp $   */
+/*     $NetBSD: auth2-gss.c,v 1.10 2017/04/18 18:41:46 christos Exp $  */
 /* $OpenBSD: auth2-gss.c,v 1.22 2015/01/19 20:07:45 markus Exp $ */
 
 /*
@@ -26,7 +26,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: auth2-gss.c,v 1.9 2016/12/25 00:07:46 christos Exp $");
+__RCSID("$NetBSD: auth2-gss.c,v 1.10 2017/04/18 18:41:46 christos Exp $");
 
 #ifdef GSSAPI
 
diff -r be942d87bfea -r 63f90863f286 crypto/external/bsd/openssh/dist/auth2-hostbased.c
--- a/crypto/external/bsd/openssh/dist/auth2-hostbased.c        Tue Apr 18 18:07:29 2017 +0000
+++ b/crypto/external/bsd/openssh/dist/auth2-hostbased.c        Tue Apr 18 18:41:46 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: auth2-hostbased.c,v 1.10 2016/12/25 00:07:46 christos Exp $    */
+/*     $NetBSD: auth2-hostbased.c,v 1.11 2017/04/18 18:41:46 christos Exp $    */
 /* $OpenBSD: auth2-hostbased.c,v 1.26 2016/03/07 19:02:43 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: auth2-hostbased.c,v 1.10 2016/12/25 00:07:46 christos Exp $");
+__RCSID("$NetBSD: auth2-hostbased.c,v 1.11 2017/04/18 18:41:46 christos Exp $");
 #include <sys/types.h>
 
 #include <pwd.h>
diff -r be942d87bfea -r 63f90863f286 crypto/external/bsd/openssh/dist/auth2-kbdint.c
--- a/crypto/external/bsd/openssh/dist/auth2-kbdint.c   Tue Apr 18 18:07:29 2017 +0000
+++ b/crypto/external/bsd/openssh/dist/auth2-kbdint.c   Tue Apr 18 18:41:46 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: auth2-kbdint.c,v 1.6 2016/12/25 00:07:46 christos Exp $        */
+/*     $NetBSD: auth2-kbdint.c,v 1.7 2017/04/18 18:41:46 christos Exp $        */
 /* $OpenBSD: auth2-kbdint.c,v 1.7 2014/07/15 15:54:14 millert Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: auth2-kbdint.c,v 1.6 2016/12/25 00:07:46 christos Exp $");
+__RCSID("$NetBSD: auth2-kbdint.c,v 1.7 2017/04/18 18:41:46 christos Exp $");
 #include <sys/types.h>
 
 #include "xmalloc.h"
diff -r be942d87bfea -r 63f90863f286 crypto/external/bsd/openssh/dist/auth2-krb5.c
--- a/crypto/external/bsd/openssh/dist/auth2-krb5.c     Tue Apr 18 18:07:29 2017 +0000
+++ b/crypto/external/bsd/openssh/dist/auth2-krb5.c     Tue Apr 18 18:41:46 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: auth2-krb5.c,v 1.5 2016/12/25 00:07:46 christos Exp $  */
+/*     $NetBSD: auth2-krb5.c,v 1.6 2017/04/18 18:41:46 christos Exp $  */
 /*
  * Copyright (c) 2003 Markus Friedl.  All rights reserved.
  *
@@ -24,7 +24,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: auth2-krb5.c,v 1.5 2016/12/25 00:07:46 christos Exp $");
+__RCSID("$NetBSD: auth2-krb5.c,v 1.6 2017/04/18 18:41:46 christos Exp $");
 
 #include <krb5.h>
 #include <stdio.h>



Home | Main Index | Thread Index | Old Index