=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/Attic/bufaux.c,v retrieving revision 1.24.2.4 retrieving revision 1.25 diff -u -r1.24.2.4 -r1.25 --- src/usr.bin/ssh/Attic/bufaux.c 2003/04/03 22:35:16 1.24.2.4 +++ src/usr.bin/ssh/Attic/bufaux.c 2002/04/20 09:14:58 1.25 @@ -37,7 +37,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: bufaux.c,v 1.24.2.4 2003/04/03 22:35:16 miod Exp $"); +RCSID("$OpenBSD: bufaux.c,v 1.25 2002/04/20 09:14:58 markus Exp $"); #include #include "bufaux.h" @@ -88,8 +88,6 @@ bits = GET_16BIT(buf); /* Compute the number of binary bytes that follow. */ bytes = (bits + 7) / 8; - if (bytes > 8 * 1024) - fatal("buffer_get_bignum: cannot handle BN of size %d", bytes); if (buffer_len(buffer) < bytes) fatal("buffer_get_bignum: input buffer too small"); bin = buffer_ptr(buffer); @@ -107,7 +105,6 @@ u_char *buf = xmalloc(bytes); int oi; int hasnohigh = 0; - buf[0] = '\0'; /* Get the value of in binary */ oi = BN_bn2bin(value, buf+1); @@ -131,15 +128,12 @@ xfree(buf); } -/* XXX does not handle negative BNs */ void buffer_get_bignum2(Buffer *buffer, BIGNUM *value) { - u_int len; - u_char *bin = buffer_get_string(buffer, &len); - - if (len > 8 * 1024) - fatal("buffer_get_bignum2: cannot handle BN of size %d", len); + /**XXX should be two's-complement */ + int len; + u_char *bin = buffer_get_string(buffer, (u_int *)&len); BN_bin2bn(bin, len, value); xfree(bin); } @@ -151,7 +145,6 @@ buffer_get_short(Buffer *buffer) { u_char buf[2]; - buffer_get(buffer, (char *) buf, 2); return GET_16BIT(buf); } @@ -160,7 +153,6 @@ buffer_get_int(Buffer *buffer) { u_char buf[4]; - buffer_get(buffer, (char *) buf, 4); return GET_32BIT(buf); } @@ -169,7 +161,6 @@ buffer_get_int64(Buffer *buffer) { u_char buf[8]; - buffer_get(buffer, (char *) buf, 8); return GET_64BIT(buf); } @@ -181,7 +172,6 @@ buffer_put_short(Buffer *buffer, u_short value) { char buf[2]; - PUT_16BIT(buf, value); buffer_append(buffer, buf, 2); } @@ -190,7 +180,6 @@ buffer_put_int(Buffer *buffer, u_int value) { char buf[4]; - PUT_32BIT(buf, value); buffer_append(buffer, buf, 4); } @@ -199,7 +188,6 @@ buffer_put_int64(Buffer *buffer, u_int64_t value) { char buf[8]; - PUT_64BIT(buf, value); buffer_append(buffer, buf, 8); } @@ -215,13 +203,12 @@ void * buffer_get_string(Buffer *buffer, u_int *length_ptr) { - u_char *value; u_int len; - + u_char *value; /* Get the length. */ len = buffer_get_int(buffer); if (len > 256 * 1024) - fatal("buffer_get_string: bad string length %u", len); + fatal("buffer_get_string: bad string length %d", len); /* Allocate space for the string. Add one byte for a null character. */ value = xmalloc(len + 1); /* Get the string. */ @@ -258,7 +245,6 @@ buffer_get_char(Buffer *buffer) { char ch; - buffer_get(buffer, &ch, 1); return (u_char) ch; } @@ -270,6 +256,5 @@ buffer_put_char(Buffer *buffer, int value) { char ch = value; - buffer_append(buffer, &ch, 1); }