Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/crypto/external/bsd/openssh/dist/sshbuf.h,v
rcsdiff: /ftp/cvs/cvsroot/src/crypto/external/bsd/openssh/dist/sshbuf.h,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- src/crypto/external/bsd/openssh/dist/sshbuf.h	2018/04/06 18:59:00	1.9
+++ src/crypto/external/bsd/openssh/dist/sshbuf.h	2018/08/26 07:46:37	1.10
@@ -1,5 +1,6 @@
-/*	$NetBSD: sshbuf.h,v 1.9 2018/04/06 18:59:00 christos Exp $	*/
-/*	$OpenBSD: sshbuf.h,v 1.9 2017/09/12 06:32:07 djm Exp $	*/
+/*	$NetBSD: sshbuf.h,v 1.10 2018/08/26 07:46:37 christos Exp $	*/
+/*	$OpenBSD: sshbuf.h,v 1.11 2018/07/09 21:56:06 markus Exp $	*/
+
 /*
  * Copyright (c) 2011 Damien Miller
  *
@@ -25,6 +26,9 @@
 #include <openssl/bn.h>
 #include <openssl/ec.h>
 
+/* move the following to a more appropriate place and name */
+#define BUFFER_MAX_LEN_HPN	0x4000000	/* 64MB */
+
 #define SSHBUF_SIZE_MAX		0x8000000	/* Hard maximum size */
 #define SSHBUF_REFS_MAX		0x100000	/* Max child buffers */
 #define SSHBUF_MAX_BIGNUM	(16384 / 8)	/* Max bignum *bytes* */
@@ -47,15 +51,6 @@ struct sshbuf {
 	struct sshbuf *parent;	/* If child, pointer to parent */
 };
 
-#ifndef SSHBUF_NO_DEPREACTED
-/*
- * NB. Please do not use sshbuf_init() in new code. Please use sshbuf_new()
- * instead. sshbuf_init() is deprectated and will go away soon (it is
- * only included to allow compat with buffer_* in OpenSSH)
- */
-void sshbuf_init(struct sshbuf *buf);
-#endif
-
 /*
  * Create a new sshbuf buffer.
  * Returns pointer to buffer on success, or NULL on allocation failure.