[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.44

version 1.10, 2000/04/12 09:39:10 version 1.44, 2006/08/03 03:34:41
Line 1 
Line 1 
   /* $OpenBSD$ */
 /*  /*
  *  
  * 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 <sys/types.h>
 RCSID("$Id$");  
   
 #include "ssh.h"  
 #include <openssl/bn.h>  #include <openssl/bn.h>
 #include "bufaux.h"  
   #include <string.h>
   #include <stdarg.h>
   
 #include "xmalloc.h"  #include "xmalloc.h"
 #include "getput.h"  #include "buffer.h"
   #include "log.h"
   #include "misc.h"
   
 /*  /*
  * Stores an BIGNUM in the buffer with a 2-byte msb first bit count, followed   * Returns integers from the buffer (msb first).
  * by (bits+7)/8 bytes of binary data, msb first.  
  */   */
 void  
 buffer_put_bignum(Buffer *buffer, BIGNUM *value)  int
   buffer_get_short_ret(u_short *ret, Buffer *buffer)
 {  {
         int bits = BN_num_bits(value);          u_char buf[2];
         int bin_size = (bits + 7) / 8;  
         char unsigned *buf = xmalloc(bin_size);  
         int oi;  
         char msg[2];  
   
         /* Get the value of in binary */          if (buffer_get_ret(buffer, (char *) buf, 2) == -1)
         oi = BN_bn2bin(value, buf);                  return (-1);
         if (oi != bin_size)          *ret = get_u16(buf);
                 fatal("buffer_put_bignum: BN_bn2bin() failed: oi %d != bin_size %d",          return (0);
                       oi, bin_size);  }
   
         /* Store the number of bits in the buffer in two bytes, msb first. */  u_short
         PUT_16BIT(msg, bits);  buffer_get_short(Buffer *buffer)
         buffer_append(buffer, msg, 2);  {
         /* Store the binary data. */          u_short ret;
         buffer_append(buffer, (char *)buf, oi);  
   
         memset(buf, 0, bin_size);          if (buffer_get_short_ret(&ret, buffer) == -1)
         xfree(buf);                  fatal("buffer_get_short: buffer error");
   
           return (ret);
 }  }
   
 /*  
  * Retrieves an BIGNUM from the buffer.  
  */  
 int  int
 buffer_get_bignum(Buffer *buffer, BIGNUM *value)  buffer_get_int_ret(u_int *ret, Buffer *buffer)
 {  {
         int bits, bytes;          u_char buf[4];
         unsigned char buf[2], *bin;  
   
         /* Get the number for bits. */          if (buffer_get_ret(buffer, (char *) buf, 4) == -1)
         buffer_get(buffer, (char *) buf, 2);                  return (-1);
         bits = GET_16BIT(buf);          *ret = get_u32(buf);
         /* Compute the number of binary bytes that follow. */          return (0);
         bytes = (bits + 7) / 8;  
         if (buffer_len(buffer) < bytes)  
                 fatal("buffer_get_bignum: input buffer too small");  
         bin = (unsigned char*) buffer_ptr(buffer);  
         BN_bin2bn(bin, bytes, value);  
         buffer_consume(buffer, bytes);  
   
         return 2 + bytes;  
 }  }
   
 /*  u_int
  * Stores an BIGNUM in the buffer in SSH2 format.  buffer_get_int(Buffer *buffer)
  */  
 void  
 buffer_put_bignum2(Buffer *buffer, BIGNUM *value)  
 {  {
         int bytes = BN_num_bytes(value) + 1;          u_int ret;
         unsigned char *buf = xmalloc(bytes);  
         int oi;          if (buffer_get_int_ret(&ret, buffer) == -1)
         int hasnohigh = 0;                  fatal("buffer_get_int: buffer error");
         buf[0] = '\0';  
         /* Get the value of in binary */          return (ret);
         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  int
 buffer_get_bignum2(Buffer *buffer, BIGNUM *value)  buffer_get_int64_ret(u_int64_t *ret, Buffer *buffer)
 {  {
         /**XXX should be two's-complement */          u_char buf[8];
         int len;  
         unsigned char *bin = (unsigned char *)buffer_get_string(buffer, (unsigned int *)&len);          if (buffer_get_ret(buffer, (char *) buf, 8) == -1)
         BN_bin2bn(bin, len, value);                  return (-1);
         xfree(bin);          *ret = get_u64(buf);
         return len;          return (0);
 }  }
   
 /*  u_int64_t
  * Returns an integer from the buffer (4 bytes, msb first).  buffer_get_int64(Buffer *buffer)
  */  
 unsigned int  
 buffer_get_int(Buffer *buffer)  
 {  {
         unsigned char buf[4];          u_int64_t ret;
         buffer_get(buffer, (char *) buf, 4);  
         return GET_32BIT(buf);          if (buffer_get_int64_ret(&ret, buffer) == -1)
                   fatal("buffer_get_int: buffer error");
   
           return (ret);
 }  }
   
 /*  /*
  * 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_u16(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_u32(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_u64(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 157 
  * 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_ret(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);                  error("buffer_get_string_ret: bad string length %u", len);
                   return (NULL);
           }
         /* 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);          if (buffer_get_ret(buffer, value, len) == -1) {
                   error("buffer_get_string_ret: buffer_get failed");
                   xfree(value);
                   return (NULL);
           }
         /* 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);
 }  }
   
   void *
   buffer_get_string(Buffer *buffer, u_int *length_ptr)
   {
           void *ret;
   
           if ((ret = buffer_get_string_ret(buffer, length_ptr)) == NULL)
                   fatal("buffer_get_string: buffer error");
           return (ret);
   }
   
 /*  /*
  * 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_ret(char *ret, Buffer *buffer)
   {
           if (buffer_get_ret(buffer, ret, 1) == -1) {
                   error("buffer_get_char_ret: buffer_get_ret failed");
                   return (-1);
           }
           return (0);
   }
   
   int
 buffer_get_char(Buffer *buffer)  buffer_get_char(Buffer *buffer)
 {  {
         char ch;          char ch;
         buffer_get(buffer, &ch, 1);  
         return (unsigned char) ch;          if (buffer_get_char_ret(&ch, buffer) == -1)
                   fatal("buffer_get_char: buffer error");
           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.44