[BACK]Return to bufaux.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/Attic/bufaux.c between version 1.26 and 1.31

version 1.26, 2002/06/23 09:46:51 version 1.31, 2003/11/10 16:23:41
Line 50 
Line 50 
  * by (bits+7)/8 bytes of binary data, msb first.   * by (bits+7)/8 bytes of binary data, msb first.
  */   */
 void  void
 buffer_put_bignum(Buffer *buffer, BIGNUM *value)  buffer_put_bignum(Buffer *buffer, const BIGNUM *value)
 {  {
         int bits = BN_num_bits(value);          int bits = BN_num_bits(value);
         int bin_size = (bits + 7) / 8;          int bin_size = (bits + 7) / 8;
Line 80 
Line 80 
 void  void
 buffer_get_bignum(Buffer *buffer, BIGNUM *value)  buffer_get_bignum(Buffer *buffer, BIGNUM *value)
 {  {
         int bits, bytes;          u_int bits, bytes;
         u_char buf[2], *bin;          u_char buf[2], *bin;
   
         /* Get the number for bits. */          /* Get the number for bits. */
Line 88 
Line 88 
         bits = GET_16BIT(buf);          bits = GET_16BIT(buf);
         /* Compute the number of binary bytes that follow. */          /* Compute the number of binary bytes that follow. */
         bytes = (bits + 7) / 8;          bytes = (bits + 7) / 8;
           if (bytes > 8 * 1024)
                   fatal("buffer_get_bignum: cannot handle BN of size %d", bytes);
         if (buffer_len(buffer) < bytes)          if (buffer_len(buffer) < bytes)
                 fatal("buffer_get_bignum: input buffer too small");                  fatal("buffer_get_bignum: input buffer too small");
         bin = buffer_ptr(buffer);          bin = buffer_ptr(buffer);
Line 99 
Line 101 
  * Stores an BIGNUM in the buffer in SSH2 format.   * Stores an BIGNUM in the buffer in SSH2 format.
  */   */
 void  void
 buffer_put_bignum2(Buffer *buffer, BIGNUM *value)  buffer_put_bignum2(Buffer *buffer, const BIGNUM *value)
 {  {
         int bytes = BN_num_bytes(value) + 1;          u_int bytes = BN_num_bytes(value) + 1;
         u_char *buf = xmalloc(bytes);          u_char *buf = xmalloc(bytes);
         int oi;          int oi;
         int hasnohigh = 0;          u_int hasnohigh = 0;
   
         buf[0] = '\0';          buf[0] = '\0';
         /* Get the value of in binary */          /* Get the value of in binary */
Line 117 
Line 119 
                 /**XXX should be two's-complement */                  /**XXX should be two's-complement */
                 int i, carry;                  int i, carry;
                 u_char *uc = buf;                  u_char *uc = buf;
                 log("negativ!");                  logit("negativ!");
                 for (i = bytes-1, carry = 1; i>=0; i--) {                  for (i = bytes-1, carry = 1; i>=0; i--) {
                         uc[i] ^= 0xff;                          uc[i] ^= 0xff;
                         if (carry)                          if (carry)
Line 129 
Line 131 
         xfree(buf);          xfree(buf);
 }  }
   
   /* XXX does not handle negative BNs */
 void  void
 buffer_get_bignum2(Buffer *buffer, BIGNUM *value)  buffer_get_bignum2(Buffer *buffer, BIGNUM *value)
 {  {
         /**XXX should be two's-complement */          u_int len;
         int len;          u_char *bin = buffer_get_string(buffer, &len);
         u_char *bin = buffer_get_string(buffer, (u_int *)&len);  
   
           if (len > 8 * 1024)
                   fatal("buffer_get_bignum2: cannot handle BN of size %d", len);
         BN_bin2bn(bin, len, value);          BN_bin2bn(bin, len, value);
         xfree(bin);          xfree(bin);
 }  }
Line 217 
Line 221 
         /* Get the length. */          /* Get the length. */
         len = buffer_get_int(buffer);          len = buffer_get_int(buffer);
         if (len > 256 * 1024)          if (len > 256 * 1024)
                 fatal("buffer_get_string: bad string length %d", len);                  fatal("buffer_get_string: bad string length %u", len);
         /* Allocate space for the string.  Add one byte for a null character. */          /* Allocate space for the string.  Add one byte for a null character. */
         value = xmalloc(len + 1);          value = xmalloc(len + 1);
         /* Get the string. */          /* Get the string. */
Legend:
Removed from v.1.26  
changed lines
  Added in v.1.31