[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.28.2.1 and 1.28.2.2

version 1.28.2.1, 2003/09/16 20:50:42 version 1.28.2.2, 2004/03/04 18:18:15
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 101 
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;
         u_char *buf = xmalloc(bytes);          u_char *buf;
         int oi;          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';          buf[0] = '\0';
         /* Get the value of in binary */          /* Get the value of in binary */
         oi = BN_bn2bin(value, buf+1);          oi = BN_bn2bin(value, buf+1);
         if (oi != bytes-1)          if (oi != bytes-1)
                 fatal("buffer_put_bignum: BN_bn2bin() failed: oi %d != bin_size %d",                  fatal("buffer_put_bignum2: BN_bn2bin() failed: "
                     oi, bytes);                      "oi %d != bin_size %d", oi, bytes);
         hasnohigh = (buf[1] & 0x80) ? 0 : 1;          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);          buffer_put_string(buffer, buf+hasnohigh, bytes-hasnohigh);
         memset(buf, 0, bytes);          memset(buf, 0, bytes);
         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)
 {  {
         u_int len;          u_int len;
         u_char *bin = buffer_get_string(buffer, &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)          if (len > 8 * 1024)
                 fatal("buffer_get_bignum2: cannot handle BN of size %d", len);                  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);
 }  }
   
 /*  /*
  * Returns integers from the buffer (msb first).   * Returns integers from the buffer (msb first).
  */   */
Legend:
Removed from v.1.28.2.1  
changed lines
  Added in v.1.28.2.2