[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.10 and 1.30

version 1.10, 2000/04/12 09:39:10 version 1.30, 2003/09/18 13:02:21
Line 1 
Line 1 
 /*  /*
  *  
  * bufaux.c  
  *  
  * Author: Tatu Ylonen <ylo@cs.hut.fi>   * Author: Tatu Ylonen <ylo@cs.hut.fi>
  *  
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland   * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved   *                    All rights reserved
  *  
  * Created: Wed Mar 29 02:24:47 1995 ylo  
  *  
  * Auxiliary functions for storing and retrieving various data types to/from   * Auxiliary functions for storing and retrieving various data types to/from
  * Buffers.   * Buffers.
  *   *
    * As far as I am concerned, the code I have written for this software
    * can be used freely for any purpose.  Any derived versions of this
    * software must be clearly marked as such, and if the derived work is
    * incompatible with the protocol description in the RFC file, it must be
    * called by a name other than "ssh" or "Secure Shell".
    *
    *
  * SSH2 packet format added by Markus Friedl   * SSH2 packet format added by Markus Friedl
    * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *   *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
    * are met:
    * 1. Redistributions of source code must retain the above copyright
    *    notice, this list of conditions and the following disclaimer.
    * 2. Redistributions in binary form must reproduce the above copyright
    *    notice, this list of conditions and the following disclaimer in the
    *    documentation and/or other materials provided with the distribution.
    *
    * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
    * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
    * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
    * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
    * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
    * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
    * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
    * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
    * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
    * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */   */
   
 #include "includes.h"  #include "includes.h"
 RCSID("$Id$");  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 34 
Line 54 
 {  {
         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 unsigned *buf = xmalloc(bin_size);          u_char *buf = xmalloc(bin_size);
         int oi;          int oi;
         char msg[2];          char msg[2];
   
Line 42 
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 57 
Line 77 
 /*  /*
  * Retrieves an BIGNUM from the buffer.   * Retrieves an BIGNUM from the buffer.
  */   */
 int  void
 buffer_get_bignum(Buffer *buffer, BIGNUM *value)  buffer_get_bignum(Buffer *buffer, BIGNUM *value)
 {  {
         int bits, bytes;          u_int bits, bytes;
         unsigned char buf[2], *bin;          u_char buf[2], *bin;
   
         /* 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;
           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 = (unsigned char*) buffer_ptr(buffer);          bin = 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 83 
Line 103 
 void  void
 buffer_put_bignum2(Buffer *buffer, BIGNUM *value)  buffer_put_bignum2(Buffer *buffer, BIGNUM *value)
 {  {
         int bytes = BN_num_bytes(value) + 1;          u_int bytes = BN_num_bytes(value) + 1;
         unsigned char *buf = xmalloc(bytes);          u_char *buf = xmalloc(bytes);
         int oi;          int oi;
         int hasnohigh = 0;          u_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;
                 unsigned char *uc = buf;                  u_char *uc = buf;
                 log("negativ!");                  logit("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 110 
Line 131 
         xfree(buf);          xfree(buf);
 }  }
   
 int  /* XXX does not handle negative BNs */
   void
 buffer_get_bignum2(Buffer *buffer, BIGNUM *value)  buffer_get_bignum2(Buffer *buffer, BIGNUM *value)
 {  {
         /**XXX should be two's-complement */          u_int len;
         int len;          u_char *bin = buffer_get_string(buffer, &len);
         unsigned char *bin = (unsigned char *)buffer_get_string(buffer, (unsigned 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 an integer from the buffer (4 bytes, msb first).   * Returns integers from the buffer (msb first).
  */   */
 unsigned int  
   u_short
   buffer_get_short(Buffer *buffer)
   {
           u_char buf[2];
   
           buffer_get(buffer, (char *) buf, 2);
           return GET_16BIT(buf);
   }
   
   u_int
 buffer_get_int(Buffer *buffer)  buffer_get_int(Buffer *buffer)
 {  {
         unsigned 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);
 }  }
   
   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 integers in the buffer, msb first.
  */   */
 void  void
 buffer_put_int(Buffer *buffer, unsigned int value)  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)
   {
         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);
   }
   
 /*  /*
  * 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 151 
Line 212 
  * 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 *  void *
 buffer_get_string(Buffer *buffer, unsigned int *length_ptr)  buffer_get_string(Buffer *buffer, u_int *length_ptr)
 {  {
         unsigned int len;          u_char *value;
         char *value;          u_int len;
   
         /* 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("buffer_get_string: bad string length %u", 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 175 
Line 237 
 /*  /*
  * 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, u_int len)
 {  {
         buffer_put_int(buffer, len);          buffer_put_int(buffer, len);
         buffer_append(buffer, buf, len);          buffer_append(buffer, buf, len);
 }  }
 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));
 }  }
   
 /*  /*
  * 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)
 {  {
         char ch;          char ch;
   
         buffer_get(buffer, &ch, 1);          buffer_get(buffer, &ch, 1);
         return (unsigned char) ch;          return (u_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)
 {  {
         char ch = value;          char ch = value;
   
         buffer_append(buffer, &ch, 1);          buffer_append(buffer, &ch, 1);
 }  }
Legend:
Removed from v.1.10  
changed lines
  Added in v.1.30