- Reduce diff against OpenBSD source
- All OpenSSL includes are now unconditionally referenced as
openssl/foo.h
- Pick up formatting changes
- Other minor changed (typecasts, etc) that I missed
diff --git a/bufaux.c b/bufaux.c
index b4d5227..9ae5e9e 100644
--- a/bufaux.c
+++ b/bufaux.c
@@ -17,17 +17,10 @@
*/
#include "includes.h"
-RCSID("$Id: bufaux.c,v 1.11 2000/04/16 01:18:40 damien Exp $");
+RCSID("$Id: bufaux.c,v 1.12 2000/04/16 02:31:50 damien Exp $");
#include "ssh.h"
-
-#ifdef HAVE_OPENSSL
#include <openssl/bn.h>
-#endif
-#ifdef HAVE_SSL
-#include <ssl/bn.h>
-#endif
-
#include "bufaux.h"
#include "xmalloc.h"
#include "getput.h"
@@ -131,7 +124,7 @@
/*
* Returns an integer from the buffer (4 bytes, msb first).
*/
-unsigned int
+unsigned int
buffer_get_int(Buffer *buffer)
{
unsigned char buf[4];
@@ -142,7 +135,7 @@
/*
* Stores an integer in the buffer in 4 bytes, msb first.
*/
-void
+void
buffer_put_int(Buffer *buffer, unsigned int value)
{
char buf[4];
@@ -182,13 +175,13 @@
/*
* Stores and arbitrary binary string in the buffer.
*/
-void
+void
buffer_put_string(Buffer *buffer, const void *buf, unsigned int len)
{
buffer_put_int(buffer, len);
buffer_append(buffer, buf, len);
}
-void
+void
buffer_put_cstring(Buffer *buffer, const char *s)
{
buffer_put_string(buffer, s, strlen(s));
@@ -197,7 +190,7 @@
/*
* Returns a character from the buffer (0 - 255).
*/
-int
+int
buffer_get_char(Buffer *buffer)
{
char ch;
@@ -208,7 +201,7 @@
/*
* Stores a character in the buffer.
*/
-void
+void
buffer_put_char(Buffer *buffer, int value)
{
char ch = value;