[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.24.2.1 and 1.60

version 1.24.2.1, 2002/05/18 04:12:10 version 1.60, 2014/04/30 05:29:56
Line 1 
Line 1 
   /* $OpenBSD$ */
 /*  /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>   * Copyright (c) 2012 Damien Miller <djm@mindrot.org>
  * 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   * Permission to use, copy, modify, and distribute this software for any
  * can be used freely for any purpose.  Any derived versions of this   * purpose with or without fee is hereby granted, provided that the above
  * software must be clearly marked as such, and if the derived work is   * copyright notice and this permission notice appear in all copies.
  * incompatible with the protocol description in the RFC file, it must be  
  * called by a name other than "ssh" or "Secure Shell".  
  *   *
  *   * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * SSH2 packet format added by Markus Friedl   * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.   * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  *   * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * Redistribution and use in source and binary forms, with or without   * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * modification, are permitted provided that the following conditions   * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * are met:   * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * 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"  /* Emulation wrappers for legacy OpenSSH buffer API atop sshbuf */
 RCSID("$OpenBSD$");  
   
 #include <openssl/bn.h>  #include <sys/types.h>
 #include "bufaux.h"  
 #include "xmalloc.h"  #include "buffer.h"
 #include "getput.h"  
 #include "log.h"  #include "log.h"
   #include "ssherr.h"
   
 /*  int
  * Stores an BIGNUM in the buffer with a 2-byte msb first bit count, followed  buffer_get_short_ret(u_short *v, Buffer *buffer)
  * by (bits+7)/8 bytes of binary data, msb first.  
  */  
 void  
 buffer_put_bignum(Buffer *buffer, BIGNUM *value)  
 {  {
         int bits = BN_num_bits(value);          int ret;
         int bin_size = (bits + 7) / 8;  
         u_char *buf = xmalloc(bin_size);  
         int oi;  
         char msg[2];  
   
         /* Get the value of in binary */          if ((ret = sshbuf_get_u16(buffer, v)) != 0) {
         oi = BN_bn2bin(value, buf);                  error("%s: %s", __func__, ssh_err(ret));
         if (oi != bin_size)                  return -1;
                 fatal("buffer_put_bignum: BN_bn2bin() failed: oi %d != bin_size %d",          }
                     oi, bin_size);          return 0;
   
         /* 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, (char *)buf, oi);  
   
         memset(buf, 0, bin_size);  
         xfree(buf);  
 }  }
   
 /*  u_short
  * Retrieves an BIGNUM from the buffer.  buffer_get_short(Buffer *buffer)
  */  
 void  
 buffer_get_bignum(Buffer *buffer, BIGNUM *value)  
 {  {
         int bits, bytes;          u_short ret;
         u_char buf[2], *bin;  
   
         /* Get the number for bits. */          if (buffer_get_short_ret(&ret, buffer) == -1)
         buffer_get(buffer, (char *) buf, 2);                  fatal("%s: buffer error", __func__);
         bits = GET_16BIT(buf);  
         /* Compute the number of binary bytes that follow. */          return (ret);
         bytes = (bits + 7) / 8;  
         if (buffer_len(buffer) < bytes)  
                 fatal("buffer_get_bignum: input buffer too small");  
         bin = buffer_ptr(buffer);  
         BN_bin2bn(bin, bytes, value);  
         buffer_consume(buffer, bytes);  
 }  }
   
 /*  int
  * Stores an BIGNUM in the buffer in SSH2 format.  buffer_get_int_ret(u_int *v, Buffer *buffer)
  */  
 void  
 buffer_put_bignum2(Buffer *buffer, BIGNUM *value)  
 {  {
         int bytes = BN_num_bytes(value) + 1;          int ret;
         u_char *buf = xmalloc(bytes);  
         int oi;          if ((ret = sshbuf_get_u32(buffer, v)) != 0) {
         int hasnohigh = 0;                  error("%s: %s", __func__, ssh_err(ret));
         buf[0] = '\0';                  return -1;
         /* 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;  
                 u_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);          return 0;
         memset(buf, 0, bytes);  
         xfree(buf);  
 }  }
   
 void  u_int
 buffer_get_bignum2(Buffer *buffer, BIGNUM *value)  buffer_get_int(Buffer *buffer)
 {  {
         /**XXX should be two's-complement */          u_int ret;
         int len;  
         u_char *bin = buffer_get_string(buffer, (u_int *)&len);  
         BN_bin2bn(bin, len, value);  
         xfree(bin);  
 }  
 /*  
  * Returns integers from the buffer (msb first).  
  */  
   
 u_short          if (buffer_get_int_ret(&ret, buffer) == -1)
 buffer_get_short(Buffer *buffer)                  fatal("%s: buffer error", __func__);
 {  
         u_char buf[2];          return (ret);
         buffer_get(buffer, (char *) buf, 2);  
         return GET_16BIT(buf);  
 }  }
   
 u_int  int
 buffer_get_int(Buffer *buffer)  buffer_get_int64_ret(u_int64_t *v, Buffer *buffer)
 {  {
         u_char buf[4];          int ret;
         buffer_get(buffer, (char *) buf, 4);  
         return GET_32BIT(buf);          if ((ret = sshbuf_get_u64(buffer, v)) != 0) {
                   error("%s: %s", __func__, ssh_err(ret));
                   return -1;
           }
           return 0;
 }  }
   
 u_int64_t  u_int64_t
 buffer_get_int64(Buffer *buffer)  buffer_get_int64(Buffer *buffer)
 {  {
         u_char buf[8];          u_int64_t ret;
         buffer_get(buffer, (char *) buf, 8);  
         return GET_64BIT(buf);          if (buffer_get_int64_ret(&ret, buffer) == -1)
                   fatal("%s: buffer error", __func__);
   
           return (ret);
 }  }
   
 /*  
  * Stores integers in the buffer, msb first.  
  */  
 void  void
 buffer_put_short(Buffer *buffer, u_short value)  buffer_put_short(Buffer *buffer, u_short value)
 {  {
         char buf[2];          int ret;
         PUT_16BIT(buf, value);  
         buffer_append(buffer, buf, 2);          if ((ret = sshbuf_put_u16(buffer, value)) != 0)
                   fatal("%s: %s", __func__, ssh_err(ret));
 }  }
   
 void  void
 buffer_put_int(Buffer *buffer, u_int value)  buffer_put_int(Buffer *buffer, u_int value)
 {  {
         char buf[4];          int ret;
         PUT_32BIT(buf, value);  
         buffer_append(buffer, buf, 4);          if ((ret = sshbuf_put_u32(buffer, value)) != 0)
                   fatal("%s: %s", __func__, ssh_err(ret));
 }  }
   
 void  void
 buffer_put_int64(Buffer *buffer, u_int64_t value)  buffer_put_int64(Buffer *buffer, u_int64_t value)
 {  {
         char buf[8];          int ret;
         PUT_64BIT(buf, value);  
         buffer_append(buffer, buf, 8);          if ((ret = sshbuf_put_u64(buffer, value)) != 0)
                   fatal("%s: %s", __func__, ssh_err(ret));
 }  }
   
 /*  
  * Returns an arbitrary binary string from the buffer.  The string cannot  
  * be longer than 256k.  The returned value points to memory allocated  
  * with xmalloc; it is the responsibility of the calling function to free  
  * the data.  If length_ptr is non-NULL, the length of the returned data  
  * will be stored there.  A null character will be automatically appended  
  * to the returned string, and is not counted in length.  
  */  
 void *  void *
 buffer_get_string(Buffer *buffer, u_int *length_ptr)  buffer_get_string_ret(Buffer *buffer, u_int *length_ptr)
 {  {
         u_int len;          size_t len;
           int ret;
         u_char *value;          u_char *value;
         /* Get the length. */  
         len = buffer_get_int(buffer);          if ((ret = sshbuf_get_string(buffer, &value, &len)) != 0) {
         if (len > 256 * 1024)                  error("%s: %s", __func__, ssh_err(ret));
                 fatal("buffer_get_string: bad string length %d", len);                  return NULL;
         /* Allocate space for the string.  Add one byte for a null character. */          }
         value = xmalloc(len + 1);          if (length_ptr != NULL)
         /* Get the string. */                  *length_ptr = len;  /* Safe: sshbuf never stores len > 2^31 */
         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;          return value;
 }  }
   
 /*  void *
  * Stores and arbitrary binary string in the buffer.  buffer_get_string(Buffer *buffer, u_int *length_ptr)
  */  {
           void *ret;
   
           if ((ret = buffer_get_string_ret(buffer, length_ptr)) == NULL)
                   fatal("%s: buffer error", __func__);
           return (ret);
   }
   
   char *
   buffer_get_cstring_ret(Buffer *buffer, u_int *length_ptr)
   {
           size_t len;
           int ret;
           char *value;
   
           if ((ret = sshbuf_get_cstring(buffer, &value, &len)) != 0) {
                   error("%s: %s", __func__, ssh_err(ret));
                   return NULL;
           }
           if (length_ptr != NULL)
                   *length_ptr = len;  /* Safe: sshbuf never stores len > 2^31 */
           return value;
   }
   
   char *
   buffer_get_cstring(Buffer *buffer, u_int *length_ptr)
   {
           char *ret;
   
           if ((ret = buffer_get_cstring_ret(buffer, length_ptr)) == NULL)
                   fatal("%s: buffer error", __func__);
           return ret;
   }
   
   const void *
   buffer_get_string_ptr_ret(Buffer *buffer, u_int *length_ptr)
   {
           size_t len;
           int ret;
           const u_char *value;
   
           if ((ret = sshbuf_get_string_direct(buffer, &value, &len)) != 0) {
                   error("%s: %s", __func__, ssh_err(ret));
                   return NULL;
           }
           if (length_ptr != NULL)
                   *length_ptr = len;  /* Safe: sshbuf never stores len > 2^31 */
           return value;
   }
   
   const void *
   buffer_get_string_ptr(Buffer *buffer, u_int *length_ptr)
   {
           const void *ret;
   
           if ((ret = buffer_get_string_ptr_ret(buffer, length_ptr)) == NULL)
                   fatal("%s: buffer error", __func__);
           return (ret);
   }
   
 void  void
 buffer_put_string(Buffer *buffer, const void *buf, u_int len)  buffer_put_string(Buffer *buffer, const void *buf, u_int len)
 {  {
         buffer_put_int(buffer, len);          int ret;
         buffer_append(buffer, buf, len);  
           if ((ret = sshbuf_put_string(buffer, buf, len)) != 0)
                   fatal("%s: %s", __func__, ssh_err(ret));
 }  }
   
 void  void
 buffer_put_cstring(Buffer *buffer, const char *s)  buffer_put_cstring(Buffer *buffer, const char *s)
 {  {
         if (s == NULL)          int ret;
                 fatal("buffer_put_cstring: s == NULL");  
         buffer_put_string(buffer, s, strlen(s));          if ((ret = sshbuf_put_cstring(buffer, s)) != 0)
                   fatal("%s: %s", __func__, ssh_err(ret));
 }  }
   
 /*  
  * Returns a character from the buffer (0 - 255).  
  */  
 int  int
   buffer_get_char_ret(char *v, Buffer *buffer)
   {
           int ret;
   
           if ((ret = sshbuf_get_u8(buffer, (u_char *)v)) != 0) {
                   error("%s: %s", __func__, ssh_err(ret));
                   return -1;
           }
           return 0;
   }
   
   int
 buffer_get_char(Buffer *buffer)  buffer_get_char(Buffer *buffer)
 {  {
         char ch;          char ch;
         buffer_get(buffer, &ch, 1);  
           if (buffer_get_char_ret(&ch, buffer) == -1)
                   fatal("%s: buffer error", __func__);
         return (u_char) ch;          return (u_char) ch;
 }  }
   
 /*  
  * 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;          int ret;
         buffer_append(buffer, &ch, 1);  
           if ((ret = sshbuf_put_u8(buffer, value)) != 0)
                   fatal("%s: %s", __func__, ssh_err(ret));
 }  }
   
   void
   buffer_put_bignum2_from_string(Buffer *buffer, const u_char *s, u_int l)
   {
           int ret;
   
           if ((ret = sshbuf_put_bignum2_bytes(buffer, s, l)) != 0)
                   fatal("%s: %s", __func__, ssh_err(ret));
   }
   
Legend:
Removed from v.1.24.2.1  
changed lines
  Added in v.1.60