[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.5 and 1.10

version 1.5, 1999/11/23 22:25:52 version 1.10, 2000/04/12 09:39:10
Line 1 
Line 1 
 /*  /*
    *
    * bufaux.c
    *
    * Author: Tatu Ylonen <ylo@cs.hut.fi>
    *
    * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
    *                    All rights reserved
    *
    * Created: Wed Mar 29 02:24:47 1995 ylo
    *
    * Auxiliary functions for storing and retrieving various data types to/from
    * Buffers.
    *
    * SSH2 packet format added by Markus Friedl
    *
    */
   
 bufaux.c  
   
 Author: Tatu Ylonen <ylo@cs.hut.fi>  
   
 Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland  
                    All rights reserved  
   
 Created: Wed Mar 29 02:24:47 1995 ylo  
   
 Auxiliary functions for storing and retrieving various data types to/from  
 Buffers.  
   
 */  
   
 #include "includes.h"  #include "includes.h"
 RCSID("$Id$");  RCSID("$Id$");
   
 #include "ssh.h"  #include "ssh.h"
 #include <ssl/bn.h>  #include <openssl/bn.h>
 #include "bufaux.h"  #include "bufaux.h"
 #include "xmalloc.h"  #include "xmalloc.h"
 #include "getput.h"  #include "getput.h"
   
 /* 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. */   * 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.
    */
 void  void
 buffer_put_bignum(Buffer *buffer, BIGNUM *value)  buffer_put_bignum(Buffer *buffer, BIGNUM *value)
 {  {
         int bits = BN_num_bits(value);          int bits = BN_num_bits(value);
         int bin_size = (bits + 7) / 8;          int bin_size = (bits + 7) / 8;
         char *buf = xmalloc(bin_size);          char unsigned *buf = xmalloc(bin_size);
         int oi;          int oi;
         char msg[2];          char msg[2];
   
Line 45 
Line 48 
         PUT_16BIT(msg, bits);          PUT_16BIT(msg, bits);
         buffer_append(buffer, msg, 2);          buffer_append(buffer, msg, 2);
         /* Store the binary data. */          /* Store the binary data. */
         buffer_append(buffer, buf, oi);          buffer_append(buffer, (char *)buf, oi);
         /* Clear the temporary data. */  
         memset(buf, 0, bin_size);          memset(buf, 0, bin_size);
         xfree(buf);          xfree(buf);
 }  }
   
 /* Retrieves an BIGNUM from the buffer. */  /*
    * Retrieves an BIGNUM from the buffer.
    */
 int  int
 buffer_get_bignum(Buffer *buffer, BIGNUM *value)  buffer_get_bignum(Buffer *buffer, BIGNUM *value)
 {  {
Line 66 
Line 70 
         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 = (unsigned 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;          return 2 + bytes;
 }  }
   
 /* Returns an integer from the buffer (4 bytes, msb first). */  /*
    * Stores an BIGNUM in the buffer in SSH2 format.
    */
   void
   buffer_put_bignum2(Buffer *buffer, BIGNUM *value)
   {
           int bytes = BN_num_bytes(value) + 1;
           unsigned char *buf = xmalloc(bytes);
           int oi;
           int hasnohigh = 0;
           buf[0] = '\0';
           /* Get the value of in binary */
           oi = BN_bn2bin(value, buf+1);
           if (oi != bytes-1)
                   fatal("buffer_put_bignum: BN_bn2bin() failed: oi %d != bin_size %d",
                         oi, bytes);
           hasnohigh = (buf[1] & 0x80) ? 0 : 1;
           if (value->neg) {
                   /**XXX should be two's-complement */
                   int i, carry;
                   unsigned char *uc = buf;
                   log("negativ!");
                   for(i = bytes-1, carry = 1; i>=0; i--) {
                           uc[i] ^= 0xff;
                           if(carry)
                                   carry = !++uc[i];
                   }
           }
           buffer_put_string(buffer, buf+hasnohigh, bytes-hasnohigh);
           memset(buf, 0, bytes);
           xfree(buf);
   }
   
   int
   buffer_get_bignum2(Buffer *buffer, BIGNUM *value)
   {
           /**XXX should be two's-complement */
           int len;
           unsigned char *bin = (unsigned char *)buffer_get_string(buffer, (unsigned int *)&len);
           BN_bin2bn(bin, len, value);
           xfree(bin);
           return len;
   }
   
   /*
    * Returns an integer from the buffer (4 bytes, msb first).
    */
 unsigned int  unsigned int
 buffer_get_int(Buffer *buffer)  buffer_get_int(Buffer *buffer)
 {  {
Line 83 
Line 132 
         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  void
 buffer_put_int(Buffer *buffer, unsigned int value)  buffer_put_int(Buffer *buffer, unsigned int value)
 {  {
Line 93 
Line 143 
         buffer_append(buffer, buf, 4);          buffer_append(buffer, buf, 4);
 }  }
   
 /* Returns an arbitrary binary string from the buffer.  The string cannot  /*
    be longer than 256k.  The returned value points to memory allocated   * Returns an arbitrary binary string from the buffer.  The string cannot
    with xmalloc; it is the responsibility of the calling function to free   * be longer than 256k.  The returned value points to memory allocated
    the data.  If length_ptr is non-NULL, the length of the returned data   * with xmalloc; it is the responsibility of the calling function to free
    will be stored there.  A null character will be automatically appended   * the data.  If length_ptr is non-NULL, the length of the returned data
    to the returned string, and is not counted in length. */   * will be stored there.  A null character will be automatically appended
    * to the returned string, and is not counted in length.
    */
 char *  char *
 buffer_get_string(Buffer *buffer, unsigned int *length_ptr)  buffer_get_string(Buffer *buffer, unsigned int *length_ptr)
 {  {
Line 121 
Line 172 
         return value;          return value;
 }  }
   
 /* Stores and arbitrary binary string in the buffer. */  /*
    * Stores and arbitrary binary string in the buffer.
    */
 void  void
 buffer_put_string(Buffer *buffer, const void *buf, unsigned int len)  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);
 }  }
   void
   buffer_put_cstring(Buffer *buffer, const char *s)
   {
           buffer_put_string(buffer, s, strlen(s));
   }
   
 /* Returns a character from the buffer (0 - 255). */  /*
    * Returns a character from the buffer (0 - 255).
    */
 int  int
 buffer_get_char(Buffer *buffer)  buffer_get_char(Buffer *buffer)
 {  {
Line 140 
Line 198 
         return (unsigned char) ch;          return (unsigned char) ch;
 }  }
   
 /* Stores a character in the buffer. */  /*
    * Stores a character in the buffer.
    */
 void  void
 buffer_put_char(Buffer *buffer, int value)  buffer_put_char(Buffer *buffer, int value)
 {  {
Legend:
Removed from v.1.5  
changed lines
  Added in v.1.10