version 1.23, 2002/03/18 17:25:29 |
version 1.50, 2010/08/31 09:58:37 |
|
|
|
/* $OpenBSD$ */ |
/* |
/* |
* Author: Tatu Ylonen <ylo@cs.hut.fi> |
* Author: Tatu Ylonen <ylo@cs.hut.fi> |
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
*/ |
*/ |
|
|
#include "includes.h" |
#include <sys/types.h> |
RCSID("$OpenBSD$"); |
|
|
|
#include <openssl/bn.h> |
#include <openssl/bn.h> |
#include "bufaux.h" |
|
|
#include <string.h> |
|
#include <stdarg.h> |
|
|
#include "xmalloc.h" |
#include "xmalloc.h" |
#include "getput.h" |
#include "buffer.h" |
#include "log.h" |
#include "log.h" |
|
#include "misc.h" |
|
|
/* |
/* |
* Stores an BIGNUM in the buffer with a 2-byte msb first bit count, followed |
* Returns integers from the buffer (msb first). |
* by (bits+7)/8 bytes of binary data, msb first. |
|
*/ |
*/ |
void |
|
buffer_put_bignum(Buffer *buffer, BIGNUM *value) |
int |
|
buffer_get_short_ret(u_short *ret, Buffer *buffer) |
{ |
{ |
int bits = BN_num_bits(value); |
u_char buf[2]; |
int bin_size = (bits + 7) / 8; |
|
u_char *buf = xmalloc(bin_size); |
|
int oi; |
|
char msg[2]; |
|
|
|
/* Get the value of in binary */ |
if (buffer_get_ret(buffer, (char *) buf, 2) == -1) |
oi = BN_bn2bin(value, buf); |
return (-1); |
if (oi != bin_size) |
*ret = get_u16(buf); |
fatal("buffer_put_bignum: BN_bn2bin() failed: oi %d != bin_size %d", |
return (0); |
oi, bin_size); |
|
|
|
/* Store the number of bits in the buffer in two bytes, msb first. */ |
|
PUT_16BIT(msg, bits); |
|
buffer_append(buffer, msg, 2); |
|
/* Store the binary data. */ |
|
buffer_append(buffer, (char *)buf, oi); |
|
|
|
memset(buf, 0, bin_size); |
|
xfree(buf); |
|
} |
} |
|
|
/* |
u_short |
* Retrieves an BIGNUM from the buffer. |
buffer_get_short(Buffer *buffer) |
*/ |
|
void |
|
buffer_get_bignum(Buffer *buffer, BIGNUM *value) |
|
{ |
{ |
int bits, bytes; |
u_short ret; |
u_char buf[2], *bin; |
|
|
|
/* Get the number for bits. */ |
if (buffer_get_short_ret(&ret, buffer) == -1) |
buffer_get(buffer, (char *) buf, 2); |
fatal("buffer_get_short: buffer error"); |
bits = GET_16BIT(buf); |
|
/* Compute the number of binary bytes that follow. */ |
|
bytes = (bits + 7) / 8; |
|
if (buffer_len(buffer) < bytes) |
|
fatal("buffer_get_bignum: input buffer too small"); |
|
bin = buffer_ptr(buffer); |
|
BN_bin2bn(bin, bytes, value); |
|
buffer_consume(buffer, bytes); |
|
} |
|
|
|
/* |
return (ret); |
* Stores an BIGNUM in the buffer in SSH2 format. |
|
*/ |
|
void |
|
buffer_put_bignum2(Buffer *buffer, BIGNUM *value) |
|
{ |
|
int bytes = BN_num_bytes(value) + 1; |
|
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); |
|
if (oi != bytes-1) |
|
fatal("buffer_put_bignum: BN_bn2bin() failed: oi %d != bin_size %d", |
|
oi, bytes); |
|
hasnohigh = (buf[1] & 0x80) ? 0 : 1; |
|
if (value->neg) { |
|
/**XXX should be two's-complement */ |
|
int i, carry; |
|
u_char *uc = buf; |
|
log("negativ!"); |
|
for (i = bytes-1, carry = 1; i>=0; i--) { |
|
uc[i] ^= 0xff; |
|
if (carry) |
|
carry = !++uc[i]; |
|
} |
|
} |
|
buffer_put_string(buffer, buf+hasnohigh, bytes-hasnohigh); |
|
memset(buf, 0, bytes); |
|
xfree(buf); |
|
} |
} |
|
|
void |
int |
buffer_get_bignum2(Buffer *buffer, BIGNUM *value) |
buffer_get_int_ret(u_int *ret, Buffer *buffer) |
{ |
{ |
/**XXX should be two's-complement */ |
u_char buf[4]; |
int len; |
|
u_char *bin = buffer_get_string(buffer, (u_int *)&len); |
if (buffer_get_ret(buffer, (char *) buf, 4) == -1) |
BN_bin2bn(bin, len, value); |
return (-1); |
xfree(bin); |
if (ret != NULL) |
|
*ret = get_u32(buf); |
|
return (0); |
} |
} |
|
|
/* |
|
* Returns an integer from the buffer (4 bytes, msb first). |
|
*/ |
|
u_int |
u_int |
buffer_get_int(Buffer *buffer) |
buffer_get_int(Buffer *buffer) |
{ |
{ |
u_char buf[4]; |
u_int ret; |
buffer_get(buffer, (char *) buf, 4); |
|
return GET_32BIT(buf); |
if (buffer_get_int_ret(&ret, buffer) == -1) |
|
fatal("buffer_get_int: buffer error"); |
|
|
|
return (ret); |
} |
} |
|
|
|
int |
|
buffer_get_int64_ret(u_int64_t *ret, Buffer *buffer) |
|
{ |
|
u_char buf[8]; |
|
|
|
if (buffer_get_ret(buffer, (char *) buf, 8) == -1) |
|
return (-1); |
|
if (ret != NULL) |
|
*ret = get_u64(buf); |
|
return (0); |
|
} |
|
|
u_int64_t |
u_int64_t |
buffer_get_int64(Buffer *buffer) |
buffer_get_int64(Buffer *buffer) |
{ |
{ |
u_char buf[8]; |
u_int64_t ret; |
buffer_get(buffer, (char *) buf, 8); |
|
return GET_64BIT(buf); |
if (buffer_get_int64_ret(&ret, buffer) == -1) |
|
fatal("buffer_get_int: buffer error"); |
|
|
|
return (ret); |
} |
} |
|
|
/* |
/* |
* Stores an integer in the buffer in 4 bytes, msb first. |
* Stores integers in the buffer, msb first. |
*/ |
*/ |
void |
void |
|
buffer_put_short(Buffer *buffer, u_short value) |
|
{ |
|
char buf[2]; |
|
|
|
put_u16(buf, value); |
|
buffer_append(buffer, buf, 2); |
|
} |
|
|
|
void |
buffer_put_int(Buffer *buffer, u_int value) |
buffer_put_int(Buffer *buffer, u_int value) |
{ |
{ |
char buf[4]; |
char buf[4]; |
PUT_32BIT(buf, value); |
|
|
put_u32(buf, value); |
buffer_append(buffer, buf, 4); |
buffer_append(buffer, buf, 4); |
} |
} |
|
|
|
|
buffer_put_int64(Buffer *buffer, u_int64_t value) |
buffer_put_int64(Buffer *buffer, u_int64_t value) |
{ |
{ |
char buf[8]; |
char buf[8]; |
PUT_64BIT(buf, value); |
|
|
put_u64(buf, value); |
buffer_append(buffer, buf, 8); |
buffer_append(buffer, buf, 8); |
} |
} |
|
|
|
|
* to the returned string, and is not counted in length. |
* to the returned string, and is not counted in length. |
*/ |
*/ |
void * |
void * |
buffer_get_string(Buffer *buffer, u_int *length_ptr) |
buffer_get_string_ret(Buffer *buffer, u_int *length_ptr) |
{ |
{ |
u_int len; |
|
u_char *value; |
u_char *value; |
|
u_int len; |
|
|
/* Get the length. */ |
/* Get the length. */ |
len = buffer_get_int(buffer); |
if (buffer_get_int_ret(&len, buffer) != 0) { |
if (len > 256 * 1024) |
error("buffer_get_string_ret: cannot extract length"); |
fatal("Received packet with bad string length %d", len); |
return (NULL); |
|
} |
|
if (len > 256 * 1024) { |
|
error("buffer_get_string_ret: bad string length %u", len); |
|
return (NULL); |
|
} |
/* Allocate space for the string. Add one byte for a null character. */ |
/* Allocate space for the string. Add one byte for a null character. */ |
value = xmalloc(len + 1); |
value = xmalloc(len + 1); |
/* Get the string. */ |
/* Get the string. */ |
buffer_get(buffer, value, len); |
if (buffer_get_ret(buffer, value, len) == -1) { |
|
error("buffer_get_string_ret: buffer_get failed"); |
|
xfree(value); |
|
return (NULL); |
|
} |
/* Append a null character to make processing easier. */ |
/* Append a null character to make processing easier. */ |
value[len] = 0; |
value[len] = '\0'; |
/* Optionally return the length of the string. */ |
/* Optionally return the length of the string. */ |
if (length_ptr) |
if (length_ptr) |
*length_ptr = len; |
*length_ptr = len; |
return value; |
return (value); |
} |
} |
|
|
|
void * |
|
buffer_get_string(Buffer *buffer, u_int *length_ptr) |
|
{ |
|
void *ret; |
|
|
|
if ((ret = buffer_get_string_ret(buffer, length_ptr)) == NULL) |
|
fatal("buffer_get_string: buffer error"); |
|
return (ret); |
|
} |
|
|
|
char * |
|
buffer_get_cstring_ret(Buffer *buffer, u_int *length_ptr) |
|
{ |
|
u_int length; |
|
char *cp, *ret = buffer_get_string_ret(buffer, &length); |
|
|
|
if (ret == NULL) |
|
return NULL; |
|
if ((cp = memchr(ret, '\0', length)) != NULL) { |
|
/* XXX allow \0 at end-of-string for a while, remove later */ |
|
if (cp == ret + length - 1) |
|
error("buffer_get_cstring_ret: string contains \\0"); |
|
else { |
|
bzero(ret, length); |
|
xfree(ret); |
|
return NULL; |
|
} |
|
} |
|
if (length_ptr != NULL) |
|
*length_ptr = length; |
|
return ret; |
|
} |
|
|
|
char * |
|
buffer_get_cstring(Buffer *buffer, u_int *length_ptr) |
|
{ |
|
char *ret; |
|
|
|
if ((ret = buffer_get_cstring_ret(buffer, length_ptr)) == NULL) |
|
fatal("buffer_get_cstring: buffer error"); |
|
return ret; |
|
} |
|
|
|
void * |
|
buffer_get_string_ptr_ret(Buffer *buffer, u_int *length_ptr) |
|
{ |
|
void *ptr; |
|
u_int len; |
|
|
|
if (buffer_get_int_ret(&len, buffer) != 0) |
|
return NULL; |
|
if (len > 256 * 1024) { |
|
error("buffer_get_string_ptr: bad string length %u", len); |
|
return NULL; |
|
} |
|
ptr = buffer_ptr(buffer); |
|
buffer_consume(buffer, len); |
|
if (length_ptr) |
|
*length_ptr = len; |
|
return (ptr); |
|
} |
|
|
|
void * |
|
buffer_get_string_ptr(Buffer *buffer, u_int *length_ptr) |
|
{ |
|
void *ret; |
|
|
|
if ((ret = buffer_get_string_ptr_ret(buffer, length_ptr)) == NULL) |
|
fatal("buffer_get_string_ptr: buffer error"); |
|
return (ret); |
|
} |
|
|
/* |
/* |
* Stores and arbitrary binary string in the buffer. |
* Stores and arbitrary binary string in the buffer. |
*/ |
*/ |
|
|
* Returns a character from the buffer (0 - 255). |
* Returns a character from the buffer (0 - 255). |
*/ |
*/ |
int |
int |
|
buffer_get_char_ret(char *ret, Buffer *buffer) |
|
{ |
|
if (buffer_get_ret(buffer, ret, 1) == -1) { |
|
error("buffer_get_char_ret: buffer_get_ret failed"); |
|
return (-1); |
|
} |
|
return (0); |
|
} |
|
|
|
int |
buffer_get_char(Buffer *buffer) |
buffer_get_char(Buffer *buffer) |
{ |
{ |
char ch; |
char ch; |
buffer_get(buffer, &ch, 1); |
|
|
if (buffer_get_char_ret(&ch, buffer) == -1) |
|
fatal("buffer_get_char: buffer error"); |
return (u_char) ch; |
return (u_char) ch; |
} |
} |
|
|
|
|
buffer_put_char(Buffer *buffer, int value) |
buffer_put_char(Buffer *buffer, int value) |
{ |
{ |
char ch = value; |
char ch = value; |
|
|
buffer_append(buffer, &ch, 1); |
buffer_append(buffer, &ch, 1); |
} |
} |