[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.13.2.6 and 1.14

version 1.13.2.6, 2002/03/08 17:04:42 version 1.14, 2000/12/19 23:17:55
Line 39 
Line 39 
 #include "includes.h"  #include "includes.h"
 RCSID("$OpenBSD$");  RCSID("$OpenBSD$");
   
   #include "ssh.h"
 #include <openssl/bn.h>  #include <openssl/bn.h>
 #include "bufaux.h"  #include "bufaux.h"
 #include "xmalloc.h"  #include "xmalloc.h"
 #include "getput.h"  #include "getput.h"
 #include "log.h"  
   
 /*  /*
  * Stores an BIGNUM in the buffer with a 2-byte msb first bit count, followed   * Stores an BIGNUM in the buffer with a 2-byte msb first bit count, followed
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 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 = 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 110 
Line 112 
         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 128 
Line 130 
         xfree(buf);          xfree(buf);
 }  }
   
 void  int
 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 = buffer_get_string(buffer, (u_int *)&len);          u_char *bin = (u_char *)buffer_get_string(buffer, (u_int *)&len);
         BN_bin2bn(bin, len, value);          BN_bin2bn(bin, len, value);
         xfree(bin);          xfree(bin);
           return len;
 }  }
   
 /*  /*
Line 149 
Line 152 
         return GET_32BIT(buf);          return GET_32BIT(buf);
 }  }
   
 u_int64_t  
 buffer_get_int64(Buffer *buffer)  
 {  
         u_char buf[8];  
         buffer_get(buffer, (char *) buf, 8);  
         return GET_64BIT(buf);  
 }  
   
 /*  /*
  * Stores an integer in the buffer in 4 bytes, msb first.   * Stores an integer in the buffer in 4 bytes, msb first.
  */   */
Line 168 
Line 163 
         buffer_append(buffer, buf, 4);          buffer_append(buffer, buf, 4);
 }  }
   
 void  
 buffer_put_int64(Buffer *buffer, u_int64_t value)  
 {  
         char buf[8];  
         PUT_64BIT(buf, value);  
         buffer_append(buffer, buf, 8);  
 }  
   
 /*  /*
  * Returns an arbitrary binary string from the buffer.  The string cannot   * Returns an arbitrary binary string from the buffer.  The string cannot
  * be longer than 256k.  The returned value points to memory allocated   * be longer than 256k.  The returned value points to memory allocated
Line 184 
Line 171 
  * 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_int len;          u_int len;
         u_char *value;          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)
Legend:
Removed from v.1.13.2.6  
changed lines
  Added in v.1.14