[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.1 and 1.5

version 1.1, 1999/09/26 20:53:33 version 1.5, 1999/11/23 22:25:52
Line 18 
Line 18 
 RCSID("$Id$");  RCSID("$Id$");
   
 #include "ssh.h"  #include "ssh.h"
 #include "gmp.h"  #include <ssl/bn.h>
 #include "bufaux.h"  #include "bufaux.h"
 #include "xmalloc.h"  #include "xmalloc.h"
 #include "getput.h"  #include "getput.h"
   
 /* Stores an MP_INT 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
    by (bits+7)/8 bytes of binary data, msb first. */     by (bits+7)/8 bytes of binary data, msb first. */
   
 void buffer_put_mp_int(Buffer *buffer, MP_INT *value)  void
   buffer_put_bignum(Buffer *buffer, BIGNUM *value)
 {  {
   int bits = mpz_sizeinbase(value, 2);          int bits = BN_num_bits(value);
   int hex_size = mpz_sizeinbase(value, 16);          int bin_size = (bits + 7) / 8;
   char *buf = xmalloc(hex_size + 2);          char *buf = xmalloc(bin_size);
   int i, oi, byte;          int oi;
   char msg[2];          char msg[2];
   
   /* Get the value of the number in hex.  Too bad that gmp does not allow  
      us to get it in binary. */  
   mpz_get_str(buf, 16, value);  
   
   /* i is "input index", oi is "output index".  Both point to the same array,          /* Get the value of in binary */
      and start from the beginning.  "input index" moves twice as fast. */          oi = BN_bn2bin(value, buf);
   i = 0;          if (oi != bin_size)
   oi = 0;                  fatal("buffer_put_bignum: BN_bn2bin() failed: oi %d != bin_size %d",
   /* Check for an odd number of hex digits.  Process the odd digit                        oi, bin_size);
      separately. */  
   if (hex_size & 1)  
     {  
       sscanf(buf, "%1x", &byte);  
       buf[oi++] = byte;  
       i = 1;  
     }  
   
   /* Convert the hex number into binary representation. */          /* Store the number of bits in the buffer in two bytes, msb first. */
   for (; i < hex_size; i += 2)          PUT_16BIT(msg, bits);
     {          buffer_append(buffer, msg, 2);
       sscanf(buf + i, "%2x", &byte);          /* Store the binary data. */
       buf[oi++] = byte;          buffer_append(buffer, buf, oi);
     }          /* Clear the temporary data. */
           memset(buf, 0, bin_size);
   assert(oi == ((bits + 7) / 8));          xfree(buf);
   /* Store the number of bits in the buffer in two bytes, msb first. */  
   PUT_16BIT(msg, bits);  
   buffer_append(buffer, msg, 2);  
   /* Store the binary data. */  
   buffer_append(buffer, buf, oi);  
   /* Clear the temporary data. */  
   memset(buf, 0, hex_size);  
   xfree(buf);  
 }  }
   
 /* Retrieves an MP_INT from the buffer. */  /* Retrieves an BIGNUM from the buffer. */
   
 int buffer_get_mp_int(Buffer *buffer, MP_INT *value)  int
   buffer_get_bignum(Buffer *buffer, BIGNUM *value)
 {  {
   int i, bits, bytes;          int bits, bytes;
   char *hex;          unsigned char buf[2], *bin;
   unsigned char buf[2];  
   
   /* Get the number for bits. */          /* Get the number for bits. */
   buffer_get(buffer, (char *)buf, 2);          buffer_get(buffer, (char *) buf, 2);
   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;
   /* Allocate space for a corresponding hex string. */          if (buffer_len(buffer) < bytes)
   hex = xmalloc(2 * bytes + 1);                  fatal("buffer_get_bignum: input buffer too small");
           bin = buffer_ptr(buffer);
   /* Read and convert the binary bytes into a hex string. */          BN_bin2bn(bin, bytes, value);
   for (i = 0; i < bytes; i++)          buffer_consume(buffer, bytes);
     {  
       unsigned char byte;          return 2 + bytes;
       buffer_get(buffer, (char *)&byte, 1);  
       sprintf(hex + 2 * i, "%02x", byte);  
     }  
   /* Read the hex string into a mp-int. */  
   mpz_set_str(value, hex, 16);  
   /* Free the string. */  
   xfree(hex);  
   return 2 + bytes;  
 }  }
   
 /* Returns an integer from the buffer (4 bytes, msb first). */  /* Returns an integer from the buffer (4 bytes, msb first). */
   
 unsigned int buffer_get_int(Buffer *buffer)  unsigned int
   buffer_get_int(Buffer *buffer)
 {  {
   unsigned char buf[4];          unsigned char buf[4];
   buffer_get(buffer, (char *)buf, 4);          buffer_get(buffer, (char *) buf, 4);
   return GET_32BIT(buf);          return GET_32BIT(buf);
 }  }
   
 /* Stores an integer in the buffer in 4 bytes, msb first. */  /* Stores an integer in the buffer in 4 bytes, msb first. */
   
 void buffer_put_int(Buffer *buffer, unsigned int value)  void
   buffer_put_int(Buffer *buffer, unsigned 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);
 }  }
   
 /* Returns an arbitrary binary string from the buffer.  The string cannot  /* Returns an arbitrary binary string from the buffer.  The string cannot
Line 124 
Line 100 
    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 *buffer_get_string(Buffer *buffer, unsigned int *length_ptr)  char *
   buffer_get_string(Buffer *buffer, unsigned int *length_ptr)
 {  {
   unsigned int len;          unsigned int len;
   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)
     fatal("Received packet with 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. */
   buffer_get(buffer, value, len);          buffer_get(buffer, value, len);
   /* Append a null character to make processing easier. */          /* Append a null character to make processing easier. */
   value[len] = 0;          value[len] = 0;
   /* Optionally return the length of the string. */          /* Optionally return the length of the string. */
   if (length_ptr)          if (length_ptr)
     *length_ptr = len;                  *length_ptr = len;
   return value;          return value;
 }  }
   
 /* Stores and arbitrary binary string in the buffer. */  /* Stores and arbitrary binary string in the buffer. */
   
 void buffer_put_string(Buffer *buffer, const void *buf, unsigned int len)  void
   buffer_put_string(Buffer *buffer, const void *buf, unsigned int len)
 {  {
   buffer_put_int(buffer, len);          buffer_put_int(buffer, len);
   buffer_append(buffer, buf, len);          buffer_append(buffer, buf, len);
 }  }
   
 /* Returns a character from the buffer (0 - 255). */  /* Returns a character from the buffer (0 - 255). */
   
 int buffer_get_char(Buffer *buffer)  int
   buffer_get_char(Buffer *buffer)
 {  {
   char ch;          char ch;
   buffer_get(buffer, &ch, 1);          buffer_get(buffer, &ch, 1);
   return (unsigned char)ch;          return (unsigned char) ch;
 }  }
   
 /* Stores a character in the buffer. */  /* Stores a character in the buffer. */
   
 void buffer_put_char(Buffer *buffer, int value)  void
   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.1  
changed lines
  Added in v.1.5