===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/Attic/bufaux.c,v
retrieving revision 1.17.2.3
retrieving revision 1.18
diff -u -r1.17.2.3 -r1.18
--- src/usr.bin/ssh/Attic/bufaux.c	2002/06/02 22:56:09	1.17.2.3
+++ src/usr.bin/ssh/Attic/bufaux.c	2001/12/05 10:06:12	1.18
@@ -37,7 +37,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: bufaux.c,v 1.17.2.3 2002/06/02 22:56:09 miod Exp $");
+RCSID("$OpenBSD: bufaux.c,v 1.18 2001/12/05 10:06:12 deraadt Exp $");
 
 #include <openssl/bn.h>
 #include "bufaux.h"
@@ -62,7 +62,7 @@
 	oi = BN_bn2bin(value, buf);
 	if (oi != bin_size)
 		fatal("buffer_put_bignum: BN_bn2bin() failed: oi %d != bin_size %d",
-		    oi, bin_size);
+		      oi, bin_size);
 
 	/* Store the number of bits in the buffer in two bytes, msb first. */
 	PUT_16BIT(msg, bits);
@@ -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;
 }
 
 /*
@@ -110,14 +112,14 @@
 	oi = BN_bn2bin(value, buf+1);
 	if (oi != bytes-1)
 		fatal("buffer_put_bignum: BN_bn2bin() failed: oi %d != bin_size %d",
-		    oi, bytes);
+		      oi, bytes);
 	hasnohigh = (buf[1] & 0x80) ? 0 : 1;
 	if (value->neg) {
 		/**XXX should be two's-complement */
 		int i, carry;
 		u_char *uc = buf;
 		log("negativ!");
-		for (i = bytes-1, carry = 1; i>=0; i--) {
+		for(i = bytes-1, carry = 1; i>=0; i--) {
 			uc[i] ^= 0xff;
 			if (carry)
 				carry = !++uc[i];
@@ -128,27 +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)
 {
@@ -166,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];
@@ -200,15 +187,15 @@
  * 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)
-		fatal("buffer_get_string: bad string length %d", len);
+		fatal("Received packet with 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,8 +220,6 @@
 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));
 }