[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.17 and 1.17.4.3

version 1.17, 2001/01/21 19:05:45 version 1.17.4.3, 2002/05/17 00:03:23
Line 62 
Line 62 
         oi = BN_bn2bin(value, buf);          oi = BN_bn2bin(value, buf);
         if (oi != bin_size)          if (oi != bin_size)
                 fatal("buffer_put_bignum: BN_bn2bin() failed: oi %d != bin_size %d",                  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. */          /* Store the number of bits in the buffer in two bytes, msb first. */
         PUT_16BIT(msg, bits);          PUT_16BIT(msg, bits);
Line 77 
Line 77 
 /*  /*
  * Retrieves an BIGNUM from the buffer.   * Retrieves an BIGNUM from the buffer.
  */   */
 int  void
 buffer_get_bignum(Buffer *buffer, BIGNUM *value)  buffer_get_bignum(Buffer *buffer, BIGNUM *value)
 {  {
         int bits, bytes;          int bits, bytes;
Line 90 
Line 90 
         bytes = (bits + 7) / 8;          bytes = (bits + 7) / 8;
         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 = (u_char *) buffer_ptr(buffer);          bin = buffer_ptr(buffer);
         BN_bin2bn(bin, bytes, value);          BN_bin2bn(bin, bytes, value);
         buffer_consume(buffer, bytes);          buffer_consume(buffer, bytes);
   
         return 2 + bytes;  
 }  }
   
 /*  /*
Line 112 
Line 110 
         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_bignum: BN_bn2bin() failed: oi %d != bin_size %d",
                       oi, bytes);                      oi, bytes);
         hasnohigh = (buf[1] & 0x80) ? 0 : 1;          hasnohigh = (buf[1] & 0x80) ? 0 : 1;
         if (value->neg) {          if (value->neg) {
                 /**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!");                  log("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)
                                 carry = !++uc[i];                                  carry = !++uc[i];
                 }                  }
         }          }
Line 130 
Line 128 
         xfree(buf);          xfree(buf);
 }  }
   
 int  void
 buffer_get_bignum2(Buffer *buffer, BIGNUM *value)  buffer_get_bignum2(Buffer *buffer, BIGNUM *value)
 {  {
         /**XXX should be two's-complement */          /**XXX should be two's-complement */
         int len;          int len;
         u_char *bin = (u_char *)buffer_get_string(buffer, (u_int *)&len);          u_char *bin = buffer_get_string(buffer, (u_int *)&len);
         BN_bin2bn(bin, len, value);          BN_bin2bn(bin, len, value);
         xfree(bin);          xfree(bin);
         return len;  
 }  }
   
 /*  /*
  * Returns an integer from the buffer (4 bytes, msb first).   * Returns integers from the buffer (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  u_int
 buffer_get_int(Buffer *buffer)  buffer_get_int(Buffer *buffer)
 {  {
Line 161 
Line 166 
 }  }
   
 /*  /*
  * Stores an integer in the buffer in 4 bytes, msb first.   * Stores integers in the buffer, msb first.
  */   */
 void  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)  buffer_put_int(Buffer *buffer, u_int value)
 {  {
         char buf[4];          char buf[4];
Line 187 
Line 200 
  * will be stored there.  A null character will be automatically appended   * will be stored there.  A null character will be automatically appended
  * to the returned string, and is not counted in length.   * to the returned string, and is not counted in length.
  */   */
 char *  void *
 buffer_get_string(Buffer *buffer, u_int *length_ptr)  buffer_get_string(Buffer *buffer, u_int *length_ptr)
 {  {
         u_int len;          u_int len;
         char *value;          u_char *value;
         /* 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("Received packet with bad string length %d", len);                  fatal("buffer_get_string: bad string length %d", 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. */
Line 220 
Line 233 
 void  void
 buffer_put_cstring(Buffer *buffer, const char *s)  buffer_put_cstring(Buffer *buffer, const char *s)
 {  {
           if (s == NULL)
                   fatal("buffer_put_cstring: s == NULL");
         buffer_put_string(buffer, s, strlen(s));          buffer_put_string(buffer, s, strlen(s));
 }  }
   
Legend:
Removed from v.1.17  
changed lines
  Added in v.1.17.4.3