[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.4.4 and 1.18

version 1.17.4.4, 2002/06/26 18:22:34 version 1.18, 2001/12/05 10:06:12
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.
  */   */
 void  int
 buffer_get_bignum(Buffer *buffer, BIGNUM *value)  buffer_get_bignum(Buffer *buffer, BIGNUM *value)
 {  {
         int bits, bytes;          int bits, bytes;
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 = (u_char *) 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 107 
Line 107 
         u_char *buf = xmalloc(bytes);          u_char *buf = xmalloc(bytes);
         int oi;          int oi;
         int hasnohigh = 0;          int hasnohigh = 0;
   
         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_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 131 
Line 130 
         xfree(buf);          xfree(buf);
 }  }
   
 /* XXX does not handle negative BNs */  int
 void  
 buffer_get_bignum2(Buffer *buffer, BIGNUM *value)  buffer_get_bignum2(Buffer *buffer, BIGNUM *value)
 {  {
         u_int len;          /**XXX should be two's-complement */
         u_char *bin = buffer_get_string(buffer, &len);          int len;
           u_char *bin = (u_char *)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);
           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  u_int
 buffer_get_int(Buffer *buffer)  buffer_get_int(Buffer *buffer)
 {  {
         u_char buf[4];          u_char buf[4];
   
         buffer_get(buffer, (char *) buf, 4);          buffer_get(buffer, (char *) buf, 4);
         return GET_32BIT(buf);          return GET_32BIT(buf);
 }  }
Line 169 
Line 156 
 buffer_get_int64(Buffer *buffer)  buffer_get_int64(Buffer *buffer)
 {  {
         u_char buf[8];          u_char buf[8];
   
         buffer_get(buffer, (char *) buf, 8);          buffer_get(buffer, (char *) buf, 8);
         return GET_64BIT(buf);          return GET_64BIT(buf);
 }  }
   
 /*  /*
  * Stores integers in the buffer, msb first.   * Stores an integer in the buffer in 4 bytes, 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];
   
         PUT_32BIT(buf, value);          PUT_32BIT(buf, value);
         buffer_append(buffer, buf, 4);          buffer_append(buffer, buf, 4);
 }  }
Line 199 
Line 175 
 buffer_put_int64(Buffer *buffer, u_int64_t value)  buffer_put_int64(Buffer *buffer, u_int64_t value)
 {  {
         char buf[8];          char buf[8];
   
         PUT_64BIT(buf, value);          PUT_64BIT(buf, value);
         buffer_append(buffer, buf, 8);          buffer_append(buffer, buf, 8);
 }  }
Line 212 
Line 187 
  * 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.
  */   */
 void *  char *
 buffer_get_string(Buffer *buffer, u_int *length_ptr)  buffer_get_string(Buffer *buffer, u_int *length_ptr)
 {  {
         u_char *value;  
         u_int len;          u_int len;
           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("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. */          /* 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 246 
Line 220 
 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));
 }  }
   
Line 258 
Line 230 
 buffer_get_char(Buffer *buffer)  buffer_get_char(Buffer *buffer)
 {  {
         char ch;          char ch;
   
         buffer_get(buffer, &ch, 1);          buffer_get(buffer, &ch, 1);
         return (u_char) ch;          return (u_char) ch;
 }  }
Line 270 
Line 241 
 buffer_put_char(Buffer *buffer, int value)  buffer_put_char(Buffer *buffer, int value)
 {  {
         char ch = value;          char ch = value;
   
         buffer_append(buffer, &ch, 1);          buffer_append(buffer, &ch, 1);
 }  }
Legend:
Removed from v.1.17.4.4  
changed lines
  Added in v.1.18