X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/blobdiff_plain/255cabd944c933ce8c346f4fc4aded6311151e99..69538b0c680486cc60423b48f419583a9e5b4650:/bufaux.h

diff --git a/bufaux.h b/bufaux.h
index d1af0988..80f35c1e 100644
--- a/bufaux.h
+++ b/bufaux.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: bufaux.h,v 1.18 2002/04/20 09:14:58 markus Exp $	*/
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -10,8 +12,6 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: bufaux.h,v 1.13 2001/06/26 17:27:22 markus Exp $"); */
-
 #ifndef BUFAUX_H
 #define BUFAUX_H
 
@@ -20,11 +20,13 @@
 
 void    buffer_put_bignum(Buffer *, BIGNUM *);
 void    buffer_put_bignum2(Buffer *, BIGNUM *);
+void	buffer_get_bignum(Buffer *, BIGNUM *);
+void	buffer_get_bignum2(Buffer *, BIGNUM *);
 
-int     buffer_get_bignum(Buffer *, BIGNUM *);
-int	buffer_get_bignum2(Buffer *, BIGNUM *);
+u_short	buffer_get_short(Buffer *);
+void	buffer_put_short(Buffer *, u_short);
 
-u_int buffer_get_int(Buffer *);
+u_int	buffer_get_int(Buffer *);
 void    buffer_put_int(Buffer *, u_int);
 
 #ifdef HAVE_U_INT64_T
@@ -33,12 +35,13 @@ void	buffer_put_int64(Buffer *, u_int64_t);
 #endif
 
 int     buffer_get_char(Buffer *);
-
 void    buffer_put_char(Buffer *, int);
 
-char   *buffer_get_string(Buffer *, u_int *);
-
+void   *buffer_get_string(Buffer *, u_int *);
 void    buffer_put_string(Buffer *, const void *, u_int);
 void	buffer_put_cstring(Buffer *, const char *);
 
+#define buffer_skip_string(b) \
+    do { u_int l = buffer_get_int(b); buffer_consume(b, l); } while(0)
+
 #endif				/* BUFAUX_H */