version 1.12, 2000/06/20 01:39:39 |
version 1.60, 2014/04/30 05:29:56 |
|
|
|
/* $OpenBSD$ */ |
/* |
/* |
|
* Copyright (c) 2012 Damien Miller <djm@mindrot.org> |
* |
* |
* bufaux.c |
* Permission to use, copy, modify, and distribute this software for any |
|
* purpose with or without fee is hereby granted, provided that the above |
|
* copyright notice and this permission notice appear in all copies. |
* |
* |
* Author: Tatu Ylonen <ylo@cs.hut.fi> |
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES |
* |
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF |
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR |
* All rights reserved |
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES |
* |
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN |
* Created: Wed Mar 29 02:24:47 1995 ylo |
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* |
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
* Auxiliary functions for storing and retrieving various data types to/from |
|
* Buffers. |
|
* |
|
* SSH2 packet format added by Markus Friedl |
|
* |
|
*/ |
*/ |
|
|
#include "includes.h" |
/* Emulation wrappers for legacy OpenSSH buffer API atop sshbuf */ |
RCSID("$OpenBSD$"); |
|
|
|
#include "ssh.h" |
#include <sys/types.h> |
#include <openssl/bn.h> |
|
#include "bufaux.h" |
|
#include "xmalloc.h" |
|
#include "getput.h" |
|
|
|
/* |
#include "buffer.h" |
* Stores an BIGNUM in the buffer with a 2-byte msb first bit count, followed |
#include "log.h" |
* by (bits+7)/8 bytes of binary data, msb first. |
#include "ssherr.h" |
*/ |
|
void |
int |
buffer_put_bignum(Buffer *buffer, BIGNUM *value) |
buffer_get_short_ret(u_short *v, Buffer *buffer) |
{ |
{ |
int bits = BN_num_bits(value); |
int ret; |
int bin_size = (bits + 7) / 8; |
|
char unsigned *buf = xmalloc(bin_size); |
|
int oi; |
|
char msg[2]; |
|
|
|
/* Get the value of in binary */ |
if ((ret = sshbuf_get_u16(buffer, v)) != 0) { |
oi = BN_bn2bin(value, buf); |
error("%s: %s", __func__, ssh_err(ret)); |
if (oi != bin_size) |
return -1; |
fatal("buffer_put_bignum: BN_bn2bin() failed: oi %d != bin_size %d", |
} |
oi, bin_size); |
return 0; |
|
} |
|
|
/* Store the number of bits in the buffer in two bytes, msb first. */ |
u_short |
PUT_16BIT(msg, bits); |
buffer_get_short(Buffer *buffer) |
buffer_append(buffer, msg, 2); |
{ |
/* Store the binary data. */ |
u_short ret; |
buffer_append(buffer, (char *)buf, oi); |
|
|
|
memset(buf, 0, bin_size); |
if (buffer_get_short_ret(&ret, buffer) == -1) |
xfree(buf); |
fatal("%s: buffer error", __func__); |
|
|
|
return (ret); |
} |
} |
|
|
/* |
|
* Retrieves an BIGNUM from the buffer. |
|
*/ |
|
int |
int |
buffer_get_bignum(Buffer *buffer, BIGNUM *value) |
buffer_get_int_ret(u_int *v, Buffer *buffer) |
{ |
{ |
int bits, bytes; |
int ret; |
unsigned char buf[2], *bin; |
|
|
|
/* Get the number for bits. */ |
if ((ret = sshbuf_get_u32(buffer, v)) != 0) { |
buffer_get(buffer, (char *) buf, 2); |
error("%s: %s", __func__, ssh_err(ret)); |
bits = GET_16BIT(buf); |
return -1; |
/* Compute the number of binary bytes that follow. */ |
} |
bytes = (bits + 7) / 8; |
return 0; |
if (buffer_len(buffer) < bytes) |
} |
fatal("buffer_get_bignum: input buffer too small"); |
|
bin = (unsigned char*) buffer_ptr(buffer); |
|
BN_bin2bn(bin, bytes, value); |
|
buffer_consume(buffer, bytes); |
|
|
|
return 2 + bytes; |
u_int |
|
buffer_get_int(Buffer *buffer) |
|
{ |
|
u_int ret; |
|
|
|
if (buffer_get_int_ret(&ret, buffer) == -1) |
|
fatal("%s: buffer error", __func__); |
|
|
|
return (ret); |
} |
} |
|
|
/* |
int |
* Stores an BIGNUM in the buffer in SSH2 format. |
buffer_get_int64_ret(u_int64_t *v, Buffer *buffer) |
*/ |
|
void |
|
buffer_put_bignum2(Buffer *buffer, BIGNUM *value) |
|
{ |
{ |
int bytes = BN_num_bytes(value) + 1; |
int ret; |
unsigned char *buf = xmalloc(bytes); |
|
int oi; |
if ((ret = sshbuf_get_u64(buffer, v)) != 0) { |
int hasnohigh = 0; |
error("%s: %s", __func__, ssh_err(ret)); |
buf[0] = '\0'; |
return -1; |
/* 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; |
|
unsigned 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); |
return 0; |
memset(buf, 0, bytes); |
|
xfree(buf); |
|
} |
} |
|
|
int |
u_int64_t |
buffer_get_bignum2(Buffer *buffer, BIGNUM *value) |
buffer_get_int64(Buffer *buffer) |
{ |
{ |
/**XXX should be two's-complement */ |
u_int64_t ret; |
int len; |
|
unsigned char *bin = (unsigned char *)buffer_get_string(buffer, (unsigned int *)&len); |
if (buffer_get_int64_ret(&ret, buffer) == -1) |
BN_bin2bn(bin, len, value); |
fatal("%s: buffer error", __func__); |
xfree(bin); |
|
return len; |
return (ret); |
} |
} |
|
|
/* |
void |
* Returns an integer from the buffer (4 bytes, msb first). |
buffer_put_short(Buffer *buffer, u_short value) |
*/ |
|
unsigned int |
|
buffer_get_int(Buffer *buffer) |
|
{ |
{ |
unsigned char buf[4]; |
int ret; |
buffer_get(buffer, (char *) buf, 4); |
|
return GET_32BIT(buf); |
if ((ret = sshbuf_put_u16(buffer, value)) != 0) |
|
fatal("%s: %s", __func__, ssh_err(ret)); |
} |
} |
|
|
/* |
|
* Stores an integer in the buffer in 4 bytes, msb first. |
|
*/ |
|
void |
void |
buffer_put_int(Buffer *buffer, unsigned int value) |
buffer_put_int(Buffer *buffer, u_int value) |
{ |
{ |
char buf[4]; |
int ret; |
PUT_32BIT(buf, value); |
|
buffer_append(buffer, buf, 4); |
if ((ret = sshbuf_put_u32(buffer, value)) != 0) |
|
fatal("%s: %s", __func__, ssh_err(ret)); |
} |
} |
|
|
/* |
void |
* Returns an arbitrary binary string from the buffer. The string cannot |
buffer_put_int64(Buffer *buffer, u_int64_t value) |
* be longer than 256k. The returned value points to memory allocated |
{ |
* with xmalloc; it is the responsibility of the calling function to free |
int ret; |
* the data. If length_ptr is non-NULL, the length of the returned data |
|
* will be stored there. A null character will be automatically appended |
if ((ret = sshbuf_put_u64(buffer, value)) != 0) |
* to the returned string, and is not counted in length. |
fatal("%s: %s", __func__, ssh_err(ret)); |
*/ |
} |
|
|
|
void * |
|
buffer_get_string_ret(Buffer *buffer, u_int *length_ptr) |
|
{ |
|
size_t len; |
|
int ret; |
|
u_char *value; |
|
|
|
if ((ret = sshbuf_get_string(buffer, &value, &len)) != 0) { |
|
error("%s: %s", __func__, ssh_err(ret)); |
|
return NULL; |
|
} |
|
if (length_ptr != NULL) |
|
*length_ptr = len; /* Safe: sshbuf never stores len > 2^31 */ |
|
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("%s: buffer error", __func__); |
|
return (ret); |
|
} |
|
|
char * |
char * |
buffer_get_string(Buffer *buffer, unsigned int *length_ptr) |
buffer_get_cstring_ret(Buffer *buffer, u_int *length_ptr) |
{ |
{ |
unsigned int len; |
size_t len; |
|
int ret; |
char *value; |
char *value; |
/* Get the length. */ |
|
len = buffer_get_int(buffer); |
if ((ret = sshbuf_get_cstring(buffer, &value, &len)) != 0) { |
if (len > 256 * 1024) |
error("%s: %s", __func__, ssh_err(ret)); |
fatal("Received packet with bad string length %d", len); |
return NULL; |
/* Allocate space for the string. Add one byte for a null character. */ |
} |
value = xmalloc(len + 1); |
if (length_ptr != NULL) |
/* Get the string. */ |
*length_ptr = len; /* Safe: sshbuf never stores len > 2^31 */ |
buffer_get(buffer, value, len); |
|
/* Append a null character to make processing easier. */ |
|
value[len] = 0; |
|
/* Optionally return the length of the string. */ |
|
if (length_ptr) |
|
*length_ptr = len; |
|
return value; |
return value; |
} |
} |
|
|
/* |
char * |
* Stores and arbitrary binary string in the buffer. |
buffer_get_cstring(Buffer *buffer, u_int *length_ptr) |
*/ |
{ |
|
char *ret; |
|
|
|
if ((ret = buffer_get_cstring_ret(buffer, length_ptr)) == NULL) |
|
fatal("%s: buffer error", __func__); |
|
return ret; |
|
} |
|
|
|
const void * |
|
buffer_get_string_ptr_ret(Buffer *buffer, u_int *length_ptr) |
|
{ |
|
size_t len; |
|
int ret; |
|
const u_char *value; |
|
|
|
if ((ret = sshbuf_get_string_direct(buffer, &value, &len)) != 0) { |
|
error("%s: %s", __func__, ssh_err(ret)); |
|
return NULL; |
|
} |
|
if (length_ptr != NULL) |
|
*length_ptr = len; /* Safe: sshbuf never stores len > 2^31 */ |
|
return value; |
|
} |
|
|
|
const void * |
|
buffer_get_string_ptr(Buffer *buffer, u_int *length_ptr) |
|
{ |
|
const void *ret; |
|
|
|
if ((ret = buffer_get_string_ptr_ret(buffer, length_ptr)) == NULL) |
|
fatal("%s: buffer error", __func__); |
|
return (ret); |
|
} |
|
|
void |
void |
buffer_put_string(Buffer *buffer, const void *buf, unsigned int len) |
buffer_put_string(Buffer *buffer, const void *buf, u_int len) |
{ |
{ |
buffer_put_int(buffer, len); |
int ret; |
buffer_append(buffer, buf, len); |
|
|
if ((ret = sshbuf_put_string(buffer, buf, len)) != 0) |
|
fatal("%s: %s", __func__, ssh_err(ret)); |
} |
} |
|
|
void |
void |
buffer_put_cstring(Buffer *buffer, const char *s) |
buffer_put_cstring(Buffer *buffer, const char *s) |
{ |
{ |
buffer_put_string(buffer, s, strlen(s)); |
int ret; |
|
|
|
if ((ret = sshbuf_put_cstring(buffer, s)) != 0) |
|
fatal("%s: %s", __func__, ssh_err(ret)); |
} |
} |
|
|
/* |
|
* Returns a character from the buffer (0 - 255). |
|
*/ |
|
int |
int |
|
buffer_get_char_ret(char *v, Buffer *buffer) |
|
{ |
|
int ret; |
|
|
|
if ((ret = sshbuf_get_u8(buffer, (u_char *)v)) != 0) { |
|
error("%s: %s", __func__, ssh_err(ret)); |
|
return -1; |
|
} |
|
return 0; |
|
} |
|
|
|
int |
buffer_get_char(Buffer *buffer) |
buffer_get_char(Buffer *buffer) |
{ |
{ |
char ch; |
char ch; |
buffer_get(buffer, &ch, 1); |
|
return (unsigned char) ch; |
if (buffer_get_char_ret(&ch, buffer) == -1) |
|
fatal("%s: buffer error", __func__); |
|
return (u_char) ch; |
} |
} |
|
|
/* |
|
* Stores a character in the buffer. |
|
*/ |
|
void |
void |
buffer_put_char(Buffer *buffer, int value) |
buffer_put_char(Buffer *buffer, int value) |
{ |
{ |
char ch = value; |
int ret; |
buffer_append(buffer, &ch, 1); |
|
|
if ((ret = sshbuf_put_u8(buffer, value)) != 0) |
|
fatal("%s: %s", __func__, ssh_err(ret)); |
} |
} |
|
|
|
void |
|
buffer_put_bignum2_from_string(Buffer *buffer, const u_char *s, u_int l) |
|
{ |
|
int ret; |
|
|
|
if ((ret = sshbuf_put_bignum2_bytes(buffer, s, l)) != 0) |
|
fatal("%s: %s", __func__, ssh_err(ret)); |
|
} |
|
|