[BACK]Return to buffer.h CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/Attic/buffer.h between version 1.24 and 1.25

version 1.24, 2014/04/28 03:09:18 version 1.25, 2014/04/30 05:29:56
Line 1 
Line 1 
 /* $OpenBSD$ */  /* $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  
  * Code for manipulating FIFO 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
    * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
    * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
    * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
    * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
    * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
    * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */   */
   
   /* Emulation wrappers for legacy OpenSSH buffer API atop sshbuf */
   
 #ifndef BUFFER_H  #ifndef BUFFER_H
 #define BUFFER_H  #define BUFFER_H
   
 typedef struct {  #include "sshbuf.h"
         u_char  *buf;           /* Buffer for data. */  
         u_int    alloc;         /* Number of bytes allocated for data. */  
         u_int    offset;        /* Offset of first byte containing data. */  
         u_int    end;           /* Offset of last byte containing data. */  
 }       Buffer;  
   
 void     buffer_init(Buffer *);  typedef struct sshbuf Buffer;
 void     buffer_clear(Buffer *);  
 void     buffer_free(Buffer *);  
   
 u_int    buffer_len(const Buffer *);  #define buffer_init(b)          sshbuf_init(b)
 void    *buffer_ptr(const Buffer *);  #define buffer_clear(b)         sshbuf_reset(b)
   #define buffer_free(b)          sshbuf_free(b)
   #define buffer_dump(b)          sshbuf_dump(b, stderr)
   
   /* XXX cast is safe: sshbuf never stores more than len 2^31 */
   #define buffer_len(b)           ((u_int) sshbuf_len(b))
   #define buffer_ptr(b)           sshbuf_mutable_ptr(b)
   
 void     buffer_append(Buffer *, const void *, u_int);  void     buffer_append(Buffer *, const void *, u_int);
 void    *buffer_append_space(Buffer *, u_int);  void    *buffer_append_space(Buffer *, u_int);
   
 int      buffer_check_alloc(Buffer *, u_int);  int      buffer_check_alloc(Buffer *, u_int);
   
 void     buffer_get(Buffer *, void *, u_int);  void     buffer_get(Buffer *, void *, u_int);
   
 void     buffer_consume(Buffer *, u_int);  void     buffer_consume(Buffer *, u_int);
 void     buffer_consume_end(Buffer *, u_int);  void     buffer_consume_end(Buffer *, u_int);
   
 void     buffer_dump(const Buffer *);  
   
 int      buffer_get_ret(Buffer *, void *, u_int);  int      buffer_get_ret(Buffer *, void *, u_int);
 int      buffer_consume_ret(Buffer *, u_int);  int      buffer_consume_ret(Buffer *, u_int);
 int      buffer_consume_end_ret(Buffer *, u_int);  int      buffer_consume_end_ret(Buffer *, u_int);
   
 #include <openssl/bn.h>  
   
 void    buffer_put_bignum(Buffer *, const BIGNUM *);  void    buffer_put_bignum(Buffer *, const BIGNUM *);
 void    buffer_put_bignum2(Buffer *, const BIGNUM *);  void    buffer_put_bignum2(Buffer *, const BIGNUM *);
 void    buffer_get_bignum(Buffer *, BIGNUM *);  void    buffer_get_bignum(Buffer *, BIGNUM *);
 void    buffer_get_bignum2(Buffer *, BIGNUM *);  void    buffer_get_bignum2(Buffer *, BIGNUM *);
   void    buffer_put_bignum2_from_string(Buffer *, const u_char *, u_int);
   
 u_short buffer_get_short(Buffer *);  u_short buffer_get_short(Buffer *);
 void    buffer_put_short(Buffer *, u_short);  void    buffer_put_short(Buffer *, u_short);
Line 71 
Line 71 
 char   *buffer_get_cstring(Buffer *, u_int *);  char   *buffer_get_cstring(Buffer *, u_int *);
 void    buffer_put_cstring(Buffer *, const char *);  void    buffer_put_cstring(Buffer *, const char *);
   
 #define buffer_skip_string(b) \  #define buffer_skip_string(b) (void)buffer_get_string_ptr(b, NULL);
     do { u_int l = buffer_get_int(b); buffer_consume(b, l); } while (0)  
   
 int     buffer_put_bignum_ret(Buffer *, const BIGNUM *);  int     buffer_put_bignum_ret(Buffer *, const BIGNUM *);
 int     buffer_get_bignum_ret(Buffer *, BIGNUM *);  int     buffer_get_bignum_ret(Buffer *, BIGNUM *);
Line 84 
Line 83 
 void    *buffer_get_string_ret(Buffer *, u_int *);  void    *buffer_get_string_ret(Buffer *, u_int *);
 char    *buffer_get_cstring_ret(Buffer *, u_int *);  char    *buffer_get_cstring_ret(Buffer *, u_int *);
 const void *buffer_get_string_ptr_ret(Buffer *, u_int *);  const void *buffer_get_string_ptr_ret(Buffer *, u_int *);
 int     buffer_get_char_ret(u_char *, Buffer *);  int     buffer_get_char_ret(char *, Buffer *);
   
 void *buffer_get_bignum2_as_string_ret(Buffer *, u_int *);  
 void *buffer_get_bignum2_as_string(Buffer *, u_int *);  
 void  buffer_put_bignum2_from_string(Buffer *, const u_char *, u_int);  
   
 #include <openssl/ec.h>  
   
 int     buffer_put_ecpoint_ret(Buffer *, const EC_GROUP *, const EC_POINT *);  int     buffer_put_ecpoint_ret(Buffer *, const EC_GROUP *, const EC_POINT *);
 void    buffer_put_ecpoint(Buffer *, const EC_GROUP *, const EC_POINT *);  void    buffer_put_ecpoint(Buffer *, const EC_GROUP *, const EC_POINT *);
 int     buffer_get_ecpoint_ret(Buffer *, const EC_GROUP *, EC_POINT *);  int     buffer_get_ecpoint_ret(Buffer *, const EC_GROUP *, EC_POINT *);
 void    buffer_get_ecpoint(Buffer *, const EC_GROUP *, EC_POINT *);  void    buffer_get_ecpoint(Buffer *, const EC_GROUP *, EC_POINT *);
   
 #endif                          /* BUFFER_H */  #endif  /* BUFFER_H */
   

Legend:
Removed from v.1.24  
changed lines
  Added in v.1.25