Merge the [pgoyette-compat] branch

crypto/external/bsd/openssh/dist/addrmatch.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: addrmatch.c,v 1.12 2018/08/26 07:46:36 christos Exp $	*/
+/*	$NetBSD: addrmatch.c,v 1.13 2019/01/27 02:08:33 pgoyette Exp $	*/
 /*	$OpenBSD: addrmatch.c,v 1.14 2018/07/31 03:07:24 djm Exp $ */
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: addrmatch.c,v 1.12 2018/08/26 07:46:36 christos Exp $");
+__RCSID("$NetBSD: addrmatch.c,v 1.13 2019/01/27 02:08:33 pgoyette Exp $");
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>

crypto/external/bsd/openssh/dist/auth-bsdauth.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: auth-bsdauth.c,v 1.8 2018/08/26 07:46:36 christos Exp $	*/
+/*	$NetBSD: auth-bsdauth.c,v 1.9 2019/01/27 02:08:33 pgoyette Exp $	*/
 /* $OpenBSD: auth-bsdauth.c,v 1.15 2018/07/09 21:35:50 markus Exp $ */
 
 /*
@@ -26,7 +26,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: auth-bsdauth.c,v 1.8 2018/08/26 07:46:36 christos Exp $");
+__RCSID("$NetBSD: auth-bsdauth.c,v 1.9 2019/01/27 02:08:33 pgoyette Exp $");
 #include <sys/types.h>
 #include <stdarg.h>
 #include <stdio.h>

crypto/external/bsd/openssh/dist/auth-krb5.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: auth-krb5.c,v 1.12 2018/08/26 07:46:36 christos Exp $	*/
+/*	$NetBSD: auth-krb5.c,v 1.13 2019/01/27 02:08:33 pgoyette Exp $	*/
 /* $OpenBSD: auth-krb5.c,v 1.23 2018/07/09 21:35:50 markus Exp $ */
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: auth-krb5.c,v 1.12 2018/08/26 07:46:36 christos Exp $");
+__RCSID("$NetBSD: auth-krb5.c,v 1.13 2019/01/27 02:08:33 pgoyette Exp $");
 #include <sys/types.h>
 #include <pwd.h>
 #include <stdarg.h>

crypto/external/bsd/openssh/dist/auth-options.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: auth-options.c,v 1.18 2018/08/26 07:46:36 christos Exp $	*/
+/*	$NetBSD: auth-options.c,v 1.19 2019/01/27 02:08:33 pgoyette Exp $	*/
 /* $OpenBSD: auth-options.c,v 1.83 2018/06/19 02:59:41 djm Exp $ */
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: auth-options.c,v 1.18 2018/08/26 07:46:36 christos Exp $");
+__RCSID("$NetBSD: auth-options.c,v 1.19 2019/01/27 02:08:33 pgoyette Exp $");
 #include <sys/types.h>
 #include <sys/queue.h>
 

crypto/external/bsd/openssh/dist/auth-passwd.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: auth-passwd.c,v 1.10 2018/08/26 07:46:36 christos Exp $	*/
+/*	$NetBSD: auth-passwd.c,v 1.11 2019/01/27 02:08:33 pgoyette Exp $	*/
 /* $OpenBSD: auth-passwd.c,v 1.47 2018/07/09 21:26:02 markus Exp $ */
 
 /*
@@ -39,7 +39,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: auth-passwd.c,v 1.10 2018/08/26 07:46:36 christos Exp $");
+__RCSID("$NetBSD: auth-passwd.c,v 1.11 2019/01/27 02:08:33 pgoyette Exp $");
 #include <sys/types.h>
 
 #include <login_cap.h>

crypto/external/bsd/openssh/dist/auth-rhosts.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: auth-rhosts.c,v 1.9 2018/08/26 07:46:36 christos Exp $	*/
+/*	$NetBSD: auth-rhosts.c,v 1.10 2019/01/27 02:08:33 pgoyette Exp $	*/
 /* $OpenBSD: auth-rhosts.c,v 1.49 2018/07/09 21:35:50 markus Exp $ */
 
 /*
@@ -17,7 +17,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: auth-rhosts.c,v 1.9 2018/08/26 07:46:36 christos Exp $");
+__RCSID("$NetBSD: auth-rhosts.c,v 1.10 2019/01/27 02:08:33 pgoyette Exp $");
 #include <sys/types.h>
 #include <sys/stat.h>
 

crypto/external/bsd/openssh/dist/auth.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: auth.c,v 1.22 2018/08/26 07:46:36 christos Exp $	*/
+/*	$NetBSD: auth.c,v 1.23 2019/01/27 02:08:33 pgoyette Exp $	*/
 /* $OpenBSD: auth.c,v 1.132 2018/07/11 08:19:35 martijn Exp $ */
 
 /*
@@ -26,7 +26,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: auth.c,v 1.22 2018/08/26 07:46:36 christos Exp $");
+__RCSID("$NetBSD: auth.c,v 1.23 2019/01/27 02:08:33 pgoyette Exp $");
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>

crypto/external/bsd/openssh/dist/auth2-chall.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: auth2-chall.c,v 1.14 2018/08/26 07:46:36 christos Exp $	*/
+/*	$NetBSD: auth2-chall.c,v 1.15 2019/01/27 02:08:33 pgoyette Exp $	*/
 /* $OpenBSD: auth2-chall.c,v 1.50 2018/07/11 18:55:11 markus Exp $ */
 
 /*
@@ -27,7 +27,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: auth2-chall.c,v 1.14 2018/08/26 07:46:36 christos Exp $");
+__RCSID("$NetBSD: auth2-chall.c,v 1.15 2019/01/27 02:08:33 pgoyette Exp $");
 #include <sys/types.h>
 
 #include <stdio.h>

crypto/external/bsd/openssh/dist/auth2-gss.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: auth2-gss.c,v 1.12 2018/08/26 07:46:36 christos Exp $	*/
+/*	$NetBSD: auth2-gss.c,v 1.13 2019/01/27 02:08:33 pgoyette Exp $	*/
 /* $OpenBSD: auth2-gss.c,v 1.29 2018/07/31 03:10:27 djm Exp $ */
 
 /*
@@ -26,7 +26,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: auth2-gss.c,v 1.12 2018/08/26 07:46:36 christos Exp $");
+__RCSID("$NetBSD: auth2-gss.c,v 1.13 2019/01/27 02:08:33 pgoyette Exp $");
 
 #ifdef GSSAPI
 

crypto/external/bsd/openssh/dist/auth2-hostbased.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: auth2-hostbased.c,v 1.14 2018/08/26 07:46:36 christos Exp $	*/
+/*	$NetBSD: auth2-hostbased.c,v 1.15 2019/01/27 02:08:33 pgoyette Exp $	*/
 /* $OpenBSD: auth2-hostbased.c,v 1.36 2018/07/31 03:10:27 djm Exp $ */
 
 /*
@@ -26,7 +26,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: auth2-hostbased.c,v 1.14 2018/08/26 07:46:36 christos Exp $");
+__RCSID("$NetBSD: auth2-hostbased.c,v 1.15 2019/01/27 02:08:33 pgoyette Exp $");
 #include <sys/types.h>
 
 #include <pwd.h>

crypto/external/bsd/openssh/dist/auth2-kbdint.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: auth2-kbdint.c,v 1.9 2018/08/26 07:46:36 christos Exp $	*/
+/*	$NetBSD: auth2-kbdint.c,v 1.10 2019/01/27 02:08:33 pgoyette Exp $	*/
 /* $OpenBSD: auth2-kbdint.c,v 1.9 2018/07/09 21:35:50 markus Exp $ */
 
 /*
@@ -26,7 +26,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: auth2-kbdint.c,v 1.9 2018/08/26 07:46:36 christos Exp $");
+__RCSID("$NetBSD: auth2-kbdint.c,v 1.10 2019/01/27 02:08:33 pgoyette Exp $");
 #include <sys/types.h>
 
 #include "xmalloc.h"

crypto/external/bsd/openssh/dist/auth2-none.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: auth2-none.c,v 1.10 2018/08/26 07:46:36 christos Exp $	*/
+/*	$NetBSD: auth2-none.c,v 1.11 2019/01/27 02:08:33 pgoyette Exp $	*/
 /* $OpenBSD: auth2-none.c,v 1.22 2018/07/09 21:35:50 markus Exp $ */
 
 /*
@@ -26,7 +26,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: auth2-none.c,v 1.10 2018/08/26 07:46:36 christos Exp $");
+__RCSID("$NetBSD: auth2-none.c,v 1.11 2019/01/27 02:08:33 pgoyette Exp $");
 #include <sys/types.h>
 #include <stdarg.h>
 #include <stdio.h>

crypto/external/bsd/openssh/dist/auth2-passwd.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: auth2-passwd.c,v 1.10 2018/08/26 07:46:36 christos Exp $	*/
+/*	$NetBSD: auth2-passwd.c,v 1.11 2019/01/27 02:08:33 pgoyette Exp $	*/
 /* $OpenBSD: auth2-passwd.c,v 1.16 2018/07/09 21:35:50 markus Exp $ */
 
 /*
@@ -26,7 +26,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: auth2-passwd.c,v 1.10 2018/08/26 07:46:36 christos Exp $");
+__RCSID("$NetBSD: auth2-passwd.c,v 1.11 2019/01/27 02:08:33 pgoyette Exp $");
 #include <sys/types.h>
 
 #include <string.h>

crypto/external/bsd/openssh/dist/auth2-pubkey.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: auth2-pubkey.c,v 1.21 2018/08/26 07:46:36 christos Exp $	*/
+/*	$NetBSD: auth2-pubkey.c,v 1.22 2019/01/27 02:08:33 pgoyette Exp $	*/
 /* $OpenBSD: auth2-pubkey.c,v 1.84 2018/08/23 03:01:08 djm Exp $ */
 
 /*
@@ -26,7 +26,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: auth2-pubkey.c,v 1.21 2018/08/26 07:46:36 christos Exp $");
+__RCSID("$NetBSD: auth2-pubkey.c,v 1.22 2019/01/27 02:08:33 pgoyette Exp $");
 #include <sys/types.h>
 #include <sys/stat.h>
 

crypto/external/bsd/openssh/dist/auth2.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: auth2.c,v 1.17 2018/08/26 07:46:36 christos Exp $	*/
+/*	$NetBSD: auth2.c,v 1.18 2019/01/27 02:08:33 pgoyette Exp $	*/
 /* $OpenBSD: auth2.c,v 1.149 2018/07/11 18:53:29 markus Exp $ */
 
 /*
@@ -26,7 +26,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: auth2.c,v 1.17 2018/08/26 07:46:36 christos Exp $");
+__RCSID("$NetBSD: auth2.c,v 1.18 2019/01/27 02:08:33 pgoyette Exp $");
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/uio.h>

crypto/external/bsd/openssh/dist/authfd.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: authfd.c,v 1.16 2018/08/26 07:46:36 christos Exp $	*/
+/*	$NetBSD: authfd.c,v 1.17 2019/01/27 02:08:33 pgoyette Exp $	*/
 /* $OpenBSD: authfd.c,v 1.111 2018/07/09 21:59:10 markus Exp $ */
 
 /*
@@ -38,7 +38,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: authfd.c,v 1.16 2018/08/26 07:46:36 christos Exp $");
+__RCSID("$NetBSD: authfd.c,v 1.17 2019/01/27 02:08:33 pgoyette Exp $");
 #include <sys/types.h>
 #include <sys/un.h>
 #include <sys/socket.h>

crypto/external/bsd/openssh/dist/authfile.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: authfile.c,v 1.19 2018/08/26 07:46:36 christos Exp $	*/
+/*	$NetBSD: authfile.c,v 1.20 2019/01/27 02:08:33 pgoyette Exp $	*/
 /* $OpenBSD: authfile.c,v 1.130 2018/07/09 21:59:10 markus Exp $ */
 
 /*
@@ -26,7 +26,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: authfile.c,v 1.19 2018/08/26 07:46:36 christos Exp $");
+__RCSID("$NetBSD: authfile.c,v 1.20 2019/01/27 02:08:33 pgoyette Exp $");
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/uio.h>

crypto/external/bsd/openssh/dist/bitmap.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: bitmap.c,v 1.7 2018/04/06 18:58:59 christos Exp $	*/
+/*	$NetBSD: bitmap.c,v 1.8 2019/01/27 02:08:33 pgoyette Exp $	*/
 /* $OpenBSD: bitmap.c,v 1.9 2017/10/20 01:56:39 djm Exp $ */
 /*
  * Copyright (c) 2015 Damien Miller <[email protected]>
@@ -16,7 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include "includes.h"
-__RCSID("$NetBSD: bitmap.c,v 1.7 2018/04/06 18:58:59 christos Exp $");
+__RCSID("$NetBSD: bitmap.c,v 1.8 2019/01/27 02:08:33 pgoyette Exp $");
 
 #include <sys/types.h>
 #include <string.h>

crypto/external/bsd/openssh/dist/channels.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: channels.c,v 1.22 2018/08/26 07:46:36 christos Exp $	*/
+/*	$NetBSD: channels.c,v 1.23 2019/01/27 02:08:33 pgoyette Exp $	*/
 /* $OpenBSD: channels.c,v 1.384 2018/07/27 12:03:17 markus Exp $ */
 
 /*
@@ -42,7 +42,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: channels.c,v 1.22 2018/08/26 07:46:36 christos Exp $");
+__RCSID("$NetBSD: channels.c,v 1.23 2019/01/27 02:08:33 pgoyette Exp $");
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>

crypto/external/bsd/openssh/dist/cipher-ctr-mt.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: cipher-ctr-mt.c,v 1.9 2018/04/06 18:59:00 christos Exp $	*/
+/*	$NetBSD: cipher-ctr-mt.c,v 1.10 2019/01/27 02:08:33 pgoyette Exp $	*/
 /*
  * OpenSSH Multi-threaded AES-CTR Cipher
  *
@@ -21,7 +21,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include "includes.h"
-__RCSID("$NetBSD: cipher-ctr-mt.c,v 1.9 2018/04/06 18:59:00 christos Exp $");
+__RCSID("$NetBSD: cipher-ctr-mt.c,v 1.10 2019/01/27 02:08:33 pgoyette Exp $");
 
 #include <sys/types.h>
 

crypto/external/bsd/openssh/dist/cipher.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: cipher.c,v 1.13 2018/04/06 18:59:00 christos Exp $	*/
+/*	$NetBSD: cipher.c,v 1.14 2019/01/27 02:08:33 pgoyette Exp $	*/
 /* $OpenBSD: cipher.c,v 1.111 2018/02/23 15:58:37 markus Exp $ */
 /*
  * Author: Tatu Ylonen <[email protected]>
@@ -37,7 +37,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: cipher.c,v 1.13 2018/04/06 18:59:00 christos Exp $");
+__RCSID("$NetBSD: cipher.c,v 1.14 2019/01/27 02:08:33 pgoyette Exp $");
 #include <sys/types.h>
 
 #include <string.h>

crypto/external/bsd/openssh/dist/cleanup.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: cleanup.c,v 1.7 2018/04/06 18:59:00 christos Exp $	*/
+/*	$NetBSD: cleanup.c,v 1.8 2019/01/27 02:08:33 pgoyette Exp $	*/
 /* $OpenBSD: cleanup.c,v 1.5 2006/08/03 03:34:42 deraadt Exp $ */
 /*
  * Copyright (c) 2003 Markus Friedl <[email protected]>
@@ -16,7 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include "includes.h"
-__RCSID("$NetBSD: cleanup.c,v 1.7 2018/04/06 18:59:00 christos Exp $");
+__RCSID("$NetBSD: cleanup.c,v 1.8 2019/01/27 02:08:33 pgoyette Exp $");
 
 #include <sys/types.h>
 

crypto/external/bsd/openssh/dist/clientloop.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: clientloop.c,v 1.24 2018/08/26 07:46:36 christos Exp $	*/
+/*	$NetBSD: clientloop.c,v 1.25 2019/01/27 02:08:33 pgoyette Exp $	*/
 /* $OpenBSD: clientloop.c,v 1.317 2018/07/11 18:53:29 markus Exp $ */
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: clientloop.c,v 1.24 2018/08/26 07:46:36 christos Exp $");
+__RCSID("$NetBSD: clientloop.c,v 1.25 2019/01/27 02:08:33 pgoyette Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>

crypto/external/bsd/openssh/dist/compat.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: compat.c,v 1.19 2018/08/26 07:46:36 christos Exp $	*/
+/*	$NetBSD: compat.c,v 1.20 2019/01/27 02:08:33 pgoyette Exp $	*/
 /* $OpenBSD: compat.c,v 1.113 2018/08/13 02:41:05 djm Exp $ */
 
 /*
@@ -26,7 +26,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: compat.c,v 1.19 2018/08/26 07:46:36 christos Exp $");
+__RCSID("$NetBSD: compat.c,v 1.20 2019/01/27 02:08:33 pgoyette Exp $");
 #include <sys/types.h>
 
 #include <stdlib.h>

crypto/external/bsd/openssh/dist/dh.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: dh.c,v 1.15 2018/08/26 07:46:36 christos Exp $	*/
+/*	$NetBSD: dh.c,v 1.16 2019/01/27 02:08:33 pgoyette Exp $	*/
 /* $OpenBSD: dh.c,v 1.66 2018/08/04 00:55:06 djm Exp $ */
 
 /*
@@ -26,7 +26,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: dh.c,v 1.15 2018/08/26 07:46:36 christos Exp $");
+__RCSID("$NetBSD: dh.c,v 1.16 2019/01/27 02:08:33 pgoyette Exp $");
 
 #include <sys/param.h>	/* MIN */
 #include <openssl/bn.h>

crypto/external/bsd/openssh/dist/dns.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: dns.c,v 1.16 2018/04/06 18:59:00 christos Exp $	*/
+/*	$NetBSD: dns.c,v 1.17 2019/01/27 02:08:33 pgoyette Exp $	*/
 /* $OpenBSD: dns.c,v 1.38 2018/02/23 15:58:37 markus Exp $ */
 
 /*
@@ -27,7 +27,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: dns.c,v 1.16 2018/04/06 18:59:00 christos Exp $");
+__RCSID("$NetBSD: dns.c,v 1.17 2019/01/27 02:08:33 pgoyette Exp $");
 #include <sys/types.h>
 #include <sys/socket.h>