[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.11.2.4 and 1.12

version 1.11.2.4, 2001/03/21 18:52:36 version 1.12, 2000/06/20 01:39:39
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("$OpenBSD$");  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 54 
Line 34 
 {  {
         int bits = BN_num_bits(value);          int bits = BN_num_bits(value);
         int bin_size = (bits + 7) / 8;          int bin_size = (bits + 7) / 8;
         u_char *buf = xmalloc(bin_size);          char unsigned *buf = xmalloc(bin_size);
         int oi;          int oi;
         char msg[2];          char msg[2];
   
Line 81 
Line 61 
 buffer_get_bignum(Buffer *buffer, BIGNUM *value)  buffer_get_bignum(Buffer *buffer, BIGNUM *value)
 {  {
         int bits, bytes;          int bits, bytes;
         u_char buf[2], *bin;          unsigned 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);
Line 90 
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 = (u_char *) 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);
   
Line 104 
Line 84 
 buffer_put_bignum2(Buffer *buffer, BIGNUM *value)  buffer_put_bignum2(Buffer *buffer, BIGNUM *value)
 {  {
         int bytes = BN_num_bytes(value) + 1;          int bytes = BN_num_bytes(value) + 1;
         u_char *buf = xmalloc(bytes);          unsigned char *buf = xmalloc(bytes);
         int oi;          int oi;
         int hasnohigh = 0;          int hasnohigh = 0;
         buf[0] = '\0';          buf[0] = '\0';
Line 117 
Line 97 
         if (value->neg) {          if (value->neg) {
                 /**XXX should be two's-complement */                  /**XXX should be two's-complement */
                 int i, carry;                  int i, carry;
                 u_char *uc = buf;                  unsigned char *uc = buf;
                 log("negativ!");                  log("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;
Line 135 
Line 115 
 {  {
         /**XXX should be two's-complement */          /**XXX should be two's-complement */
         int len;          int len;
         u_char *bin = (u_char *)buffer_get_string(buffer, (u_int *)&len);          unsigned char *bin = (unsigned char *)buffer_get_string(buffer, (unsigned int *)&len);
         BN_bin2bn(bin, len, value);          BN_bin2bn(bin, len, value);
         xfree(bin);          xfree(bin);
         return len;          return len;
Line 144 
Line 124 
 /*  /*
  * Returns an integer from the buffer (4 bytes, msb first).   * Returns an integer from the buffer (4 bytes, msb first).
  */   */
 u_int  unsigned int
 buffer_get_int(Buffer *buffer)  buffer_get_int(Buffer *buffer)
 {  {
         u_char buf[4];          unsigned 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 an integer in the buffer in 4 bytes, msb first.
  */   */
 void  void
 buffer_put_int(Buffer *buffer, u_int value)  buffer_put_int(Buffer *buffer, unsigned 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 188 
Line 152 
  * to the returned string, and is not counted in length.   * to the returned string, and is not counted in length.
  */   */
 char *  char *
 buffer_get_string(Buffer *buffer, u_int *length_ptr)  buffer_get_string(Buffer *buffer, unsigned int *length_ptr)
 {  {
         u_int len;          unsigned int len;
         char *value;          char *value;
         /* Get the length. */          /* Get the length. */
         len = buffer_get_int(buffer);          len = buffer_get_int(buffer);
Line 212 
Line 176 
  * 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, u_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);
Line 231 
Line 195 
 {  {
         char ch;          char ch;
         buffer_get(buffer, &ch, 1);          buffer_get(buffer, &ch, 1);
         return (u_char) ch;          return (unsigned char) ch;
 }  }
   
 /*  /*
Legend:
Removed from v.1.11.2.4  
changed lines
  Added in v.1.12