[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.2 and 1.45

version 1.2, 1999/09/28 04:45:36 version 1.45, 2008/05/08 06:59:01
Line 1 
Line 1 
   /* $OpenBSD$ */
 /*  /*
    * Author: Tatu Ylonen <ylo@cs.hut.fi>
    * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
    *                    All rights reserved
    * Auxiliary functions for storing and retrieving various data types to/from
    * 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
    * 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.
    */
   
 bufaux.c  #include <sys/types.h>
   
 Author: Tatu Ylonen <ylo@cs.hut.fi>  #include <openssl/bn.h>
   
 Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland  #include <string.h>
                    All rights reserved  #include <stdarg.h>
   
 Created: Wed Mar 29 02:24:47 1995 ylo  #include "xmalloc.h"
   #include "buffer.h"
   #include "log.h"
   #include "misc.h"
   
 Auxiliary functions for storing and retrieving various data types to/from  /*
 Buffers.   * Returns integers from the buffer (msb first).
    */
   
 */  int
   buffer_get_short_ret(u_short *ret, Buffer *buffer)
   {
           u_char buf[2];
   
 #include "includes.h"          if (buffer_get_ret(buffer, (char *) buf, 2) == -1)
 RCSID("$Id$");                  return (-1);
           *ret = get_u16(buf);
           return (0);
   }
   
 #include "ssh.h"  u_short
 #include <ssl/bn.h>  buffer_get_short(Buffer *buffer)
 #include "bufaux.h"  {
 #include "xmalloc.h"          u_short ret;
 #include "getput.h"  
   
 /* Stores an BIGNUM in the buffer with a 2-byte msb first bit count, followed          if (buffer_get_short_ret(&ret, buffer) == -1)
    by (bits+7)/8 bytes of binary data, msb first. */                  fatal("buffer_get_short: buffer error");
   
 void          return (ret);
 buffer_put_bignum(Buffer *buffer, BIGNUM *value)  }
   
   int
   buffer_get_int_ret(u_int *ret, Buffer *buffer)
 {  {
   int bits = BN_num_bits(value);          u_char buf[4];
   int bin_size = (bits + 7) / 8;  
   char *buf = xmalloc(bin_size);  
   int oi;  
   char msg[2];  
   
   /* Get the value of in binary */  
   oi = BN_bn2bin(value, buf);  
   assert(oi == bin_size);  
   
   /* Store the number of bits in the buffer in two bytes, msb first. */          if (buffer_get_ret(buffer, (char *) buf, 4) == -1)
   PUT_16BIT(msg, bits);                  return (-1);
   buffer_append(buffer, msg, 2);          *ret = get_u32(buf);
   /* Store the binary data. */          return (0);
   buffer_append(buffer, buf, oi);  
   /* Clear the temporary data. */  
   memset(buf, 0, bin_size);  
   xfree(buf);  
 }  }
   
 /* Retrieves an BIGNUM from the buffer. */  u_int
   buffer_get_int(Buffer *buffer)
   {
           u_int ret;
   
           if (buffer_get_int_ret(&ret, buffer) == -1)
                   fatal("buffer_get_int: buffer error");
   
           return (ret);
   }
   
 int  int
 buffer_get_bignum(Buffer *buffer, BIGNUM *value)  buffer_get_int64_ret(u_int64_t *ret, Buffer *buffer)
 {  {
   int bits, bytes;          u_char buf[8];
   unsigned char buf[2], *bin;  
   
   /* Get the number for bits. */          if (buffer_get_ret(buffer, (char *) buf, 8) == -1)
   buffer_get(buffer, (char *)buf, 2);                  return (-1);
   bits = GET_16BIT(buf);          *ret = get_u64(buf);
   /* Compute the number of binary bytes that follow. */          return (0);
   bytes = (bits + 7) / 8;  
   bin = xmalloc(bytes);  
   buffer_get(buffer, bin, bytes);  
   BN_bin2bn(bin, bytes, value);  
   xfree(bin);  
   
   return 2 + bytes;  
 }  }
   
 /* Returns an integer from the buffer (4 bytes, msb first). */  u_int64_t
   buffer_get_int64(Buffer *buffer)
   {
           u_int64_t ret;
   
 unsigned int buffer_get_int(Buffer *buffer)          if (buffer_get_int64_ret(&ret, buffer) == -1)
                   fatal("buffer_get_int: buffer error");
   
           return (ret);
   }
   
   /*
    * Stores integers in the buffer, msb first.
    */
   void
   buffer_put_short(Buffer *buffer, u_short value)
 {  {
   unsigned char buf[4];          char buf[2];
   buffer_get(buffer, (char *)buf, 4);  
   return GET_32BIT(buf);          put_u16(buf, value);
           buffer_append(buffer, buf, 2);
 }  }
   
 /* Stores an integer in the buffer in 4 bytes, msb first. */  void
   buffer_put_int(Buffer *buffer, u_int value)
   {
           char buf[4];
   
 void buffer_put_int(Buffer *buffer, unsigned int value)          put_u32(buf, value);
           buffer_append(buffer, buf, 4);
   }
   
   void
   buffer_put_int64(Buffer *buffer, u_int64_t value)
 {  {
   char buf[4];          char buf[8];
   PUT_32BIT(buf, value);  
   buffer_append(buffer, buf, 4);          put_u64(buf, value);
           buffer_append(buffer, buf, 8);
 }  }
   
 /* 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.
    */
   void *
   buffer_get_string_ret(Buffer *buffer, u_int *length_ptr)
   {
           u_char *value;
           u_int len;
   
 char *buffer_get_string(Buffer *buffer, unsigned int *length_ptr)          /* Get the length. */
           len = buffer_get_int(buffer);
           if (len > 256 * 1024) {
                   error("buffer_get_string_ret: bad string length %u", len);
                   return (NULL);
           }
           /* Allocate space for the string.  Add one byte for a null character. */
           value = xmalloc(len + 1);
           /* Get the string. */
           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. */
           value[len] = 0;
           /* Optionally return the length of the string. */
           if (length_ptr)
                   *length_ptr = len;
           return (value);
   }
   
   void *
   buffer_get_string(Buffer *buffer, u_int *length_ptr)
 {  {
   unsigned int len;          void *ret;
   char *value;  
   /* Get the length. */          if ((ret = buffer_get_string_ret(buffer, length_ptr)) == NULL)
   len = buffer_get_int(buffer);                  fatal("buffer_get_string: buffer error");
   if (len > 256*1024)          return (ret);
     fatal("Received packet with bad string length %d", len);  
   /* Allocate space for the string.  Add one byte for a null character. */  
   value = xmalloc(len + 1);  
   /* Get the string. */  
   buffer_get(buffer, value, len);  
   /* Append a null character to make processing easier. */  
   value[len] = 0;  
   /* Optionally return the length of the string. */  
   if (length_ptr)  
     *length_ptr = len;  
   return value;  
 }  }
   
 /* Stores and arbitrary binary string in the buffer. */  void *
   buffer_get_string_ptr(Buffer *buffer, u_int *length_ptr)
   {
           void *ptr;
           u_int len;
   
 void buffer_put_string(Buffer *buffer, const void *buf, unsigned int len)          len = buffer_get_int(buffer);
           if (len > 256 * 1024)
                   fatal("buffer_get_string_ptr: bad string length %u", len);
           ptr = buffer_ptr(buffer);
           buffer_consume(buffer, len);
           if (length_ptr)
                   *length_ptr = len;
           return (ptr);
   }
   
   /*
    * Stores and arbitrary binary string in the buffer.
    */
   void
   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
   buffer_put_cstring(Buffer *buffer, const char *s)
   {
           if (s == NULL)
                   fatal("buffer_put_cstring: s == NULL");
           buffer_put_string(buffer, s, strlen(s));
   }
   
 /* 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_ret(char *ret, Buffer *buffer)
 {  {
   char ch;          if (buffer_get_ret(buffer, ret, 1) == -1) {
   buffer_get(buffer, &ch, 1);                  error("buffer_get_char_ret: buffer_get_ret failed");
   return (unsigned char)ch;                  return (-1);
           }
           return (0);
 }  }
   
 /* Stores a character in the buffer. */  int
   buffer_get_char(Buffer *buffer)
   {
           char ch;
   
 void buffer_put_char(Buffer *buffer, int value)          if (buffer_get_char_ret(&ch, buffer) == -1)
                   fatal("buffer_get_char: buffer error");
           return (u_char) ch;
   }
   
   /*
    * Stores a character in the buffer.
    */
   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.2  
changed lines
  Added in v.1.45