===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/Attic/bufaux.c,v
retrieving revision 1.17.2.2
retrieving revision 1.19
diff -u -r1.17.2.2 -r1.19
--- src/usr.bin/ssh/Attic/bufaux.c	2002/04/22 19:56:41	1.17.2.2
+++ src/usr.bin/ssh/Attic/bufaux.c	2001/12/19 07:18:56	1.19
@@ -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.19 2001/12/19 07:18:56 deraadt Exp $");
 
 #include <openssl/bn.h>
 #include "bufaux.h"
@@ -77,7 +77,7 @@
 /*
  * Retrieves an BIGNUM from the buffer.
  */
-void
+int
 buffer_get_bignum(Buffer *buffer, BIGNUM *value)
 {
 	int bits, bytes;
@@ -90,9 +90,11 @@
 	bytes = (bits + 7) / 8;
 	if (buffer_len(buffer) < bytes)
 		fatal("buffer_get_bignum: input buffer too small");
-	bin = buffer_ptr(buffer);
+	bin = (u_char *) buffer_ptr(buffer);
 	BN_bin2bn(bin, bytes, value);
 	buffer_consume(buffer, bytes);
+
+	return 2 + bytes;
 }
 
 /*
@@ -128,26 +130,20 @@
 	xfree(buf);
 }
 
-void
+int
 buffer_get_bignum2(Buffer *buffer, BIGNUM *value)
 {
 	/**XXX should be two's-complement */
 	int len;
-	u_char *bin = buffer_get_string(buffer, (u_int *)&len);
+	u_char *bin = (u_char *)buffer_get_string(buffer, (u_int *)&len);
 	BN_bin2bn(bin, len, value);
 	xfree(bin);
+	return len;
 }
+
 /*
- * 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 +161,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];
@@ -199,11 +187,11 @@
  * will be stored there.  A null character will be automatically appended
  * to the returned string, and is not counted in length.
  */
-void *
+char *
 buffer_get_string(Buffer *buffer, u_int *length_ptr)
 {
 	u_int len;
-	u_char *value;
+	char *value;
 	/* Get the length. */
 	len = buffer_get_int(buffer);
 	if (len > 256 * 1024)