[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.14 and 1.19

version 1.14, 2000/12/19 23:17:55 version 1.19, 2001/12/19 07:18:56
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 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 = (u_char *) buffer_ptr(buffer);
         BN_bin2bn(bin, bytes, value);          BN_bin2bn(bin, bytes, value);
         buffer_consume(buffer, bytes);          buffer_consume(buffer, bytes);
   
Line 112 
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 152 
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 161 
Line 169 
         char buf[4];          char buf[4];
         PUT_32BIT(buf, value);          PUT_32BIT(buf, value);
         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);
 }  }
   
 /*  /*

Legend:
Removed from v.1.14  
changed lines
  Added in v.1.19