From d4a8b7e34dd619a4debf9a206c81db26d1402ea6 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Wed, 27 Oct 1999 13:42:43 +1000
Subject: Initial revision

---
 buffer.c | 150 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 150 insertions(+)
 create mode 100644 buffer.c

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
new file mode 100644
index 00000000..e183d101
--- /dev/null
+++ b/buffer.c
@@ -0,0 +1,150 @@
+/*
+
+buffer.c
+
+Author: Tatu Ylonen <ylo@cs.hut.fi>
+
+Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
+                   All rights reserved
+
+Created: Sat Mar 18 04:15:33 1995 ylo
+
+Functions for manipulating fifo buffers (that can grow if needed).
+
+*/
+
+#include "includes.h"
+RCSID("$Id: buffer.c,v 1.1 1999/10/27 03:42:43 damien Exp $");
+
+#include "xmalloc.h"
+#include "buffer.h"
+#include "ssh.h"
+
+/* Initializes the buffer structure. */
+
+void buffer_init(Buffer *buffer)
+{
+  buffer->alloc = 4096;
+  buffer->buf = xmalloc(buffer->alloc);
+  buffer->offset = 0;
+  buffer->end = 0;
+}
+
+/* Frees any memory used for the buffer. */
+
+void buffer_free(Buffer *buffer)
+{
+  memset(buffer->buf, 0, buffer->alloc);
+  xfree(buffer->buf);
+}
+
+/* Clears any data from the buffer, making it empty.  This does not actually
+   zero the memory. */
+
+void buffer_clear(Buffer *buffer)
+{
+  buffer->offset = 0;
+  buffer->end = 0;
+}
+
+/* Appends data to the buffer, expanding it if necessary. */
+
+void buffer_append(Buffer *buffer, const char *data, unsigned int len)
+{
+  char *cp;
+  buffer_append_space(buffer, &cp, len);
+  memcpy(cp, data, len);
+}
+
+/* Appends space to the buffer, expanding the buffer if necessary.
+   This does not actually copy the data into the buffer, but instead
+   returns a pointer to the allocated region. */
+
+void buffer_append_space(Buffer *buffer, char **datap, unsigned int len)
+{
+  /* If the buffer is empty, start using it from the beginning. */
+  if (buffer->offset == buffer->end)
+    {
+      buffer->offset = 0;
+      buffer->end = 0;
+    }
+
+ restart:
+  /* If there is enough space to store all data, store it now. */
+  if (buffer->end + len < buffer->alloc)
+    {
+      *datap = buffer->buf + buffer->end;
+      buffer->end += len;
+      return;
+    }
+
+  /* If the buffer is quite empty, but all data is at the end, move the
+     data to the beginning and retry. */
+  if (buffer->offset > buffer->alloc / 2)
+    {
+      memmove(buffer->buf, buffer->buf + buffer->offset,
+	      buffer->end - buffer->offset);
+      buffer->end -= buffer->offset;
+      buffer->offset = 0;
+      goto restart;
+    }
+
+  /* Increase the size of the buffer and retry. */
+  buffer->alloc += len + 32768;
+  buffer->buf = xrealloc(buffer->buf, buffer->alloc);
+  goto restart;
+}
+
+/* Returns the number of bytes of data in the buffer. */
+
+unsigned int buffer_len(Buffer *buffer)
+{
+  return buffer->end - buffer->offset;
+}
+
+/* Gets data from the beginning of the buffer. */
+
+void buffer_get(Buffer *buffer, char *buf, unsigned int len)
+{
+  if (len > buffer->end - buffer->offset)
+    fatal("buffer_get trying to get more bytes than in buffer");
+  memcpy(buf, buffer->buf + buffer->offset, len);
+  buffer->offset += len;
+}
+
+/* Consumes the given number of bytes from the beginning of the buffer. */
+
+void buffer_consume(Buffer *buffer, unsigned int bytes)
+{
+  if (bytes > buffer->end - buffer->offset)
+    fatal("buffer_get trying to get more bytes than in buffer");
+  buffer->offset += bytes;
+}  
+
+/* Consumes the given number of bytes from the end of the buffer. */
+
+void buffer_consume_end(Buffer *buffer, unsigned int bytes)
+{
+  if (bytes > buffer->end - buffer->offset)
+    fatal("buffer_get trying to get more bytes than in buffer");
+  buffer->end -= bytes;
+}  
+
+/* Returns a pointer to the first used byte in the buffer. */
+
+char *buffer_ptr(Buffer *buffer)
+{
+  return buffer->buf + buffer->offset;
+}
+
+/* Dumps the contents of the buffer to stderr. */
+
+void buffer_dump(Buffer *buffer)
+{
+  int i;
+  unsigned char *ucp = (unsigned char *)buffer->buf;
+  
+  for (i = buffer->offset; i < buffer->end; i++)
+    fprintf(stderr, " %02x", ucp[i]);
+  fprintf(stderr, "\n");
+}
-- 
cgit v1.2.3


From 95def09838fc61b37b6ea7cd5c234a465b4b129b Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Thu, 25 Nov 1999 00:26:21 +1100
Subject:  - Merged very large OpenBSD source code reformat  - OpenBSD CVS
 updates    - [channels.c cipher.c compat.c log-client.c scp.c serverloop.c]  
    [ssh.h sshd.8 sshd.c]      syslog changes:      * Unified Logmessage for
 all auth-types, for success and for failed      * Standard connections get
 only ONE line in the LOG when level==LOG:        Auth-attempts are logged
 only, if authentication is:           a) successfull or           b) with
 passwd or           c) we had more than AUTH_FAIL_LOG failues      * many
 log() became verbose()      * old behaviour with level=VERBOSE    -
 [readconf.c readconf.h ssh.1 ssh.h sshconnect.c sshd.c]      tranfer s/key
 challenge/response data in SSH_SMSG_AUTH_TIS_CHALLENGE      messages. allows
 use of s/key in windows (ttssh, securecrt) and      ssh-1.2.27 clients
 without 'ssh -v', ok: niels@    - [sshd.8]      -V, for fallback to openssh
 in SSH2 compatibility mode    - [sshd.c]      fix sigchld race;
 cjc5@po.cwru.edu

---
 buffer.c | 179 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 92 insertions(+), 87 deletions(-)

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
index e183d101..6ad9bb2e 100644
--- a/buffer.c
+++ b/buffer.c
@@ -1,20 +1,20 @@
 /*
-
-buffer.c
-
-Author: Tatu Ylonen <ylo@cs.hut.fi>
-
-Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
-                   All rights reserved
-
-Created: Sat Mar 18 04:15:33 1995 ylo
-
-Functions for manipulating fifo buffers (that can grow if needed).
-
-*/
+ * 
+ * buffer.c
+ * 
+ * Author: Tatu Ylonen <ylo@cs.hut.fi>
+ * 
+ * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
+ *                    All rights reserved
+ * 
+ * Created: Sat Mar 18 04:15:33 1995 ylo
+ * 
+ * Functions for manipulating fifo buffers (that can grow if needed).
+ * 
+ */
 
 #include "includes.h"
-RCSID("$Id: buffer.c,v 1.1 1999/10/27 03:42:43 damien Exp $");
+RCSID("$Id: buffer.c,v 1.2 1999/11/24 13:26:22 damien Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
@@ -22,129 +22,134 @@ RCSID("$Id: buffer.c,v 1.1 1999/10/27 03:42:43 damien Exp $");
 
 /* Initializes the buffer structure. */
 
-void buffer_init(Buffer *buffer)
+void 
+buffer_init(Buffer *buffer)
 {
-  buffer->alloc = 4096;
-  buffer->buf = xmalloc(buffer->alloc);
-  buffer->offset = 0;
-  buffer->end = 0;
+	buffer->alloc = 4096;
+	buffer->buf = xmalloc(buffer->alloc);
+	buffer->offset = 0;
+	buffer->end = 0;
 }
 
 /* Frees any memory used for the buffer. */
 
-void buffer_free(Buffer *buffer)
+void 
+buffer_free(Buffer *buffer)
 {
-  memset(buffer->buf, 0, buffer->alloc);
-  xfree(buffer->buf);
+	memset(buffer->buf, 0, buffer->alloc);
+	xfree(buffer->buf);
 }
 
 /* Clears any data from the buffer, making it empty.  This does not actually
    zero the memory. */
 
-void buffer_clear(Buffer *buffer)
+void 
+buffer_clear(Buffer *buffer)
 {
-  buffer->offset = 0;
-  buffer->end = 0;
+	buffer->offset = 0;
+	buffer->end = 0;
 }
 
 /* Appends data to the buffer, expanding it if necessary. */
 
-void buffer_append(Buffer *buffer, const char *data, unsigned int len)
+void 
+buffer_append(Buffer *buffer, const char *data, unsigned int len)
 {
-  char *cp;
-  buffer_append_space(buffer, &cp, len);
-  memcpy(cp, data, len);
+	char *cp;
+	buffer_append_space(buffer, &cp, len);
+	memcpy(cp, data, len);
 }
 
 /* Appends space to the buffer, expanding the buffer if necessary.
    This does not actually copy the data into the buffer, but instead
    returns a pointer to the allocated region. */
 
-void buffer_append_space(Buffer *buffer, char **datap, unsigned int len)
+void 
+buffer_append_space(Buffer *buffer, char **datap, unsigned int len)
 {
-  /* If the buffer is empty, start using it from the beginning. */
-  if (buffer->offset == buffer->end)
-    {
-      buffer->offset = 0;
-      buffer->end = 0;
-    }
-
- restart:
-  /* If there is enough space to store all data, store it now. */
-  if (buffer->end + len < buffer->alloc)
-    {
-      *datap = buffer->buf + buffer->end;
-      buffer->end += len;
-      return;
-    }
-
-  /* If the buffer is quite empty, but all data is at the end, move the
-     data to the beginning and retry. */
-  if (buffer->offset > buffer->alloc / 2)
-    {
-      memmove(buffer->buf, buffer->buf + buffer->offset,
-	      buffer->end - buffer->offset);
-      buffer->end -= buffer->offset;
-      buffer->offset = 0;
-      goto restart;
-    }
-
-  /* Increase the size of the buffer and retry. */
-  buffer->alloc += len + 32768;
-  buffer->buf = xrealloc(buffer->buf, buffer->alloc);
-  goto restart;
+	/* If the buffer is empty, start using it from the beginning. */
+	if (buffer->offset == buffer->end) {
+		buffer->offset = 0;
+		buffer->end = 0;
+	}
+restart:
+	/* If there is enough space to store all data, store it now. */
+	if (buffer->end + len < buffer->alloc) {
+		*datap = buffer->buf + buffer->end;
+		buffer->end += len;
+		return;
+	}
+	/* If the buffer is quite empty, but all data is at the end, move
+	   the data to the beginning and retry. */
+	if (buffer->offset > buffer->alloc / 2) {
+		memmove(buffer->buf, buffer->buf + buffer->offset,
+			buffer->end - buffer->offset);
+		buffer->end -= buffer->offset;
+		buffer->offset = 0;
+		goto restart;
+	}
+	/* Increase the size of the buffer and retry. */
+	buffer->alloc += len + 32768;
+	buffer->buf = xrealloc(buffer->buf, buffer->alloc);
+	goto restart;
 }
 
 /* Returns the number of bytes of data in the buffer. */
 
-unsigned int buffer_len(Buffer *buffer)
+unsigned int 
+buffer_len(Buffer *buffer)
 {
-  return buffer->end - buffer->offset;
+	return buffer->end - buffer->offset;
 }
 
 /* Gets data from the beginning of the buffer. */
 
-void buffer_get(Buffer *buffer, char *buf, unsigned int len)
+void 
+buffer_get(Buffer *buffer, char *buf, unsigned int len)
 {
-  if (len > buffer->end - buffer->offset)
-    fatal("buffer_get trying to get more bytes than in buffer");
-  memcpy(buf, buffer->buf + buffer->offset, len);
-  buffer->offset += len;
+	if (len > buffer->end - buffer->offset)
+		fatal("buffer_get trying to get more bytes than in buffer");
+	memcpy(buf, buffer->buf + buffer->offset, len);
+	buffer->offset += len;
 }
 
 /* Consumes the given number of bytes from the beginning of the buffer. */
 
-void buffer_consume(Buffer *buffer, unsigned int bytes)
+void 
+buffer_consume(Buffer *buffer, unsigned int bytes)
 {
-  if (bytes > buffer->end - buffer->offset)
-    fatal("buffer_get trying to get more bytes than in buffer");
-  buffer->offset += bytes;
-}  
+	if (bytes > buffer->end - buffer->offset)
+		fatal("buffer_get trying to get more bytes than in buffer");
+	buffer->offset += bytes;
+}
 
 /* Consumes the given number of bytes from the end of the buffer. */
 
-void buffer_consume_end(Buffer *buffer, unsigned int bytes)
+void 
+buffer_consume_end(Buffer *buffer, unsigned int bytes)
 {
-  if (bytes > buffer->end - buffer->offset)
-    fatal("buffer_get trying to get more bytes than in buffer");
-  buffer->end -= bytes;
-}  
+	if (bytes > buffer->end - buffer->offset)
+		fatal("buffer_get trying to get more bytes than in buffer");
+	buffer->end -= bytes;
+}
 
 /* Returns a pointer to the first used byte in the buffer. */
 
-char *buffer_ptr(Buffer *buffer)
+char *
+buffer_ptr(Buffer *buffer)
 {
-  return buffer->buf + buffer->offset;
+	return buffer->buf + buffer->offset;
 }
 
 /* Dumps the contents of the buffer to stderr. */
 
-void buffer_dump(Buffer *buffer)
+void 
+buffer_dump(Buffer *buffer)
 {
-  int i;
-  unsigned char *ucp = (unsigned char *)buffer->buf;
-  
-  for (i = buffer->offset; i < buffer->end; i++)
-    fprintf(stderr, " %02x", ucp[i]);
-  fprintf(stderr, "\n");
+	int i;
+	unsigned char *ucp = (unsigned char *) buffer->buf;
+
+	for (i = buffer->offset; i < buffer->end; i++)
+		fprintf(stderr, " %02x", ucp[i]);
+	fprintf(stderr, "\n");
 }
-- 
cgit v1.2.3


From 5428f646ad32da88ddd04a8c287d595524674fbf Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Thu, 25 Nov 1999 11:54:57 +1100
Subject:  - More reformatting merged from OpenBSD CVS  - Merged OpenBSD CVS
 changes:    - [channels.c]      report from mrwizard@psu.edu via
 djm@ibs.com.au    - [channels.c]      set SO_REUSEADDR and SO_LINGER for
 forwarded ports.      chip@valinux.com via damien@ibs.com.au    - [nchan.c]  
    it's not an error() if shutdown_write failes in nchan.    - [readconf.c]  
    remove dead #ifdef-0-code    - [readconf.c servconf.c]      strcasecmp
 instead of tolower    - [scp.c]      progress meter overflow fix from
 damien@ibs.com.au    - [ssh-add.1 ssh-add.c]      SSH_ASKPASS support    -
 [ssh.1 ssh.c]      postpone fork_after_authentication until command
 execution,      request/patch from jahakala@cc.jyu.fi via damien@ibs.com.au  
    plus: use daemon() for backgrounding

---
 buffer.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
index 6ad9bb2e..b4c166d0 100644
--- a/buffer.c
+++ b/buffer.c
@@ -14,7 +14,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: buffer.c,v 1.2 1999/11/24 13:26:22 damien Exp $");
+RCSID("$Id: buffer.c,v 1.3 1999/11/25 00:54:58 damien Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
@@ -40,8 +40,10 @@ buffer_free(Buffer *buffer)
 	xfree(buffer->buf);
 }
 
-/* Clears any data from the buffer, making it empty.  This does not actually
-   zero the memory. */
+/*
+ * Clears any data from the buffer, making it empty.  This does not actually
+ * zero the memory.
+ */
 
 void 
 buffer_clear(Buffer *buffer)
@@ -60,9 +62,11 @@ buffer_append(Buffer *buffer, const char *data, unsigned int len)
 	memcpy(cp, data, len);
 }
 
-/* Appends space to the buffer, expanding the buffer if necessary.
-   This does not actually copy the data into the buffer, but instead
-   returns a pointer to the allocated region. */
+/*
+ * Appends space to the buffer, expanding the buffer if necessary. This does
+ * not actually copy the data into the buffer, but instead returns a pointer
+ * to the allocated region.
+ */
 
 void 
 buffer_append_space(Buffer *buffer, char **datap, unsigned int len)
@@ -79,8 +83,10 @@ restart:
 		buffer->end += len;
 		return;
 	}
-	/* If the buffer is quite empty, but all data is at the end, move
-	   the data to the beginning and retry. */
+	/*
+	 * If the buffer is quite empty, but all data is at the end, move the
+	 * data to the beginning and retry.
+	 */
 	if (buffer->offset > buffer->alloc / 2) {
 		memmove(buffer->buf, buffer->buf + buffer->offset,
 			buffer->end - buffer->offset);
-- 
cgit v1.2.3


From 22c772609aa0e97fb39a6ec609c2f16445644055 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Thu, 13 Apr 2000 12:26:34 +1000
Subject:  - Merged OpenBSD updates to include paths.

---
 buffer.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
index b4c166d0..48ae96a4 100644
--- a/buffer.c
+++ b/buffer.c
@@ -14,7 +14,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: buffer.c,v 1.3 1999/11/25 00:54:58 damien Exp $");
+RCSID("$Id: buffer.c,v 1.4 2000/04/13 02:26:36 damien Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
@@ -114,7 +114,7 @@ void
 buffer_get(Buffer *buffer, char *buf, unsigned int len)
 {
 	if (len > buffer->end - buffer->offset)
-		fatal("buffer_get trying to get more bytes than in buffer");
+		fatal("buffer_get: trying to get more bytes than in buffer");
 	memcpy(buf, buffer->buf + buffer->offset, len);
 	buffer->offset += len;
 }
@@ -125,7 +125,7 @@ void
 buffer_consume(Buffer *buffer, unsigned int bytes)
 {
 	if (bytes > buffer->end - buffer->offset)
-		fatal("buffer_get trying to get more bytes than in buffer");
+		fatal("buffer_consume: trying to get more bytes than in buffer");
 	buffer->offset += bytes;
 }
 
@@ -135,7 +135,7 @@ void
 buffer_consume_end(Buffer *buffer, unsigned int bytes)
 {
 	if (bytes > buffer->end - buffer->offset)
-		fatal("buffer_get trying to get more bytes than in buffer");
+		fatal("buffer_consume_end: trying to get more bytes than in buffer");
 	buffer->end -= bytes;
 }
 
-- 
cgit v1.2.3


From 4af51306d9a51459a5bef922df1037f876ae51fe Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Sun, 16 Apr 2000 11:18:38 +1000
Subject:  - OpenBSD CVS updates.    [ssh.1 ssh.c]    - ssh -2    [auth.c
 channels.c clientloop.c packet.c packet.h serverloop.c]    [session.c
 sshconnect.c]    - check payload for (illegal) extra data    [ALL]    -
 whitespace cleanup

---
 buffer.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
index 48ae96a4..83a63e6f 100644
--- a/buffer.c
+++ b/buffer.c
@@ -1,20 +1,20 @@
 /*
- * 
+ *
  * buffer.c
- * 
+ *
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
- * 
+ *
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
- * 
+ *
  * Created: Sat Mar 18 04:15:33 1995 ylo
- * 
+ *
  * Functions for manipulating fifo buffers (that can grow if needed).
- * 
+ *
  */
 
 #include "includes.h"
-RCSID("$Id: buffer.c,v 1.4 2000/04/13 02:26:36 damien Exp $");
+RCSID("$Id: buffer.c,v 1.5 2000/04/16 01:18:40 damien Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
@@ -22,7 +22,7 @@ RCSID("$Id: buffer.c,v 1.4 2000/04/13 02:26:36 damien Exp $");
 
 /* Initializes the buffer structure. */
 
-void 
+void
 buffer_init(Buffer *buffer)
 {
 	buffer->alloc = 4096;
@@ -33,7 +33,7 @@ buffer_init(Buffer *buffer)
 
 /* Frees any memory used for the buffer. */
 
-void 
+void
 buffer_free(Buffer *buffer)
 {
 	memset(buffer->buf, 0, buffer->alloc);
@@ -45,7 +45,7 @@ buffer_free(Buffer *buffer)
  * zero the memory.
  */
 
-void 
+void
 buffer_clear(Buffer *buffer)
 {
 	buffer->offset = 0;
@@ -54,7 +54,7 @@ buffer_clear(Buffer *buffer)
 
 /* Appends data to the buffer, expanding it if necessary. */
 
-void 
+void
 buffer_append(Buffer *buffer, const char *data, unsigned int len)
 {
 	char *cp;
@@ -68,7 +68,7 @@ buffer_append(Buffer *buffer, const char *data, unsigned int len)
  * to the allocated region.
  */
 
-void 
+void
 buffer_append_space(Buffer *buffer, char **datap, unsigned int len)
 {
 	/* If the buffer is empty, start using it from the beginning. */
@@ -102,7 +102,7 @@ restart:
 
 /* Returns the number of bytes of data in the buffer. */
 
-unsigned int 
+unsigned int
 buffer_len(Buffer *buffer)
 {
 	return buffer->end - buffer->offset;
@@ -110,7 +110,7 @@ buffer_len(Buffer *buffer)
 
 /* Gets data from the beginning of the buffer. */
 
-void 
+void
 buffer_get(Buffer *buffer, char *buf, unsigned int len)
 {
 	if (len > buffer->end - buffer->offset)
@@ -121,7 +121,7 @@ buffer_get(Buffer *buffer, char *buf, unsigned int len)
 
 /* Consumes the given number of bytes from the beginning of the buffer. */
 
-void 
+void
 buffer_consume(Buffer *buffer, unsigned int bytes)
 {
 	if (bytes > buffer->end - buffer->offset)
@@ -131,7 +131,7 @@ buffer_consume(Buffer *buffer, unsigned int bytes)
 
 /* Consumes the given number of bytes from the end of the buffer. */
 
-void 
+void
 buffer_consume_end(Buffer *buffer, unsigned int bytes)
 {
 	if (bytes > buffer->end - buffer->offset)
@@ -149,7 +149,7 @@ buffer_ptr(Buffer *buffer)
 
 /* Dumps the contents of the buffer to stderr. */
 
-void 
+void
 buffer_dump(Buffer *buffer)
 {
 	int i;
-- 
cgit v1.2.3


From 6536c7d3c9d0e794c5c85d4f1746b958d7e04343 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Thu, 22 Jun 2000 21:32:31 +1000
Subject:  - OpenBSD CVS Updates:    - markus@cvs.openbsd.org  2000/06/18
 18:50:11      [auth2.c compat.c compat.h sshconnect2.c]      make
 userauth+pubkey interop with ssh.com-2.2.0    - markus@cvs.openbsd.org 
 2000/06/18 20:56:17      [dsa.c]      mem leak + be more paranoid in
 dsa_verify.    - markus@cvs.openbsd.org  2000/06/18 21:29:50      [key.c]    
  cleanup fingerprinting, less hardcoded sizes    - markus@cvs.openbsd.org 
 2000/06/19 19:39:45      [atomicio.c auth-options.c auth-passwd.c
 auth-rh-rsa.c auth-rhosts.c]      [auth-rsa.c auth-skey.c authfd.c authfd.h
 authfile.c bufaux.c bufaux.h]      [buffer.c buffer.h canohost.c channels.c
 channels.h cipher.c cipher.h]      [clientloop.c compat.c compat.h compress.c
 compress.h crc32.c crc32.h]      [deattack.c dispatch.c dsa.c fingerprint.c
 fingerprint.h getput.h hmac.c]      [kex.c log-client.c log-server.c login.c
 match.c mpaux.c mpaux.h nchan.c]      [nchan.h packet.c packet.h pty.c pty.h
 readconf.c readconf.h readpass.c]      [rsa.c rsa.h scp.c servconf.c
 servconf.h ssh-add.c ssh-keygen.c ssh.c]      [ssh.h tildexpand.c ttymodes.c
 ttymodes.h uidswap.c xmalloc.c xmalloc.h]      OpenBSD tag    -
 markus@cvs.openbsd.org  2000/06/21 10:46:10      sshconnect2.c missing free;
 nuke old comment

---
 buffer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
index 83a63e6f..db5ae0a2 100644
--- a/buffer.c
+++ b/buffer.c
@@ -14,7 +14,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: buffer.c,v 1.5 2000/04/16 01:18:40 damien Exp $");
+RCSID("$OpenBSD: buffer.c,v 1.7 2000/06/20 01:39:39 markus Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
-- 
cgit v1.2.3


From e4340be5b3ff16f4d9ba5e3ea7e449dc1b6fa7a8 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Sat, 16 Sep 2000 13:29:08 +1100
Subject:  - (djm) Merge OpenBSD changes:    - markus@cvs.openbsd.org 
 2000/09/05 02:59:57      [session.c]      print hostname (not hushlogin)    -
 markus@cvs.openbsd.org  2000/09/05 13:18:48      [authfile.c ssh-add.c]     
 enable ssh-add -d for DSA keys    - markus@cvs.openbsd.org  2000/09/05
 13:20:49      [sftp-server.c]      cleanup    - markus@cvs.openbsd.org 
 2000/09/06 03:46:41      [authfile.h]      prototype    -
 deraadt@cvs.openbsd.org 2000/09/07 14:27:56      [ALL]      cleanup copyright
 notices on all files.  I have attempted to be      accurate with the details.
  everything is now under Tatu's licence      (which I copied from his
 readme), and/or the core-sdi bsd-ish thing      for deattack, or various
 openbsd developers under a 2-term bsd      licence.  We're not changing any
 rules, just being accurate.    - markus@cvs.openbsd.org  2000/09/07 14:40:30 
     [channels.c channels.h clientloop.c serverloop.c ssh.c]      cleanup
 window and packet sizes for ssh2 flow control; ok niels    -
 markus@cvs.openbsd.org  2000/09/07 14:53:00      [scp.c]      typo    -
 markus@cvs.openbsd.org  2000/09/07 15:13:37      [auth-options.c
 auth-options.h auth-rh-rsa.c auth-rsa.c auth.c]      [authfile.h canohost.c
 channels.h compat.c hostfile.h log.c match.h]      [pty.c readconf.c]     
 some more Copyright fixes    - markus@cvs.openbsd.org  2000/09/08 03:02:51   
   [README.openssh2]      bye bye    - deraadt@cvs.openbsd.org 2000/09/11
 18:38:33      [LICENCE cipher.c]      a few more comments about it being ARC4
 not RC4    - markus@cvs.openbsd.org  2000/09/12 14:53:11      [log-client.c
 log-server.c log.c ssh.1 ssh.c ssh.h sshd.8 sshd.c]      multiple debug
 levels    - markus@cvs.openbsd.org  2000/09/14 14:25:15      [clientloop.c]  
    typo    - deraadt@cvs.openbsd.org 2000/09/15 01:13:51      [ssh-agent.c]  
    check return value for setenv(3) for failure, and deal appropriately

---
 buffer.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
index db5ae0a2..d993c8bc 100644
--- a/buffer.c
+++ b/buffer.c
@@ -1,20 +1,18 @@
 /*
- *
- * buffer.c
- *
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
- *
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
- *
- * Created: Sat Mar 18 04:15:33 1995 ylo
- *
  * Functions for manipulating fifo buffers (that can grow if needed).
  *
+ * As far as I am concerned, the code I have written for this software
+ * can be used freely for any purpose.  Any derived versions of this
+ * software must be clearly marked as such, and if the derived work is
+ * incompatible with the protocol description in the RFC file, it must be
+ * called by a name other than "ssh" or "Secure Shell".
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: buffer.c,v 1.7 2000/06/20 01:39:39 markus Exp $");
+RCSID("$OpenBSD: buffer.c,v 1.8 2000/09/07 20:27:50 deraadt Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
-- 
cgit v1.2.3


From 46c162204b5a6f7471525c2f75cb2c607c88b83f Mon Sep 17 00:00:00 2001
From: Ben Lindstrom <mouring@eviladmin.org>
Date: Fri, 22 Dec 2000 01:43:59 +0000
Subject: One way to massive patch.  <sigh>  It compiles and works under
 Linux.. And I think I have all the bits right from the OpenBSD tree. 20001222
  - Updated RCSID for pty.c  - (bal) OpenBSD CVS Updates:   -
 markus@cvs.openbsd.org 2000/12/21 15:10:16     [auth-rh-rsa.c hostfile.c
 hostfile.h sshconnect.c]     print keyfile:line for changed hostkeys, for
 deraadt@, ok deraadt@   - markus@cvs.openbsd.org 2000/12/20 19:26:56    
 [authfile.c]     allow ssh -i userkey for root   - markus@cvs.openbsd.org
 2000/12/20 19:37:21     [authfd.c authfd.h kex.c sshconnect2.c sshd.c
 uidswap.c uidswap.h]     fix prototypes; from stevesk@pobox.com   -
 markus@cvs.openbsd.org 2000/12/20 19:32:08     [sshd.c]     init pointer to
 NULL; report from Jan.Ivan@cern.ch   - markus@cvs.openbsd.org 2000/12/19
 23:17:54     [auth-krb4.c auth-options.c auth-options.h auth-rhosts.c
 auth-rsa.c      auth1.c auth2-skey.c auth2.c authfd.c authfd.h authfile.c
 bufaux.c      bufaux.h buffer.c canohost.c channels.c clientloop.c compress.c
      crc32.c deattack.c getput.h hmac.c hmac.h hostfile.c kex.c kex.h     
 key.c key.h log.c login.c match.c match.h mpaux.c mpaux.h packet.c     
 packet.h radix.c readconf.c rsa.c scp.c servconf.c servconf.h     
 serverloop.c session.c sftp-server.c ssh-agent.c ssh-dss.c ssh-dss.h     
 ssh-keygen.c ssh-keyscan.c ssh-rsa.c ssh-rsa.h ssh.c ssh.h  uuencode.c     
 uuencode.h sshconnect1.c sshconnect2.c sshd.c tildexpand.c]     replace
 'unsigned bla' with 'u_bla' everywhere. also replace 'char     unsigned' with
 u_char.

---
 buffer.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
index d993c8bc..668c1738 100644
--- a/buffer.c
+++ b/buffer.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: buffer.c,v 1.8 2000/09/07 20:27:50 deraadt Exp $");
+RCSID("$OpenBSD: buffer.c,v 1.9 2000/12/19 23:17:55 markus Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
@@ -53,7 +53,7 @@ buffer_clear(Buffer *buffer)
 /* Appends data to the buffer, expanding it if necessary. */
 
 void
-buffer_append(Buffer *buffer, const char *data, unsigned int len)
+buffer_append(Buffer *buffer, const char *data, u_int len)
 {
 	char *cp;
 	buffer_append_space(buffer, &cp, len);
@@ -67,7 +67,7 @@ buffer_append(Buffer *buffer, const char *data, unsigned int len)
  */
 
 void
-buffer_append_space(Buffer *buffer, char **datap, unsigned int len)
+buffer_append_space(Buffer *buffer, char **datap, u_int len)
 {
 	/* If the buffer is empty, start using it from the beginning. */
 	if (buffer->offset == buffer->end) {
@@ -100,7 +100,7 @@ restart:
 
 /* Returns the number of bytes of data in the buffer. */
 
-unsigned int
+u_int
 buffer_len(Buffer *buffer)
 {
 	return buffer->end - buffer->offset;
@@ -109,7 +109,7 @@ buffer_len(Buffer *buffer)
 /* Gets data from the beginning of the buffer. */
 
 void
-buffer_get(Buffer *buffer, char *buf, unsigned int len)
+buffer_get(Buffer *buffer, char *buf, u_int len)
 {
 	if (len > buffer->end - buffer->offset)
 		fatal("buffer_get: trying to get more bytes than in buffer");
@@ -120,7 +120,7 @@ buffer_get(Buffer *buffer, char *buf, unsigned int len)
 /* Consumes the given number of bytes from the beginning of the buffer. */
 
 void
-buffer_consume(Buffer *buffer, unsigned int bytes)
+buffer_consume(Buffer *buffer, u_int bytes)
 {
 	if (bytes > buffer->end - buffer->offset)
 		fatal("buffer_consume: trying to get more bytes than in buffer");
@@ -130,7 +130,7 @@ buffer_consume(Buffer *buffer, unsigned int bytes)
 /* Consumes the given number of bytes from the end of the buffer. */
 
 void
-buffer_consume_end(Buffer *buffer, unsigned int bytes)
+buffer_consume_end(Buffer *buffer, u_int bytes)
 {
 	if (bytes > buffer->end - buffer->offset)
 		fatal("buffer_consume_end: trying to get more bytes than in buffer");
@@ -151,7 +151,7 @@ void
 buffer_dump(Buffer *buffer)
 {
 	int i;
-	unsigned char *ucp = (unsigned char *) buffer->buf;
+	u_char *ucp = (u_char *) buffer->buf;
 
 	for (i = buffer->offset; i < buffer->end; i++)
 		fprintf(stderr, " %02x", ucp[i]);
-- 
cgit v1.2.3


From 226cfa03781466907dd252916aeade6879e376b8 Mon Sep 17 00:00:00 2001
From: Ben Lindstrom <mouring@eviladmin.org>
Date: Mon, 22 Jan 2001 05:34:40 +0000
Subject: Hopefully things did not get mixed around too much.  It compiles
 under Linux and works.  So that is at least a good sign. =) 20010122  - (bal)
 OpenBSD Resync    - markus@cvs.openbsd.org 2001/01/19 12:45:26 GMT 2001 by
 markus      [servconf.c ssh.h sshd.c]      only auth-chall.c needs #ifdef
 SKEY    - markus@cvs.openbsd.org 2001/01/19 15:55:10 GMT 2001 by markus     
 [auth-krb4.c auth-options.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c      
 auth1.c auth2.c channels.c clientloop.c dh.c dispatch.c nchan.c      
 packet.c pathname.h readconf.c scp.c servconf.c serverloop.c       session.c
 ssh-add.c ssh-keygen.c ssh-keyscan.c ssh.c ssh.h       ssh1.h sshconnect1.c
 sshd.c ttymodes.c]      move ssh1 definitions to ssh1.h, pathnames to
 pathnames.h    - markus@cvs.openbsd.org 2001/01/19 16:48:14      [sshd.8]    
  fix typo; from stevesk@    - markus@cvs.openbsd.org 2001/01/19 16:50:58     
 [ssh-dss.c]      clear and free digest, make consistent with other code (use
 dlen); from      stevesk@    - markus@cvs.openbsd.org 2001/01/20 15:55:20 GMT
 2001 by markus      [auth-options.c auth-options.h auth-rsa.c auth2.c]     
 pass the filename to auth_parse_options()    - markus@cvs.openbsd.org
 2001/01/20 17:59:40 GMT 2001      [readconf.c]      fix SIGSEGV from -o "";
 problem noted by jehsom@togetherweb.com    - stevesk@cvs.openbsd.org
 2001/01/20 18:20:29      [sshconnect2.c]      dh_new_group() does not return
 NULL.  ok markus@    - markus@cvs.openbsd.org 2001/01/20 21:33:42     
 [ssh-add.c]      do not loop forever if askpass does not exist; from     
 andrew@pimlott.ne.mediaone.net    - djm@cvs.openbsd.org 2001/01/20 23:00:56  
    [servconf.c]      Check for NULL return from strdelim; ok markus    -
 djm@cvs.openbsd.org 2001/01/20 23:02:07      [readconf.c]      KNF; ok markus
    - jakob@cvs.openbsd.org 2001/01/21 9:00:33      [ssh-keygen.1]      remove
 -R flag; ok markus@    - markus@cvs.openbsd.org 2001/01/21 19:05:40     
 [atomicio.c automicio.h auth-chall.c auth-krb4.c auth-options.c      
 auth-options.h auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c      
 auth.c auth.h auth1.c auth2-chall.c auth2.c authfd.c authfile.c      
 bufaux.c  bufaux.h buffer.c canahost.c canahost.h channels.c       cipher.c
 cli.c clientloop.c clientloop.h compat.c compress.c       deattack.c dh.c
 dispatch.c groupaccess.c hmac.c hostfile.c kex.c       key.c key.h
 log-client.c log-server.c log.c log.h login.c login.h       match.c misc.c
 misc.h nchan.c packet.c pty.c radix.h readconf.c       readpass.c readpass.h
 rsa.c scp.c servconf.c serverloop.c serverloop.h       session.c
 sftp-server.c ssh-add.c ssh-agent.c ssh-dss.c ssh-keygen.c      
 ssh-keyscan.c ssh-rsa.c ssh.c ssh.h sshconnect.c sshconnect.h      
 sshconnect1.c sshconnect2.c sshd.c tildexpand.c tildexpand.h      
 ttysmodes.c uidswap.c xmalloc.c]      split ssh.h and try to cleanup the
 #include mess. remove unnecessary      #includes.  rename util.[ch] ->
 misc.[ch]  - (bal) renamed 'PIDDIR' to '_PATH_SSH_PIDDIR' to match OpenBSD
 tree  - (bal) Moved #ifdef KRB4 in auth-krb4.c above the #include to resolve 
   conflict when compiling for non-kerb install  - (bal) removed the #ifdef
 SKEY in auth1.c to match Markus' changes    on 1/19.

---
 buffer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
index 668c1738..0a8a4aa3 100644
--- a/buffer.c
+++ b/buffer.c
@@ -12,11 +12,11 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: buffer.c,v 1.9 2000/12/19 23:17:55 markus Exp $");
+RCSID("$OpenBSD: buffer.c,v 1.10 2001/01/21 19:05:45 markus Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
-#include "ssh.h"
+#include "log.h"
 
 /* Initializes the buffer structure. */
 
-- 
cgit v1.2.3


From d7dd23ffed2b54d5443ef9c0d09324a56894c739 Mon Sep 17 00:00:00 2001
From: Ben Lindstrom <mouring@eviladmin.org>
Date: Thu, 5 Apr 2001 23:36:01 +0000
Subject:    - markus@cvs.openbsd.org 2001/04/05 21:02:46      [buffer.c]     
 better error message

---
 buffer.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
index 0a8a4aa3..68696fd3 100644
--- a/buffer.c
+++ b/buffer.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: buffer.c,v 1.10 2001/01/21 19:05:45 markus Exp $");
+RCSID("$OpenBSD: buffer.c,v 1.11 2001/04/05 21:02:46 markus Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
@@ -112,7 +112,8 @@ void
 buffer_get(Buffer *buffer, char *buf, u_int len)
 {
 	if (len > buffer->end - buffer->offset)
-		fatal("buffer_get: trying to get more bytes than in buffer");
+		fatal("buffer_get: trying to get more bytes %d than in buffer %d",
+		    len, buffer->end - buffer->offset);
 	memcpy(buf, buffer->buf + buffer->offset, len);
 	buffer->offset += len;
 }
-- 
cgit v1.2.3


From 3bb4f9da7382e62dc08eb72ba8307c28d4ccc566 Mon Sep 17 00:00:00 2001
From: Ben Lindstrom <mouring@eviladmin.org>
Date: Sun, 8 Apr 2001 18:30:26 +0000
Subject:    - markus@cvs.openbsd.org 2001/04/07 08:55:18      [buffer.c
 channels.c channels.h readconf.c ssh.c]      allow the ssh client act as a
 SOCKS4 proxy (dynamic local      portforwarding).  work by Dan Kaminsky
 <dankamin@cisco.com> and me.      thanks to Dan for this great patch: use
 'ssh -D 1080 host' and make      netscape use localhost:1080 as a socks
 proxy.

---
 buffer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
index 68696fd3..377d0c09 100644
--- a/buffer.c
+++ b/buffer.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: buffer.c,v 1.11 2001/04/05 21:02:46 markus Exp $");
+RCSID("$OpenBSD: buffer.c,v 1.12 2001/04/07 08:55:15 markus Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
@@ -156,5 +156,5 @@ buffer_dump(Buffer *buffer)
 
 	for (i = buffer->offset; i < buffer->end; i++)
 		fprintf(stderr, " %02x", ucp[i]);
-	fprintf(stderr, "\n");
+	fprintf(stderr, "\r\n");
 }
-- 
cgit v1.2.3


From 5eabda303aa26c77e4c383230db9ce9d9175e580 Mon Sep 17 00:00:00 2001
From: Ben Lindstrom <mouring@eviladmin.org>
Date: Thu, 12 Apr 2001 23:34:34 +0000
Subject:    - markus@cvs.openbsd.org 2001/04/12 19:15:26      [auth-rhosts.c
 auth.h auth2.c buffer.c canohost.c canohost.h       compat.c compat.h
 hostfile.c pathnames.h readconf.c readconf.h       servconf.c servconf.h
 ssh.c sshconnect.c sshconnect.h sshconnect1.c       sshconnect2.c
 sshd_config]      implement HostbasedAuthentication (= RhostRSAAuthentication
 for ssh v2)      similar to RhostRSAAuthentication unless you enable (the
 experimental)      HostbasedUsesNameFromPacketOnly option.  please test. :)

---
 buffer.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
index 377d0c09..044caafb 100644
--- a/buffer.c
+++ b/buffer.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: buffer.c,v 1.12 2001/04/07 08:55:15 markus Exp $");
+RCSID("$OpenBSD: buffer.c,v 1.13 2001/04/12 19:15:24 markus Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
@@ -154,7 +154,12 @@ buffer_dump(Buffer *buffer)
 	int i;
 	u_char *ucp = (u_char *) buffer->buf;
 
-	for (i = buffer->offset; i < buffer->end; i++)
-		fprintf(stderr, " %02x", ucp[i]);
+	for (i = buffer->offset; i < buffer->end; i++) {
+		fprintf(stderr, "%02x", ucp[i]);
+		if ((i-buffer->offset)%16==15)
+			fprintf(stderr, "\r\n");
+		else if ((i-buffer->offset)%2==1)
+			fprintf(stderr, " ");
+	}
 	fprintf(stderr, "\r\n");
 }
-- 
cgit v1.2.3


From 5a6b4fe22583394886092aad5787b5fa8355276e Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Fri, 21 Dec 2001 14:56:54 +1100
Subject:    - stevesk@cvs.openbsd.org 2001/12/19 17:16:13      [authfile.c
 bufaux.c bufaux.h buffer.c buffer.h packet.c packet.h ssh.c]      change the
 buffer/packet interface to use void* vs. char*; ok markus@

---
 buffer.c | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
index 044caafb..a1152d1d 100644
--- a/buffer.c
+++ b/buffer.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: buffer.c,v 1.13 2001/04/12 19:15:24 markus Exp $");
+RCSID("$OpenBSD: buffer.c,v 1.14 2001/12/19 17:16:13 stevesk Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
@@ -53,11 +53,11 @@ buffer_clear(Buffer *buffer)
 /* Appends data to the buffer, expanding it if necessary. */
 
 void
-buffer_append(Buffer *buffer, const char *data, u_int len)
+buffer_append(Buffer *buffer, const void *data, u_int len)
 {
-	char *cp;
-	buffer_append_space(buffer, &cp, len);
-	memcpy(cp, data, len);
+	void *p;
+	p = buffer_append_space(buffer, len);
+	memcpy(p, data, len);
 }
 
 /*
@@ -66,9 +66,11 @@ buffer_append(Buffer *buffer, const char *data, u_int len)
  * to the allocated region.
  */
 
-void
-buffer_append_space(Buffer *buffer, char **datap, u_int len)
+void *
+buffer_append_space(Buffer *buffer, u_int len)
 {
+	void *p;
+
 	/* If the buffer is empty, start using it from the beginning. */
 	if (buffer->offset == buffer->end) {
 		buffer->offset = 0;
@@ -77,9 +79,9 @@ buffer_append_space(Buffer *buffer, char **datap, u_int len)
 restart:
 	/* If there is enough space to store all data, store it now. */
 	if (buffer->end + len < buffer->alloc) {
-		*datap = buffer->buf + buffer->end;
+		p = buffer->buf + buffer->end;
 		buffer->end += len;
-		return;
+		return p;
 	}
 	/*
 	 * If the buffer is quite empty, but all data is at the end, move the
@@ -96,6 +98,7 @@ restart:
 	buffer->alloc += len + 32768;
 	buffer->buf = xrealloc(buffer->buf, buffer->alloc);
 	goto restart;
+	/* NOTREACHED */
 }
 
 /* Returns the number of bytes of data in the buffer. */
@@ -109,7 +112,7 @@ buffer_len(Buffer *buffer)
 /* Gets data from the beginning of the buffer. */
 
 void
-buffer_get(Buffer *buffer, char *buf, u_int len)
+buffer_get(Buffer *buffer, void *buf, u_int len)
 {
 	if (len > buffer->end - buffer->offset)
 		fatal("buffer_get: trying to get more bytes %d than in buffer %d",
@@ -140,7 +143,7 @@ buffer_consume_end(Buffer *buffer, u_int bytes)
 
 /* Returns a pointer to the first used byte in the buffer. */
 
-char *
+void *
 buffer_ptr(Buffer *buffer)
 {
 	return buffer->buf + buffer->offset;
-- 
cgit v1.2.3


From 4a8ed543612c99700788d87fe18081d5df4b37c6 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Tue, 22 Jan 2002 23:33:31 +1100
Subject:    - stevesk@cvs.openbsd.org 2002/01/18 18:14:17      [authfd.c
 bufaux.c buffer.c cipher.c packet.c ssh-agent.c ssh-keygen.c]      unneeded
 cast cleanup; ok markus@

---
 buffer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
index a1152d1d..40572e5a 100644
--- a/buffer.c
+++ b/buffer.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: buffer.c,v 1.14 2001/12/19 17:16:13 stevesk Exp $");
+RCSID("$OpenBSD: buffer.c,v 1.15 2002/01/18 18:14:17 stevesk Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
@@ -155,7 +155,7 @@ void
 buffer_dump(Buffer *buffer)
 {
 	int i;
-	u_char *ucp = (u_char *) buffer->buf;
+	u_char *ucp = buffer->buf;
 
 	for (i = buffer->offset; i < buffer->end; i++) {
 		fprintf(stderr, "%02x", ucp[i]);
-- 
cgit v1.2.3


From 468cd716a54ac1fb85d24e6d270d824e460267b2 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Wed, 26 Jun 2002 19:14:25 +1000
Subject:    - markus@cvs.openbsd.org 2002/06/26 08:54:18      [buffer.c]     
 limit append to 1MB and buffers to 10MB

---
 buffer.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
index 40572e5a..ad04b267 100644
--- a/buffer.c
+++ b/buffer.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: buffer.c,v 1.15 2002/01/18 18:14:17 stevesk Exp $");
+RCSID("$OpenBSD: buffer.c,v 1.16 2002/06/26 08:54:18 markus Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
@@ -71,6 +71,9 @@ buffer_append_space(Buffer *buffer, u_int len)
 {
 	void *p;
 
+	if (len > 0x100000)
+		fatal("buffer_append_space: len %u not supported", len);
+
 	/* If the buffer is empty, start using it from the beginning. */
 	if (buffer->offset == buffer->end) {
 		buffer->offset = 0;
@@ -96,6 +99,9 @@ restart:
 	}
 	/* Increase the size of the buffer and retry. */
 	buffer->alloc += len + 32768;
+	if (buffer->alloc > 0xa00000)
+		fatal("buffer_append_space: alloc %u not supported",
+		    buffer->alloc);
 	buffer->buf = xrealloc(buffer->buf, buffer->alloc);
 	goto restart;
 	/* NOTREACHED */
-- 
cgit v1.2.3


From f2b4e4e07e7e2eae064d8e9f54f86f32a297bade Mon Sep 17 00:00:00 2001
From: Ben Lindstrom <mouring@eviladmin.org>
Date: Tue, 16 Sep 2003 03:31:03 +0000
Subject:    - deraadt@cvs.openbsd.org 2003/09/16 03:03:47      [buffer.c]     
 do not expand buffer before attempting to reallocate it; markus ok

---
 buffer.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
index ad04b267..8ff8c2f4 100644
--- a/buffer.c
+++ b/buffer.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: buffer.c,v 1.16 2002/06/26 08:54:18 markus Exp $");
+RCSID("$OpenBSD: buffer.c,v 1.17 2003/09/16 03:03:47 deraadt Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
@@ -69,6 +69,7 @@ buffer_append(Buffer *buffer, const void *data, u_int len)
 void *
 buffer_append_space(Buffer *buffer, u_int len)
 {
+	u_int newlen;
 	void *p;
 
 	if (len > 0x100000)
@@ -98,11 +99,13 @@ restart:
 		goto restart;
 	}
 	/* Increase the size of the buffer and retry. */
-	buffer->alloc += len + 32768;
-	if (buffer->alloc > 0xa00000)
+	
+	newlen = buffer->alloc + len + 32768;
+	if (newlen > 0xa00000)
 		fatal("buffer_append_space: alloc %u not supported",
-		    buffer->alloc);
-	buffer->buf = xrealloc(buffer->buf, buffer->alloc);
+		    newlen);
+	buffer->buf = xrealloc(buffer->buf, newlen);
+	buffer->alloc = newlen;
 	goto restart;
 	/* NOTREACHED */
 }
-- 
cgit v1.2.3


From 5efcecc26525b58f699997697e6114fd83708733 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Wed, 17 Sep 2003 07:31:14 +1000
Subject:  - (djm) OpenBSD Sync    - markus@cvs.openbsd.org 2003/09/16 21:02:40
      [buffer.c channels.c version.h]      more malloc/fatal fixes; ok
 millert/deraadt; ghudson at MIT.EDU

---
 buffer.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
index 8ff8c2f4..aee293f8 100644
--- a/buffer.c
+++ b/buffer.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: buffer.c,v 1.17 2003/09/16 03:03:47 deraadt Exp $");
+RCSID("$OpenBSD: buffer.c,v 1.18 2003/09/16 21:02:39 markus Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
@@ -23,8 +23,11 @@ RCSID("$OpenBSD: buffer.c,v 1.17 2003/09/16 03:03:47 deraadt Exp $");
 void
 buffer_init(Buffer *buffer)
 {
-	buffer->alloc = 4096;
-	buffer->buf = xmalloc(buffer->alloc);
+	const u_int len = 4096;
+
+	buffer->alloc = 0;
+	buffer->buf = xmalloc(len);
+	buffer->alloc = len;
 	buffer->offset = 0;
 	buffer->end = 0;
 }
@@ -34,8 +37,10 @@ buffer_init(Buffer *buffer)
 void
 buffer_free(Buffer *buffer)
 {
-	memset(buffer->buf, 0, buffer->alloc);
-	xfree(buffer->buf);
+	if (buffer->alloc > 0) {
+		memset(buffer->buf, 0, buffer->alloc);
+		xfree(buffer->buf);
+	}
 }
 
 /*
-- 
cgit v1.2.3


From d2730d39a1005502b406983de84b85f6b50237de Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Mon, 22 Sep 2003 21:00:19 +1000
Subject:    - markus@cvs.openbsd.org 2003/09/18 07:54:48      [buffer.c]     
 protect against double free; #660;  zardoz at users.sf.net

---
 buffer.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
index aee293f8..a80880bb 100644
--- a/buffer.c
+++ b/buffer.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: buffer.c,v 1.18 2003/09/16 21:02:39 markus Exp $");
+RCSID("$OpenBSD: buffer.c,v 1.19 2003/09/18 07:54:48 markus Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
@@ -39,6 +39,7 @@ buffer_free(Buffer *buffer)
 {
 	if (buffer->alloc > 0) {
 		memset(buffer->buf, 0, buffer->alloc);
+		buffer->alloc = 0;
 		xfree(buffer->buf);
 	}
 }
-- 
cgit v1.2.3


From 631a4a9b3e2d6109b87e59f3cf2dac419d3764fe Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Mon, 22 Sep 2003 21:08:21 +1000
Subject:    - markus@cvs.openbsd.org 2003/09/19 09:03:00      [buffer.c]     
 sign fix in buffer_dump; Jedi/Sector One; pr 3473

---
 buffer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
index a80880bb..69d5b57c 100644
--- a/buffer.c
+++ b/buffer.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: buffer.c,v 1.19 2003/09/18 07:54:48 markus Exp $");
+RCSID("$OpenBSD: buffer.c,v 1.20 2003/09/19 09:03:00 markus Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
@@ -169,7 +169,7 @@ buffer_ptr(Buffer *buffer)
 void
 buffer_dump(Buffer *buffer)
 {
-	int i;
+	u_int i;
 	u_char *ucp = buffer->buf;
 
 	for (i = buffer->offset; i < buffer->end; i++) {
-- 
cgit v1.2.3


From a8e06cef35c205e1aa562513c6d034a10c8c9a6d Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Fri, 21 Nov 2003 23:48:55 +1100
Subject:    - djm@cvs.openbsd.org 2003/11/21 11:57:03      [everything]     
 unexpand and delete whitespace at EOL; ok markus@      (done locally and RCS
 IDs synced)

---
 buffer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
index 69d5b57c..236aeb0c 100644
--- a/buffer.c
+++ b/buffer.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: buffer.c,v 1.20 2003/09/19 09:03:00 markus Exp $");
+RCSID("$OpenBSD: buffer.c,v 1.21 2003/11/21 11:57:03 djm Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
-- 
cgit v1.2.3


From 787b2ec18c013a5076765f93882550918658ea89 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Fri, 21 Nov 2003 23:56:47 +1100
Subject: more whitespace (tabs this time)

---
 buffer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
index 236aeb0c..9217cb26 100644
--- a/buffer.c
+++ b/buffer.c
@@ -105,7 +105,7 @@ restart:
 		goto restart;
 	}
 	/* Increase the size of the buffer and retry. */
-	
+
 	newlen = buffer->alloc + len + 32768;
 	if (newlen > 0xa00000)
 		fatal("buffer_append_space: alloc %u not supported",
-- 
cgit v1.2.3


From 50dbe8314b1796d05e12c1a8a9b9c8b3242d8c5a Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Fri, 5 Nov 2004 20:41:24 +1100
Subject:    - djm@cvs.openbsd.org 2004/10/29 23:56:17      [bufaux.c bufaux.h
 buffer.c buffer.h]      introduce a new buffer API that returns an error
 rather than fatal()ing      when presented with bad data; ok markus@

---
 buffer.c | 48 ++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 38 insertions(+), 10 deletions(-)

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
index 9217cb26..1a25004b 100644
--- a/buffer.c
+++ b/buffer.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: buffer.c,v 1.21 2003/11/21 11:57:03 djm Exp $");
+RCSID("$OpenBSD: buffer.c,v 1.22 2004/10/29 23:56:17 djm Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
@@ -126,34 +126,62 @@ buffer_len(Buffer *buffer)
 
 /* Gets data from the beginning of the buffer. */
 
-void
-buffer_get(Buffer *buffer, void *buf, u_int len)
+int
+buffer_get_ret(Buffer *buffer, void *buf, u_int len)
 {
-	if (len > buffer->end - buffer->offset)
-		fatal("buffer_get: trying to get more bytes %d than in buffer %d",
+	if (len > buffer->end - buffer->offset) {
+		error("buffer_get_ret: trying to get more bytes %d than in buffer %d",
 		    len, buffer->end - buffer->offset);
+		return (-1);
+	}
 	memcpy(buf, buffer->buf + buffer->offset, len);
 	buffer->offset += len;
+	return (0);
+}
+
+void
+buffer_get(Buffer *buffer, void *buf, u_int len)
+{
+	if (buffer_get_ret(buffer, buf, len) == -1)
+		fatal("buffer_get: buffer error");
 }
 
 /* Consumes the given number of bytes from the beginning of the buffer. */
 
+int
+buffer_consume_ret(Buffer *buffer, u_int bytes)
+{
+	if (bytes > buffer->end - buffer->offset) {
+		error("buffer_consume_ret: trying to get more bytes than in buffer");
+		return (-1);
+	}
+	buffer->offset += bytes;
+	return (0);
+}
+
 void
 buffer_consume(Buffer *buffer, u_int bytes)
 {
-	if (bytes > buffer->end - buffer->offset)
-		fatal("buffer_consume: trying to get more bytes than in buffer");
-	buffer->offset += bytes;
+	if (buffer_consume_ret(buffer, bytes) == -1)
+		fatal("buffer_consume: buffer error");
 }
 
 /* Consumes the given number of bytes from the end of the buffer. */
 
+int
+buffer_consume_end_ret(Buffer *buffer, u_int bytes)
+{
+	if (bytes > buffer->end - buffer->offset)
+		return (-1);
+	buffer->end -= bytes;
+	return (0);
+}
+
 void
 buffer_consume_end(Buffer *buffer, u_int bytes)
 {
-	if (bytes > buffer->end - buffer->offset)
+	if (buffer_consume_end_ret(buffer, bytes) == -1)
 		fatal("buffer_consume_end: trying to get more bytes than in buffer");
-	buffer->end -= bytes;
 }
 
 /* Returns a pointer to the first used byte in the buffer. */
-- 
cgit v1.2.3


From 11327cc5d7437b17f98580f1f173918873872c0d Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Mon, 14 Mar 2005 23:22:25 +1100
Subject:    - markus@cvs.openbsd.org 2005/03/14 11:46:56      [buffer.c
 buffer.h channels.c]      limit input buffer size for channels; bugzilla
 #896; with and ok dtucker@

---
 buffer.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
index 1a25004b..487e0810 100644
--- a/buffer.c
+++ b/buffer.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: buffer.c,v 1.22 2004/10/29 23:56:17 djm Exp $");
+RCSID("$OpenBSD: buffer.c,v 1.23 2005/03/14 11:46:56 markus Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
@@ -78,7 +78,7 @@ buffer_append_space(Buffer *buffer, u_int len)
 	u_int newlen;
 	void *p;
 
-	if (len > 0x100000)
+	if (len > BUFFER_MAX_CHUNK)
 		fatal("buffer_append_space: len %u not supported", len);
 
 	/* If the buffer is empty, start using it from the beginning. */
@@ -97,7 +97,7 @@ restart:
 	 * If the buffer is quite empty, but all data is at the end, move the
 	 * data to the beginning and retry.
 	 */
-	if (buffer->offset > buffer->alloc / 2) {
+	if (buffer->offset > MIN(buffer->alloc, BUFFER_MAX_CHUNK)) {
 		memmove(buffer->buf, buffer->buf + buffer->offset,
 			buffer->end - buffer->offset);
 		buffer->end -= buffer->offset;
@@ -107,7 +107,7 @@ restart:
 	/* Increase the size of the buffer and retry. */
 
 	newlen = buffer->alloc + len + 32768;
-	if (newlen > 0xa00000)
+	if (newlen > BUFFER_MAX_LEN)
 		fatal("buffer_append_space: alloc %u not supported",
 		    newlen);
 	buffer->buf = xrealloc(buffer->buf, newlen);
-- 
cgit v1.2.3


From b0fb6872ed2efe3a116083e43dd4f5f47cd4882b Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Sun, 26 Mar 2006 00:03:21 +1100
Subject:    - deraadt@cvs.openbsd.org 2006/03/19 18:51:18      [atomicio.c
 auth-bsdauth.c auth-chall.c auth-krb5.c auth-options.c]      [auth-pam.c
 auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c]      [auth-shadow.c
 auth-skey.c auth.c auth1.c auth2-chall.c]      [auth2-hostbased.c
 auth2-kbdint.c auth2-none.c auth2-passwd.c]      [auth2-pubkey.c auth2.c
 authfd.c authfile.c bufaux.c buffer.c]      [canohost.c channels.c
 cipher-3des1.c cipher-acss.c cipher-aes.c]      [cipher-bf1.c cipher-ctr.c
 cipher.c cleanup.c clientloop.c compat.c]      [compress.c deattack.c dh.c
 dispatch.c dns.c entropy.c fatal.c]      [groupaccess.c hostfile.c includes.h
 kex.c kexdh.c kexdhc.c]      [kexdhs.c kexgex.c kexgexc.c kexgexs.c key.c
 log.c loginrec.c]      [loginrec.h logintest.c mac.c match.c md-sha256.c
 md5crypt.c misc.c]      [monitor.c monitor_fdpass.c monitor_mm.c
 monitor_wrap.c msg.c]      [nchan.c packet.c progressmeter.c readconf.c
 readpass.c rsa.c]      [scard.c scp.c servconf.c serverloop.c session.c
 sftp-client.c]      [sftp-common.c sftp-glob.c sftp-server.c sftp.c
 ssh-add.c]      [ssh-agent.c ssh-dss.c ssh-keygen.c ssh-keyscan.c
 ssh-keysign.c]      [ssh-rand-helper.c ssh-rsa.c ssh.c sshconnect.c
 sshconnect1.c]      [sshconnect2.c sshd.c sshlogin.c sshpty.c sshtty.c
 ttymodes.c]      [uidswap.c uuencode.c xmalloc.c
 openbsd-compat/bsd-arc4random.c]      [openbsd-compat/bsd-closefrom.c
 openbsd-compat/bsd-cygwin_util.c]      [openbsd-compat/bsd-getpeereid.c
 openbsd-compat/bsd-misc.c]      [openbsd-compat/bsd-nextstep.c
 openbsd-compat/bsd-snprintf.c]      [openbsd-compat/bsd-waitpid.c
 openbsd-compat/fake-rfc2553.c]      RCSID() can die

---
 buffer.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
index 487e0810..08682e0f 100644
--- a/buffer.c
+++ b/buffer.c
@@ -12,7 +12,6 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: buffer.c,v 1.23 2005/03/14 11:46:56 markus Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
-- 
cgit v1.2.3


From 36812092ecb11a25ca9d6d87fdeaf53e371c5043 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Sun, 26 Mar 2006 14:22:47 +1100
Subject:    - djm@cvs.openbsd.org 2006/03/25 01:13:23      [buffer.c
 channels.c deattack.c misc.c scp.c session.c sftp-client.c]     
 [sftp-server.c ssh-agent.c ssh-rsa.c xmalloc.c xmalloc.h auth-pam.c]     
 [uidswap.c]      change OpenSSH's xrealloc() function from being xrealloc(p,
 new_size)      to xrealloc(p, new_nmemb, new_itemsize).

     realloc is particularly prone to integer overflows because it is
     almost always allocating "n * size" bytes, so this is a far safer
     API; ok deraadt@
---
 buffer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
index 08682e0f..1666f742 100644
--- a/buffer.c
+++ b/buffer.c
@@ -109,7 +109,7 @@ restart:
 	if (newlen > BUFFER_MAX_LEN)
 		fatal("buffer_append_space: alloc %u not supported",
 		    newlen);
-	buffer->buf = xrealloc(buffer->buf, newlen);
+	buffer->buf = xrealloc(buffer->buf, 1, newlen);
 	buffer->alloc = newlen;
 	goto restart;
 	/* NOTREACHED */
-- 
cgit v1.2.3


From 57c30117c1c97c069bc38af45b4a504a39866e74 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Sun, 26 Mar 2006 14:24:48 +1100
Subject:    - djm@cvs.openbsd.org 2006/03/25 13:17:03      [atomicio.c
 auth-bsdauth.c auth-chall.c auth-options.c auth-passwd.c]      [auth-rh-rsa.c
 auth-rhosts.c auth-rsa.c auth-skey.c auth.c auth1.c]      [auth2-chall.c
 auth2-hostbased.c auth2-kbdint.c auth2-none.c]      [auth2-passwd.c
 auth2-pubkey.c auth2.c authfd.c authfile.c bufaux.c]      [buffer.c
 canohost.c channels.c cipher-3des1.c cipher-bf1.c]      [cipher-ctr.c
 cipher.c cleanup.c clientloop.c compat.c compress.c]      [deattack.c dh.c
 dispatch.c fatal.c groupaccess.c hostfile.c kex.c]      [kexdh.c kexdhc.c
 kexdhs.c kexgex.c kexgexc.c kexgexs.c key.c log.c]      [mac.c match.c
 md-sha256.c misc.c monitor.c monitor_fdpass.c]      [monitor_mm.c
 monitor_wrap.c msg.c nchan.c packet.c progressmeter.c]      [readconf.c
 readpass.c rsa.c scard.c scp.c servconf.c serverloop.c]      [session.c
 sftp-client.c sftp-common.c sftp-glob.c sftp-server.c]      [sftp.c ssh-add.c
 ssh-agent.c ssh-dss.c ssh-keygen.c ssh-keyscan.c]      [ssh-keysign.c
 ssh-rsa.c ssh.c sshconnect.c sshconnect1.c]      [sshconnect2.c sshd.c
 sshlogin.c sshpty.c sshtty.c ttymodes.c]      [uidswap.c uuencode.c
 xmalloc.c]      Put $OpenBSD$ tags back (as comments) to replace the RCSID()s
 that      Theo nuked - our scripts to sync -portable need them in the files

---
 buffer.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
index 1666f742..de404e60 100644
--- a/buffer.c
+++ b/buffer.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: buffer.c,v 1.26 2006/03/25 13:17:01 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
-- 
cgit v1.2.3


From 499a0d5ada82acbf8a5c5d496dbf0b4570dde1af Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Sun, 23 Apr 2006 12:06:03 +1000
Subject:    - djm@cvs.openbsd.org 2006/04/16 00:48:52      [buffer.c buffer.h
 channels.c]      Fix condition where we could exit with a fatal error when an
 input      buffer became too large and the remote end had advertised a big
 window.      The problem was a mismatch in the backoff math between the
 channels code      and the buffer code, so make a buffer_check_alloc()
 function that the      channels code can use to propsectivly check whether an
 incremental      allocation will succeed.  bz #1131, debugged with the
 assistance of      cove AT wildpackets.com; ok dtucker@ deraadt@

---
 buffer.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 48 insertions(+), 13 deletions(-)

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
index de404e60..ba718daf 100644
--- a/buffer.c
+++ b/buffer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: buffer.c,v 1.26 2006/03/25 13:17:01 djm Exp $ */
+/* $OpenBSD: buffer.c,v 1.27 2006/04/16 00:48:52 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -18,6 +18,10 @@
 #include "buffer.h"
 #include "log.h"
 
+#define	BUFFER_MAX_CHUNK	0x100000
+#define	BUFFER_MAX_LEN		0xa00000
+#define	BUFFER_ALLOCSZ		0x008000
+
 /* Initializes the buffer structure. */
 
 void
@@ -66,6 +70,23 @@ buffer_append(Buffer *buffer, const void *data, u_int len)
 	memcpy(p, data, len);
 }
 
+static int
+buffer_compact(Buffer *buffer)
+{
+	/*
+	 * If the buffer is quite empty, but all data is at the end, move the
+	 * data to the beginning.
+	 */
+	if (buffer->offset > MIN(buffer->alloc, BUFFER_MAX_CHUNK)) {
+		memmove(buffer->buf, buffer->buf + buffer->offset,
+			buffer->end - buffer->offset);
+		buffer->end -= buffer->offset;
+		buffer->offset = 0;
+		return (1);
+	}
+	return (0);
+}
+
 /*
  * Appends space to the buffer, expanding the buffer if necessary. This does
  * not actually copy the data into the buffer, but instead returns a pointer
@@ -93,20 +114,13 @@ restart:
 		buffer->end += len;
 		return p;
 	}
-	/*
-	 * If the buffer is quite empty, but all data is at the end, move the
-	 * data to the beginning and retry.
-	 */
-	if (buffer->offset > MIN(buffer->alloc, BUFFER_MAX_CHUNK)) {
-		memmove(buffer->buf, buffer->buf + buffer->offset,
-			buffer->end - buffer->offset);
-		buffer->end -= buffer->offset;
-		buffer->offset = 0;
+
+	/* Compact data back to the start of the buffer if necessary */
+	if (buffer_compact(buffer))
 		goto restart;
-	}
-	/* Increase the size of the buffer and retry. */
 
-	newlen = buffer->alloc + len + 32768;
+	/* Increase the size of the buffer and retry. */
+	newlen = roundup(buffer->alloc + len, BUFFER_ALLOCSZ);
 	if (newlen > BUFFER_MAX_LEN)
 		fatal("buffer_append_space: alloc %u not supported",
 		    newlen);
@@ -116,6 +130,27 @@ restart:
 	/* NOTREACHED */
 }
 
+/*
+ * Check whether an allocation of 'len' will fit in the buffer
+ * This must follow the same math as buffer_append_space
+ */
+int
+buffer_check_alloc(Buffer *buffer, u_int len)
+{
+	if (buffer->offset == buffer->end) {
+		buffer->offset = 0;
+		buffer->end = 0;
+	}
+ restart:
+	if (buffer->end + len < buffer->alloc)
+		return (1);
+	if (buffer_compact(buffer))
+		goto restart;
+	if (roundup(buffer->alloc + len, BUFFER_ALLOCSZ) <= BUFFER_MAX_LEN)
+		return (1);
+	return (0);
+}
+
 /* Returns the number of bytes of data in the buffer. */
 
 u_int
-- 
cgit v1.2.3


From e3476ed03bf9beca3ad0e5447dc9422a546d19ec Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Mon, 24 Jul 2006 14:13:33 +1000
Subject:    - stevesk@cvs.openbsd.org 2006/07/22 20:48:23      [atomicio.c
 auth-options.c auth-passwd.c auth-rhosts.c auth-rsa.c]      [auth.c auth1.c
 auth2-chall.c auth2-hostbased.c auth2-passwd.c auth2.c]      [authfd.c
 authfile.c bufaux.c bufbn.c buffer.c canohost.c channels.c]     
 [cipher-3des1.c cipher-bf1.c cipher-ctr.c cipher.c clientloop.c]     
 [compat.c deattack.c dh.c dns.c gss-genr.c gss-serv.c hostfile.c]     
 [includes.h kex.c kexdhc.c kexdhs.c kexgexc.c kexgexs.c key.c log.c]     
 [mac.c match.c md-sha256.c misc.c moduli.c monitor.c monitor_fdpass.c]     
 [monitor_mm.c monitor_wrap.c msg.c nchan.c packet.c rsa.c]     
 [progressmeter.c readconf.c readpass.c scp.c servconf.c serverloop.c]     
 [session.c sftp-client.c sftp-common.c sftp-glob.c sftp-server.c sftp.c]     
 [ssh-add.c ssh-agent.c ssh-dss.c ssh-keygen.c ssh-keyscan.c]     
 [ssh-keysign.c ssh-rsa.c ssh.c sshconnect.c sshconnect1.c sshconnect2.c]     
 [sshd.c sshlogin.c sshpty.c ttymodes.c uidswap.c xmalloc.c]      move
 #include <string.h> out of includes.h

---
 buffer.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
index ba718daf..8c9f534f 100644
--- a/buffer.c
+++ b/buffer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: buffer.c,v 1.27 2006/04/16 00:48:52 djm Exp $ */
+/* $OpenBSD: buffer.c,v 1.28 2006/07/22 20:48:22 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -14,6 +14,8 @@
 
 #include "includes.h"
 
+#include <string.h>
+
 #include "xmalloc.h"
 #include "buffer.h"
 #include "log.h"
-- 
cgit v1.2.3


From 8dbffe7904c4e28b7a741064a468f1cd98c0ad81 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Sat, 5 Aug 2006 11:02:17 +1000
Subject:    - stevesk@cvs.openbsd.org 2006/07/26 02:35:17      [atomicio.c
 auth.c dh.c authfile.c buffer.c clientloop.c kex.c]      [groupaccess.c
 gss-genr.c kexgexs.c misc.c monitor.c monitor_mm.c]      [packet.c scp.c
 serverloop.c session.c sftp-client.c sftp-common.c]      [sftp-server.c
 sftp.c ssh-add.c ssh-agent.c ssh-keygen.c sshlogin.c]      [uidswap.c
 xmalloc.c]      move #include <sys/param.h> out of includes.h

---
 buffer.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
index 8c9f534f..c6e8a8d4 100644
--- a/buffer.c
+++ b/buffer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: buffer.c,v 1.28 2006/07/22 20:48:22 stevesk Exp $ */
+/* $OpenBSD: buffer.c,v 1.29 2006/07/26 02:35:17 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -14,6 +14,8 @@
 
 #include "includes.h"
 
+#include <sys/param.h>
+
 #include <string.h>
 
 #include "xmalloc.h"
-- 
cgit v1.2.3


From a7a73ee35d030c817b3eea5c6c3a75c765ca8e69 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Sat, 5 Aug 2006 11:37:59 +1000
Subject:    - stevesk@cvs.openbsd.org 2006/08/01 23:22:48      [auth-passwd.c
 auth-rhosts.c auth-rsa.c auth.c auth.h auth1.c]      [auth2-chall.c
 auth2-pubkey.c authfile.c buffer.c canohost.c]      [channels.c clientloop.c
 dh.c dns.c dns.h hostfile.c kex.c kexdhc.c]      [kexgexc.c kexgexs.c key.c
 key.h log.c misc.c misc.h moduli.c]      [monitor_wrap.c packet.c
 progressmeter.c readconf.c readpass.c scp.c]      [servconf.c session.c
 sftp-client.c sftp-common.c sftp-server.c sftp.c]      [ssh-add.c ssh-agent.c
 ssh-keygen.c ssh-keyscan.c ssh.c sshconnect.c]      [sshconnect1.c
 sshconnect2.c sshd.c sshlogin.c sshtty.c uuencode.c]      [uuencode.h
 xmalloc.c]      move #include <stdio.h> out of includes.h

---
 buffer.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
index c6e8a8d4..25868b94 100644
--- a/buffer.c
+++ b/buffer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: buffer.c,v 1.29 2006/07/26 02:35:17 stevesk Exp $ */
+/* $OpenBSD: buffer.c,v 1.30 2006/08/01 23:22:47 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -16,6 +16,7 @@
 
 #include <sys/param.h>
 
+#include <stdio.h>
 #include <string.h>
 
 #include "xmalloc.h"
-- 
cgit v1.2.3


From d783435315d8e604998925d5e47b663a500ed252 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Sat, 5 Aug 2006 12:39:39 +1000
Subject:    - deraadt@cvs.openbsd.org 2006/08/03 03:34:42      [OVERVIEW
 atomicio.c atomicio.h auth-bsdauth.c auth-chall.c auth-krb5.c]     
 [auth-options.c auth-options.h auth-passwd.c auth-rh-rsa.c auth-rhosts.c]    
  [auth-rsa.c auth-skey.c auth.c auth.h auth1.c auth2-chall.c auth2-gss.c]    
  [auth2-hostbased.c auth2-kbdint.c auth2-none.c auth2-passwd.c ]     
 [auth2-pubkey.c auth2.c authfd.c authfd.h authfile.c bufaux.c bufbn.c]     
 [buffer.c buffer.h canohost.c channels.c channels.h cipher-3des1.c]     
 [cipher-bf1.c cipher-ctr.c cipher.c cleanup.c clientloop.c compat.c]     
 [compress.c deattack.c dh.c dispatch.c dns.c dns.h fatal.c groupaccess.c]    
  [groupaccess.h gss-genr.c gss-serv-krb5.c gss-serv.c hostfile.c kex.c]     
 [kex.h kexdh.c kexdhc.c kexdhs.c kexgex.c kexgexc.c kexgexs.c key.c]     
 [key.h log.c log.h mac.c match.c md-sha256.c misc.c misc.h moduli.c]     
 [monitor.c monitor_fdpass.c monitor_mm.c monitor_mm.h monitor_wrap.c]     
 [monitor_wrap.h msg.c nchan.c packet.c progressmeter.c readconf.c]     
 [readconf.h readpass.c rsa.c scard.c scard.h scp.c servconf.c servconf.h]    
  [serverloop.c session.c session.h sftp-client.c sftp-common.c]     
 [sftp-common.h sftp-glob.c sftp-server.c sftp.c ssh-add.c ssh-agent.c]     
 [ssh-dss.c ssh-gss.h ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-rsa.c]     
 [ssh.c ssh.h sshconnect.c sshconnect.h sshconnect1.c sshconnect2.c]     
 [sshd.c sshlogin.c sshlogin.h sshpty.c sshpty.h sshtty.c ttymodes.c]     
 [uidswap.c uidswap.h uuencode.c uuencode.h xmalloc.c xmalloc.h]     
 [loginrec.c loginrec.h openbsd-compat/port-aix.c openbsd-compat/port-tun.h]  
    almost entirely get rid of the culture of ".h files that include .h files"
      ok djm, sort of ok stevesk      makes the pain stop in one easy step    
  NB. portable commit contains everything *except* removing includes.h, as    
  that will take a fair bit more work as we move headers that are required    
  for portability workarounds to defines.h. (also, this step wasn't "easy")

---
 buffer.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
index 25868b94..e02e1e35 100644
--- a/buffer.c
+++ b/buffer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: buffer.c,v 1.30 2006/08/01 23:22:47 stevesk Exp $ */
+/* $OpenBSD: buffer.c,v 1.31 2006/08/03 03:34:41 deraadt Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -18,6 +18,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <stdarg.h>
 
 #include "xmalloc.h"
 #include "buffer.h"
-- 
cgit v1.2.3


From 8922106fe9df50810e4149a05f7e3f9585ec08cc Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Fri, 12 Feb 2010 09:23:40 +1100
Subject:    - djm@cvs.openbsd.org 2010/02/09 03:56:28      [buffer.c buffer.h]
      constify the arguments to buffer_len, buffer_ptr and buffer_dump

---
 buffer.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
index e02e1e35..ae970034 100644
--- a/buffer.c
+++ b/buffer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: buffer.c,v 1.31 2006/08/03 03:34:41 deraadt Exp $ */
+/* $OpenBSD: buffer.c,v 1.32 2010/02/09 03:56:28 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -160,7 +160,7 @@ buffer_check_alloc(Buffer *buffer, u_int len)
 /* Returns the number of bytes of data in the buffer. */
 
 u_int
-buffer_len(Buffer *buffer)
+buffer_len(const Buffer *buffer)
 {
 	return buffer->end - buffer->offset;
 }
@@ -228,7 +228,7 @@ buffer_consume_end(Buffer *buffer, u_int bytes)
 /* Returns a pointer to the first used byte in the buffer. */
 
 void *
-buffer_ptr(Buffer *buffer)
+buffer_ptr(const Buffer *buffer)
 {
 	return buffer->buf + buffer->offset;
 }
@@ -236,7 +236,7 @@ buffer_ptr(Buffer *buffer)
 /* Dumps the contents of the buffer to stderr. */
 
 void
-buffer_dump(Buffer *buffer)
+buffer_dump(const Buffer *buffer)
 {
 	u_int i;
 	u_char *ucp = buffer->buf;
-- 
cgit v1.2.3


From a627d42e51ffa71e014d7b2d2c07118122fd3ec3 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Sun, 2 Jun 2013 07:31:17 +1000
Subject:    - djm@cvs.openbsd.org 2013/05/17 00:13:13      [xmalloc.h cipher.c
 sftp-glob.c ssh-keyscan.c ssh.c sftp-common.c      ssh-ecdsa.c auth2-chall.c
 compat.c readconf.c kexgexs.c monitor.c      gss-genr.c cipher-3des1.c kex.c
 monitor_wrap.c ssh-pkcs11-client.c      auth-options.c rsa.c auth2-pubkey.c
 sftp.c hostfile.c auth2.c      servconf.c auth.c authfile.c xmalloc.c
 uuencode.c sftp-client.c      auth2-gss.c sftp-server.c bufaux.c mac.c
 session.c jpake.c kexgexc.c      sshconnect.c auth-chall.c auth2-passwd.c
 sshconnect1.c buffer.c      kexecdhs.c kexdhs.c ssh-rsa.c auth1.c
 ssh-pkcs11.c auth2-kbdint.c      kexdhc.c sshd.c umac.c ssh-dss.c
 auth2-jpake.c bufbn.c clientloop.c      monitor_mm.c scp.c roaming_client.c
 serverloop.c key.c auth-rsa.c      ssh-pkcs11-helper.c ssh-keysign.c
 ssh-keygen.c match.c channels.c      sshconnect2.c addrmatch.c mux.c
 canohost.c kexecdhc.c schnorr.c      ssh-add.c misc.c auth2-hostbased.c
 ssh-agent.c bufec.c groupaccess.c      dns.c packet.c readpass.c authfd.c
 moduli.c]      bye, bye xfree(); ok markus@

---
 buffer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
index ae970034..007e7f94 100644
--- a/buffer.c
+++ b/buffer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: buffer.c,v 1.32 2010/02/09 03:56:28 djm Exp $ */
+/* $OpenBSD: buffer.c,v 1.33 2013/05/17 00:13:13 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -50,7 +50,7 @@ buffer_free(Buffer *buffer)
 	if (buffer->alloc > 0) {
 		memset(buffer->buf, 0, buffer->alloc);
 		buffer->alloc = 0;
-		xfree(buffer->buf);
+		free(buffer->buf);
 	}
 }
 
-- 
cgit v1.2.3


From 0600c7020f4fe68a780bd7cf21ff541a8d4b568a Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Thu, 21 Nov 2013 13:55:43 +1100
Subject:    - dtucker@cvs.openbsd.org 2013/11/08 11:15:19      [bufaux.c
 bufbn.c buffer.c sftp-client.c sftp-common.c sftp-glob.c]      [uidswap.c]
 Include stdlib.h for free() as per the man page.

---
 buffer.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
index 007e7f94..9e7c40a5 100644
--- a/buffer.c
+++ b/buffer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: buffer.c,v 1.33 2013/05/17 00:13:13 djm Exp $ */
+/* $OpenBSD: buffer.c,v 1.34 2013/11/08 11:15:19 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -19,6 +19,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
+#include <stdlib.h>
 
 #include "xmalloc.h"
 #include "buffer.h"
-- 
cgit v1.2.3


From a5103f413bde6f31bff85d6e1fd29799c647d765 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Tue, 4 Feb 2014 11:20:14 +1100
Subject:    - djm@cvs.openbsd.org 2014/02/02 03:44:32      [auth1.c
 auth2-chall.c auth2-passwd.c authfile.c bufaux.c bufbn.c]      [buffer.c
 cipher-3des1.c cipher.c clientloop.c gss-serv.c kex.c]      [kexdhc.c
 kexdhs.c kexecdhc.c kexgexc.c kexecdhs.c kexgexs.c key.c]      [monitor.c
 monitor_wrap.c packet.c readpass.c rsa.c serverloop.c]      [ssh-add.c
 ssh-agent.c ssh-dss.c ssh-ecdsa.c ssh-ed25519.c]      [ssh-keygen.c ssh-rsa.c
 sshconnect.c sshconnect1.c sshconnect2.c]      [sshd.c]      convert memset
 of potentially-private data to explicit_bzero()

---
 buffer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
index 9e7c40a5..d240f675 100644
--- a/buffer.c
+++ b/buffer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: buffer.c,v 1.34 2013/11/08 11:15:19 dtucker Exp $ */
+/* $OpenBSD: buffer.c,v 1.35 2014/02/02 03:44:31 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -49,7 +49,7 @@ void
 buffer_free(Buffer *buffer)
 {
 	if (buffer->alloc > 0) {
-		memset(buffer->buf, 0, buffer->alloc);
+		explicit_bzero(buffer->buf, buffer->alloc);
 		buffer->alloc = 0;
 		free(buffer->buf);
 	}
-- 
cgit v1.2.3


From 05e82c3b963c33048128baf72a6f6b3a1c10b4c1 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Thu, 15 May 2014 14:33:43 +1000
Subject:    - djm@cvs.openbsd.org 2014/04/30 05:29:56      [bufaux.c bufbn.c
 bufec.c buffer.c buffer.h sshbuf-getput-basic.c]      [sshbuf-getput-crypto.c
 sshbuf-misc.c sshbuf.c sshbuf.h ssherr.c]      [ssherr.h]      New buffer
 API; the first installment of the conversion/replacement      of OpenSSH's
 internals to make them usable as a standalone library.

     This includes a set of wrappers to make it compatible with the
     existing buffer API so replacement can occur incrementally.

     With and ok markus@

     Thanks also to Ben Hawkes, David Tomaschik, Ivan Fratric, Matthew
     Dempsky and Ron Bowes for a detailed review.
---
 buffer.c | 245 ++++++++++++++-------------------------------------------------
 1 file changed, 54 insertions(+), 191 deletions(-)

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
index d240f675..07bc186d 100644
--- a/buffer.c
+++ b/buffer.c
@@ -1,253 +1,116 @@
-/* $OpenBSD: buffer.c,v 1.35 2014/02/02 03:44:31 djm Exp $ */
+/* $OpenBSD: buffer.c,v 1.36 2014/04/30 05:29:56 djm Exp $ */
+
 /*
- * Author: Tatu Ylonen <ylo@cs.hut.fi>
- * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
- *                    All rights reserved
- * Functions for manipulating fifo buffers (that can grow if needed).
+ * Copyright (c) 2012 Damien Miller <djm@mindrot.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
- * As far as I am concerned, the code I have written for this software
- * can be used freely for any purpose.  Any derived versions of this
- * software must be clearly marked as such, and if the derived work is
- * incompatible with the protocol description in the RFC file, it must be
- * called by a name other than "ssh" or "Secure Shell".
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "includes.h"
+/* Emulation wrappers for legacy OpenSSH buffer API atop sshbuf */
 
-#include <sys/param.h>
+#include <sys/types.h>
 
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-#include <stdlib.h>
-
-#include "xmalloc.h"
 #include "buffer.h"
 #include "log.h"
-
-#define	BUFFER_MAX_CHUNK	0x100000
-#define	BUFFER_MAX_LEN		0xa00000
-#define	BUFFER_ALLOCSZ		0x008000
-
-/* Initializes the buffer structure. */
-
-void
-buffer_init(Buffer *buffer)
-{
-	const u_int len = 4096;
-
-	buffer->alloc = 0;
-	buffer->buf = xmalloc(len);
-	buffer->alloc = len;
-	buffer->offset = 0;
-	buffer->end = 0;
-}
-
-/* Frees any memory used for the buffer. */
-
-void
-buffer_free(Buffer *buffer)
-{
-	if (buffer->alloc > 0) {
-		explicit_bzero(buffer->buf, buffer->alloc);
-		buffer->alloc = 0;
-		free(buffer->buf);
-	}
-}
-
-/*
- * Clears any data from the buffer, making it empty.  This does not actually
- * zero the memory.
- */
-
-void
-buffer_clear(Buffer *buffer)
-{
-	buffer->offset = 0;
-	buffer->end = 0;
-}
-
-/* Appends data to the buffer, expanding it if necessary. */
+#include "ssherr.h"
 
 void
 buffer_append(Buffer *buffer, const void *data, u_int len)
 {
-	void *p;
-	p = buffer_append_space(buffer, len);
-	memcpy(p, data, len);
-}
+	int ret;
 
-static int
-buffer_compact(Buffer *buffer)
-{
-	/*
-	 * If the buffer is quite empty, but all data is at the end, move the
-	 * data to the beginning.
-	 */
-	if (buffer->offset > MIN(buffer->alloc, BUFFER_MAX_CHUNK)) {
-		memmove(buffer->buf, buffer->buf + buffer->offset,
-			buffer->end - buffer->offset);
-		buffer->end -= buffer->offset;
-		buffer->offset = 0;
-		return (1);
-	}
-	return (0);
+	if ((ret = sshbuf_put(buffer, data, len)) != 0)
+		fatal("%s: %s", __func__, ssh_err(ret));
 }
 
-/*
- * Appends space to the buffer, expanding the buffer if necessary. This does
- * not actually copy the data into the buffer, but instead returns a pointer
- * to the allocated region.
- */
-
 void *
 buffer_append_space(Buffer *buffer, u_int len)
 {
-	u_int newlen;
-	void *p;
+	int ret;
+	u_char *p;
 
-	if (len > BUFFER_MAX_CHUNK)
-		fatal("buffer_append_space: len %u not supported", len);
-
-	/* If the buffer is empty, start using it from the beginning. */
-	if (buffer->offset == buffer->end) {
-		buffer->offset = 0;
-		buffer->end = 0;
-	}
-restart:
-	/* If there is enough space to store all data, store it now. */
-	if (buffer->end + len < buffer->alloc) {
-		p = buffer->buf + buffer->end;
-		buffer->end += len;
-		return p;
-	}
-
-	/* Compact data back to the start of the buffer if necessary */
-	if (buffer_compact(buffer))
-		goto restart;
-
-	/* Increase the size of the buffer and retry. */
-	newlen = roundup(buffer->alloc + len, BUFFER_ALLOCSZ);
-	if (newlen > BUFFER_MAX_LEN)
-		fatal("buffer_append_space: alloc %u not supported",
-		    newlen);
-	buffer->buf = xrealloc(buffer->buf, 1, newlen);
-	buffer->alloc = newlen;
-	goto restart;
-	/* NOTREACHED */
+	if ((ret = sshbuf_reserve(buffer, len, &p)) != 0)
+		fatal("%s: %s", __func__, ssh_err(ret));
+	return p;
 }
 
-/*
- * Check whether an allocation of 'len' will fit in the buffer
- * This must follow the same math as buffer_append_space
- */
 int
 buffer_check_alloc(Buffer *buffer, u_int len)
 {
-	if (buffer->offset == buffer->end) {
-		buffer->offset = 0;
-		buffer->end = 0;
-	}
- restart:
-	if (buffer->end + len < buffer->alloc)
-		return (1);
-	if (buffer_compact(buffer))
-		goto restart;
-	if (roundup(buffer->alloc + len, BUFFER_ALLOCSZ) <= BUFFER_MAX_LEN)
-		return (1);
-	return (0);
-}
-
-/* Returns the number of bytes of data in the buffer. */
+	int ret = sshbuf_check_reserve(buffer, len);
 
-u_int
-buffer_len(const Buffer *buffer)
-{
-	return buffer->end - buffer->offset;
+	if (ret == 0)
+		return 1;
+	if (ret == SSH_ERR_NO_BUFFER_SPACE)
+		return 0;
+	fatal("%s: %s", __func__, ssh_err(ret));
 }
 
-/* Gets data from the beginning of the buffer. */
-
 int
 buffer_get_ret(Buffer *buffer, void *buf, u_int len)
 {
-	if (len > buffer->end - buffer->offset) {
-		error("buffer_get_ret: trying to get more bytes %d than in buffer %d",
-		    len, buffer->end - buffer->offset);
-		return (-1);
+	int ret;
+
+	if ((ret = sshbuf_get(buffer, buf, len)) != 0) {
+		error("%s: %s", __func__, ssh_err(ret));
+		return -1;
 	}
-	memcpy(buf, buffer->buf + buffer->offset, len);
-	buffer->offset += len;
-	return (0);
+	return 0;
 }
 
 void
 buffer_get(Buffer *buffer, void *buf, u_int len)
 {
 	if (buffer_get_ret(buffer, buf, len) == -1)
-		fatal("buffer_get: buffer error");
+		fatal("%s: buffer error", __func__);
 }
 
-/* Consumes the given number of bytes from the beginning of the buffer. */
-
 int
 buffer_consume_ret(Buffer *buffer, u_int bytes)
 {
-	if (bytes > buffer->end - buffer->offset) {
-		error("buffer_consume_ret: trying to get more bytes than in buffer");
-		return (-1);
-	}
-	buffer->offset += bytes;
-	return (0);
+	int ret = sshbuf_consume(buffer, bytes);
+
+	if (ret == 0)
+		return 0;
+	if (ret == SSH_ERR_MESSAGE_INCOMPLETE)
+		return -1;
+	fatal("%s: %s", __func__, ssh_err(ret));
 }
 
 void
 buffer_consume(Buffer *buffer, u_int bytes)
 {
 	if (buffer_consume_ret(buffer, bytes) == -1)
-		fatal("buffer_consume: buffer error");
+		fatal("%s: buffer error", __func__);
 }
 
-/* Consumes the given number of bytes from the end of the buffer. */
-
 int
 buffer_consume_end_ret(Buffer *buffer, u_int bytes)
 {
-	if (bytes > buffer->end - buffer->offset)
-		return (-1);
-	buffer->end -= bytes;
-	return (0);
+	int ret = sshbuf_consume_end(buffer, bytes);
+
+	if (ret == 0)
+		return 0;
+	if (ret == SSH_ERR_MESSAGE_INCOMPLETE)
+		return -1;
+	fatal("%s: %s", __func__, ssh_err(ret));
 }
 
 void
 buffer_consume_end(Buffer *buffer, u_int bytes)
 {
 	if (buffer_consume_end_ret(buffer, bytes) == -1)
-		fatal("buffer_consume_end: trying to get more bytes than in buffer");
-}
-
-/* Returns a pointer to the first used byte in the buffer. */
-
-void *
-buffer_ptr(const Buffer *buffer)
-{
-	return buffer->buf + buffer->offset;
+		fatal("%s: buffer error", __func__);
 }
 
-/* Dumps the contents of the buffer to stderr. */
 
-void
-buffer_dump(const Buffer *buffer)
-{
-	u_int i;
-	u_char *ucp = buffer->buf;
-
-	for (i = buffer->offset; i < buffer->end; i++) {
-		fprintf(stderr, "%02x", ucp[i]);
-		if ((i-buffer->offset)%16==15)
-			fprintf(stderr, "\r\n");
-		else if ((i-buffer->offset)%2==1)
-			fprintf(stderr, " ");
-	}
-	fprintf(stderr, "\r\n");
-}
-- 
cgit v1.2.3


From 58538d795e0b662f2f4e5a7193f1204bbe992ddd Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Wed, 11 Jun 2014 13:39:24 +1000
Subject:  - (dtucker) [bufaux.c bufbn.c bufec.c buffer.c] Pull in includes.h
 for    compat stuff, specifically whether or not OpenSSL has ECC.

---
 buffer.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
index 07bc186d..c5f708ab 100644
--- a/buffer.c
+++ b/buffer.c
@@ -18,6 +18,8 @@
 
 /* Emulation wrappers for legacy OpenSSH buffer API atop sshbuf */
 
+#include "includes.h"
+
 #include <sys/types.h>
 
 #include "buffer.h"
-- 
cgit v1.2.3


From cb30cd47041edb03476be1c8ef7bc1f4b69d1555 Mon Sep 17 00:00:00 2001
From: "markus@openbsd.org" <markus@openbsd.org>
Date: Mon, 9 Jul 2018 21:56:06 +0000
Subject: upstream: remove legacy buffer API emulation layer; ok djm@

OpenBSD-Commit-ID: 2dd5dc17cbc23195be4299fa93be2707a0e08ad9
---
 buffer.c | 118 ---------------------------------------------------------------
 1 file changed, 118 deletions(-)
 delete mode 100644 buffer.c

(limited to 'buffer.c')

diff --git a/buffer.c b/buffer.c
deleted file mode 100644
index c5f708ab..00000000
--- a/buffer.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/* $OpenBSD: buffer.c,v 1.36 2014/04/30 05:29:56 djm Exp $ */
-
-/*
- * Copyright (c) 2012 Damien Miller <djm@mindrot.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* Emulation wrappers for legacy OpenSSH buffer API atop sshbuf */
-
-#include "includes.h"
-
-#include <sys/types.h>
-
-#include "buffer.h"
-#include "log.h"
-#include "ssherr.h"
-
-void
-buffer_append(Buffer *buffer, const void *data, u_int len)
-{
-	int ret;
-
-	if ((ret = sshbuf_put(buffer, data, len)) != 0)
-		fatal("%s: %s", __func__, ssh_err(ret));
-}
-
-void *
-buffer_append_space(Buffer *buffer, u_int len)
-{
-	int ret;
-	u_char *p;
-
-	if ((ret = sshbuf_reserve(buffer, len, &p)) != 0)
-		fatal("%s: %s", __func__, ssh_err(ret));
-	return p;
-}
-
-int
-buffer_check_alloc(Buffer *buffer, u_int len)
-{
-	int ret = sshbuf_check_reserve(buffer, len);
-
-	if (ret == 0)
-		return 1;
-	if (ret == SSH_ERR_NO_BUFFER_SPACE)
-		return 0;
-	fatal("%s: %s", __func__, ssh_err(ret));
-}
-
-int
-buffer_get_ret(Buffer *buffer, void *buf, u_int len)
-{
-	int ret;
-
-	if ((ret = sshbuf_get(buffer, buf, len)) != 0) {
-		error("%s: %s", __func__, ssh_err(ret));
-		return -1;
-	}
-	return 0;
-}
-
-void
-buffer_get(Buffer *buffer, void *buf, u_int len)
-{
-	if (buffer_get_ret(buffer, buf, len) == -1)
-		fatal("%s: buffer error", __func__);
-}
-
-int
-buffer_consume_ret(Buffer *buffer, u_int bytes)
-{
-	int ret = sshbuf_consume(buffer, bytes);
-
-	if (ret == 0)
-		return 0;
-	if (ret == SSH_ERR_MESSAGE_INCOMPLETE)
-		return -1;
-	fatal("%s: %s", __func__, ssh_err(ret));
-}
-
-void
-buffer_consume(Buffer *buffer, u_int bytes)
-{
-	if (buffer_consume_ret(buffer, bytes) == -1)
-		fatal("%s: buffer error", __func__);
-}
-
-int
-buffer_consume_end_ret(Buffer *buffer, u_int bytes)
-{
-	int ret = sshbuf_consume_end(buffer, bytes);
-
-	if (ret == 0)
-		return 0;
-	if (ret == SSH_ERR_MESSAGE_INCOMPLETE)
-		return -1;
-	fatal("%s: %s", __func__, ssh_err(ret));
-}
-
-void
-buffer_consume_end(Buffer *buffer, u_int bytes)
-{
-	if (buffer_consume_end_ret(buffer, bytes) == -1)
-		fatal("%s: buffer error", __func__);
-}
-
-
-- 
cgit v1.2.3