Import of OpenSSH 3.8p1

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

diff --git a/openssh/bufaux.c b/openssh/bufaux.c
index 37cc27ff64b2cf8e28144f7b5feb6626c5888b91..bf148316d10be51202df8d6ebc0c086d5a92aec5 100644 (file)
--- a/openssh/bufaux.c
+++ b/openssh/bufaux.c
@@ -37,7 +37,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: bufaux.c,v 1.29 2003/04/08 20:21:28 itojun Exp $");
+RCSID("$OpenBSD: bufaux.c,v 1.32 2004/02/23 15:12:46 markus Exp $");
 
 #include <openssl/bn.h>
 #include "bufaux.h"
@@ -50,7 +50,7 @@ RCSID("$OpenBSD: bufaux.c,v 1.29 2003/04/08 20:21:28 itojun Exp $");
  * by (bits+7)/8 bytes of binary data, msb first.
  */
 void
-buffer_put_bignum(Buffer *buffer, BIGNUM *value)
+buffer_put_bignum(Buffer *buffer, const BIGNUM *value)
 {
        int bits = BN_num_bits(value);
        int bin_size = (bits + 7) / 8;
@@ -80,7 +80,7 @@ buffer_put_bignum(Buffer *buffer, BIGNUM *value)
 void
 buffer_get_bignum(Buffer *buffer, BIGNUM *value)
 {
-       int bits, bytes;
+       u_int bits, bytes;
        u_char buf[2], *bin;
 
        /* Get the number for bits. */
@@ -101,48 +101,49 @@ buffer_get_bignum(Buffer *buffer, BIGNUM *value)
  * Stores an BIGNUM in the buffer in SSH2 format.
  */
 void
-buffer_put_bignum2(Buffer *buffer, BIGNUM *value)
+buffer_put_bignum2(Buffer *buffer, const BIGNUM *value)
 {
-       int bytes = BN_num_bytes(value) + 1;
-       u_char *buf = xmalloc(bytes);
+       u_int bytes;
+       u_char *buf;
        int oi;
-       int hasnohigh = 0;
+       u_int hasnohigh = 0;
 
+       if (BN_is_zero(value)) {
+               buffer_put_int(buffer, 0);
+               return;
+       }
+       if (value->neg)
+               fatal("buffer_put_bignum2: negative numbers not supported");
+       bytes = BN_num_bytes(value) + 1; /* extra padding byte */
+       if (bytes < 2)
+               fatal("buffer_put_bignum2: BN too small");
+       buf = xmalloc(bytes);
        buf[0] = '\0';
        /* Get the value of in binary */
        oi = BN_bn2bin(value, buf+1);
        if (oi != bytes-1)
-               fatal("buffer_put_bignum: BN_bn2bin() failed: oi %d != bin_size %d",
-                   oi, bytes);
+               fatal("buffer_put_bignum2: BN_bn2bin() failed: "
+                   "oi %d != bin_size %d", oi, bytes);
        hasnohigh = (buf[1] & 0x80) ? 0 : 1;
-       if (value->neg) {
-               /**XXX should be two's-complement */
-               int i, carry;
-               u_char *uc = buf;
-               logit("negativ!");
-               for (i = bytes-1, carry = 1; i>=0; i--) {
-                       uc[i] ^= 0xff;
-                       if (carry)
-                               carry = !++uc[i];
-               }
-       }
        buffer_put_string(buffer, buf+hasnohigh, bytes-hasnohigh);
        memset(buf, 0, bytes);
        xfree(buf);
 }
 
-/* XXX does not handle negative BNs */
 void
 buffer_get_bignum2(Buffer *buffer, BIGNUM *value)
 {
        u_int len;
        u_char *bin = buffer_get_string(buffer, &len);
 
+       if (len > 0 && (bin[0] & 0x80))
+               fatal("buffer_get_bignum2: negative numbers not supported");
        if (len > 8 * 1024)
                fatal("buffer_get_bignum2: cannot handle BN of size %d", len);
        BN_bin2bn(bin, len, value);
        xfree(bin);
 }
+
 /*
  * Returns integers from the buffer (msb first).
  */