The man2html from jbasney on pkilab2 works whereas the standard one doesn't.

[gssapi-openssh.git] / openssh / bufaux.c

diff --git a/openssh/bufaux.c b/openssh/bufaux.c
index 79f8bbd49667f528e6f56d39459c51573a4a2e57..b17256db66b1b37fe0ea34d9cc9c7a42af5f2b3d 100644 (file)
--- a/openssh/bufaux.c
+++ b/openssh/bufaux.c
@@ -37,7 +37,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: bufaux.c,v 1.25 2002/04/20 09:14:58 markus Exp $");
+RCSID("$OpenBSD: bufaux.c,v 1.17 2001/01/21 19:05:45 markus Exp $");
 
 #include <openssl/bn.h>
 #include "bufaux.h"
@@ -62,7 +62,7 @@ buffer_put_bignum(Buffer *buffer, BIGNUM *value)
        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 @@ buffer_put_bignum(Buffer *buffer, BIGNUM *value)
 /*
  * Retrieves an BIGNUM from the buffer.
  */
-void
+int
 buffer_get_bignum(Buffer *buffer, BIGNUM *value)
 {
        int bits, bytes;
@@ -90,9 +90,11 @@ buffer_get_bignum(Buffer *buffer, BIGNUM *value)
        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,16 +112,16 @@ buffer_put_bignum2(Buffer *buffer, BIGNUM *value)
        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)
+                       if(carry)
                                carry = !++uc[i];
                }
        }
@@ -128,27 +130,20 @@ buffer_put_bignum2(Buffer *buffer, BIGNUM *value)
        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)
 {
@@ -168,16 +163,8 @@ buffer_get_int64(Buffer *buffer)
 #endif
 
 /*
- * 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)
 {
@@ -204,15 +191,15 @@ buffer_put_int64(Buffer *buffer, u_int64_t value)
  * 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. */
@@ -237,8 +224,6 @@ buffer_put_string(Buffer *buffer, const void *buf, u_int len)
 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));
 }