Initial revision

[gssapi-openssh.git] / openssh / bufaux.h

diff --git a/openssh/bufaux.h b/openssh/bufaux.h
index 80f35c1ecfa4223d70026ee7889e6893827c0767..d1af09881b1e95715833ccc0aea570cacadb3c29 100644 (file)
--- a/openssh/bufaux.h
+++ b/openssh/bufaux.h
@@ -1,5 +1,3 @@
-/*     $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
@@ -12,6 +10,8 @@
  * 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,13 +20,11 @@
 
 void    buffer_put_bignum(Buffer *, BIGNUM *);
 void    buffer_put_bignum2(Buffer *, BIGNUM *);
-void   buffer_get_bignum(Buffer *, BIGNUM *);
-void   buffer_get_bignum2(Buffer *, BIGNUM *);
 
-u_short        buffer_get_short(Buffer *);
-void   buffer_put_short(Buffer *, u_short);
+int     buffer_get_bignum(Buffer *, BIGNUM *);
+int    buffer_get_bignum2(Buffer *, BIGNUM *);
 
-u_int  buffer_get_int(Buffer *);
+u_int buffer_get_int(Buffer *);
 void    buffer_put_int(Buffer *, u_int);
 
 #ifdef HAVE_U_INT64_T
@@ -35,13 +33,12 @@ void        buffer_put_int64(Buffer *, u_int64_t);
 #endif
 
 int     buffer_get_char(Buffer *);
+
 void    buffer_put_char(Buffer *, int);
 
-void   *buffer_get_string(Buffer *, u_int *);
+char   *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 */