diff options
| -rw-r--r-- | usr.bin/ssh/bufaux.c | 9 | ||||
| -rw-r--r-- | usr.bin/ssh/bufaux.h | 6 | ||||
| -rw-r--r-- | usr.bin/ssh/packet.c | 6 |
3 files changed, 9 insertions, 12 deletions
diff --git a/usr.bin/ssh/bufaux.c b/usr.bin/ssh/bufaux.c index 0fcc7296a9b..394d7b289f2 100644 --- a/usr.bin/ssh/bufaux.c +++ b/usr.bin/ssh/bufaux.c @@ -37,7 +37,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: bufaux.c,v 1.20 2001/12/19 17:16:13 stevesk Exp $"); +RCSID("$OpenBSD: bufaux.c,v 1.21 2001/12/28 14:13:13 markus Exp $"); #include <openssl/bn.h> #include "bufaux.h" @@ -77,7 +77,7 @@ buffer_put_bignum(Buffer *buffer, BIGNUM *value) /* * Retrieves an BIGNUM from the buffer. */ -int +void buffer_get_bignum(Buffer *buffer, BIGNUM *value) { int bits, bytes; @@ -93,8 +93,6 @@ buffer_get_bignum(Buffer *buffer, BIGNUM *value) bin = (u_char *) buffer_ptr(buffer); BN_bin2bn(bin, bytes, value); buffer_consume(buffer, bytes); - - return 2 + bytes; } /* @@ -130,7 +128,7 @@ buffer_put_bignum2(Buffer *buffer, BIGNUM *value) xfree(buf); } -int +void buffer_get_bignum2(Buffer *buffer, BIGNUM *value) { /**XXX should be two's-complement */ @@ -138,7 +136,6 @@ buffer_get_bignum2(Buffer *buffer, BIGNUM *value) u_char *bin = (u_char *)buffer_get_string(buffer, (u_int *)&len); BN_bin2bn(bin, len, value); xfree(bin); - return len; } /* diff --git a/usr.bin/ssh/bufaux.h b/usr.bin/ssh/bufaux.h index 6606265386b..f0524d3305b 100644 --- a/usr.bin/ssh/bufaux.h +++ b/usr.bin/ssh/bufaux.h @@ -10,7 +10,7 @@ * called by a name other than "ssh" or "Secure Shell". */ -/* RCSID("$OpenBSD: bufaux.h,v 1.14 2001/12/19 17:16:13 stevesk Exp $"); */ +/* RCSID("$OpenBSD: bufaux.h,v 1.15 2001/12/28 14:13:13 markus Exp $"); */ #ifndef BUFAUX_H #define BUFAUX_H @@ -20,8 +20,8 @@ void buffer_put_bignum(Buffer *, BIGNUM *); void buffer_put_bignum2(Buffer *, BIGNUM *); -int buffer_get_bignum(Buffer *, BIGNUM *); -int buffer_get_bignum2(Buffer *, BIGNUM *); +void buffer_get_bignum(Buffer *, BIGNUM *); +void buffer_get_bignum2(Buffer *, BIGNUM *); u_int buffer_get_int(Buffer *); void buffer_put_int(Buffer *, u_int); diff --git a/usr.bin/ssh/packet.c b/usr.bin/ssh/packet.c index ab85a012b87..0a075b3548f 100644 --- a/usr.bin/ssh/packet.c +++ b/usr.bin/ssh/packet.c @@ -37,7 +37,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: packet.c,v 1.80 2001/12/28 13:57:33 markus Exp $"); +RCSID("$OpenBSD: packet.c,v 1.81 2001/12/28 14:13:13 markus Exp $"); #include "xmalloc.h" #include "buffer.h" @@ -1002,13 +1002,13 @@ packet_get_int(void) void packet_get_bignum(BIGNUM * value) { - (void)buffer_get_bignum(&incoming_packet, value); + buffer_get_bignum(&incoming_packet, value); } void packet_get_bignum2(BIGNUM * value) { - (void)buffer_get_bignum2(&incoming_packet, value); + buffer_get_bignum2(&incoming_packet, value); } void * |