===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/Attic/bufaux.c,v
retrieving revision 1.17.2.2
retrieving revision 1.23
diff -u -r1.17.2.2 -r1.23
--- src/usr.bin/ssh/Attic/bufaux.c	2002/04/22 19:56:41	1.17.2.2
+++ src/usr.bin/ssh/Attic/bufaux.c	2002/03/18 17:25:29	1.23
@@ -37,7 +37,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: bufaux.c,v 1.17.2.2 2002/04/22 19:56:41 miod Exp $");
+RCSID("$OpenBSD: bufaux.c,v 1.23 2002/03/18 17:25:29 provos Exp $");
 
 #include <openssl/bn.h>
 #include "bufaux.h"
@@ -137,17 +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)
 {
@@ -165,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];
@@ -232,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));
 }