===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/Attic/bufaux.c,v
retrieving revision 1.17.4.2
retrieving revision 1.24
diff -u -r1.17.4.2 -r1.24
--- src/usr.bin/ssh/Attic/bufaux.c	2002/04/23 02:13:50	1.17.4.2
+++ src/usr.bin/ssh/Attic/bufaux.c	2002/03/26 15:23:40	1.24
@@ -37,7 +37,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: bufaux.c,v 1.17.4.2 2002/04/23 02:13:50 jason Exp $");
+RCSID("$OpenBSD: bufaux.c,v 1.24 2002/03/26 15:23:40 markus Exp $");
 
 #include <openssl/bn.h>
 #include "bufaux.h"
@@ -137,18 +137,10 @@
 	BN_bin2bn(bin, len, value);
 	xfree(bin);
 }
+
 /*
- * Returns integers from the buffer (msb first).
+ * Returns an integer from the buffer (4 bytes, msb first).
  */
-
-u_short
-buffer_get_short(Buffer *buffer)
-{
-	u_char buf[2];
-	buffer_get(buffer, (char *) buf, 2);
-	return GET_16BIT(buf);
-}
-
 u_int
 buffer_get_int(Buffer *buffer)
 {
@@ -166,17 +158,9 @@
 }
 
 /*
- * Stores integers in the buffer, msb first.
+ * Stores an integer in the buffer in 4 bytes, msb first.
  */
 void
-buffer_put_short(Buffer *buffer, u_short value)
-{
-	char buf[2];
-	PUT_16BIT(buf, value);
-	buffer_append(buffer, buf, 2);
-}
-
-void
 buffer_put_int(Buffer *buffer, u_int value)
 {
 	char buf[4];
@@ -208,7 +192,7 @@
 	/* Get the length. */
 	len = buffer_get_int(buffer);
 	if (len > 256 * 1024)
-		fatal("Received packet with bad string length %d", len);
+		fatal("buffer_get_string: bad string length %d", len);
 	/* Allocate space for the string.  Add one byte for a null character. */
 	value = xmalloc(len + 1);
 	/* Get the string. */
@@ -233,6 +217,8 @@
 void
 buffer_put_cstring(Buffer *buffer, const char *s)
 {
+	if (s == NULL)
+		fatal("buffer_put_cstring: s == NULL");
 	buffer_put_string(buffer, s, strlen(s));
 }