version 1.1, 1999/09/26 20:53:33 |
version 1.60, 2014/04/30 05:29:56 |
|
|
|
/* $OpenBSD$ */ |
/* |
/* |
|
* Copyright (c) 2012 Damien Miller <djm@mindrot.org> |
|
* |
|
* 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. |
|
* |
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES |
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF |
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR |
|
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES |
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN |
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
|
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
|
*/ |
|
|
bufaux.c |
/* Emulation wrappers for legacy OpenSSH buffer API atop sshbuf */ |
|
|
Author: Tatu Ylonen <ylo@cs.hut.fi> |
#include <sys/types.h> |
|
|
Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
#include "buffer.h" |
All rights reserved |
#include "log.h" |
|
#include "ssherr.h" |
|
|
Created: Wed Mar 29 02:24:47 1995 ylo |
int |
|
buffer_get_short_ret(u_short *v, Buffer *buffer) |
|
{ |
|
int ret; |
|
|
Auxiliary functions for storing and retrieving various data types to/from |
if ((ret = sshbuf_get_u16(buffer, v)) != 0) { |
Buffers. |
error("%s: %s", __func__, ssh_err(ret)); |
|
return -1; |
|
} |
|
return 0; |
|
} |
|
|
*/ |
u_short |
|
buffer_get_short(Buffer *buffer) |
|
{ |
|
u_short ret; |
|
|
#include "includes.h" |
if (buffer_get_short_ret(&ret, buffer) == -1) |
RCSID("$Id$"); |
fatal("%s: buffer error", __func__); |
|
|
#include "ssh.h" |
return (ret); |
#include "gmp.h" |
} |
#include "bufaux.h" |
|
#include "xmalloc.h" |
|
#include "getput.h" |
|
|
|
/* Stores an MP_INT in the buffer with a 2-byte msb first bit count, followed |
int |
by (bits+7)/8 bytes of binary data, msb first. */ |
buffer_get_int_ret(u_int *v, Buffer *buffer) |
|
{ |
|
int ret; |
|
|
void buffer_put_mp_int(Buffer *buffer, MP_INT *value) |
if ((ret = sshbuf_get_u32(buffer, v)) != 0) { |
|
error("%s: %s", __func__, ssh_err(ret)); |
|
return -1; |
|
} |
|
return 0; |
|
} |
|
|
|
u_int |
|
buffer_get_int(Buffer *buffer) |
{ |
{ |
int bits = mpz_sizeinbase(value, 2); |
u_int ret; |
int hex_size = mpz_sizeinbase(value, 16); |
|
char *buf = xmalloc(hex_size + 2); |
|
int i, oi, byte; |
|
char msg[2]; |
|
|
|
/* Get the value of the number in hex. Too bad that gmp does not allow |
|
us to get it in binary. */ |
|
mpz_get_str(buf, 16, value); |
|
|
|
/* i is "input index", oi is "output index". Both point to the same array, |
if (buffer_get_int_ret(&ret, buffer) == -1) |
and start from the beginning. "input index" moves twice as fast. */ |
fatal("%s: buffer error", __func__); |
i = 0; |
|
oi = 0; |
|
/* Check for an odd number of hex digits. Process the odd digit |
|
separately. */ |
|
if (hex_size & 1) |
|
{ |
|
sscanf(buf, "%1x", &byte); |
|
buf[oi++] = byte; |
|
i = 1; |
|
} |
|
|
|
/* Convert the hex number into binary representation. */ |
return (ret); |
for (; i < hex_size; i += 2) |
|
{ |
|
sscanf(buf + i, "%2x", &byte); |
|
buf[oi++] = byte; |
|
} |
|
|
|
assert(oi == ((bits + 7) / 8)); |
|
/* 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, buf, oi); |
|
/* Clear the temporary data. */ |
|
memset(buf, 0, hex_size); |
|
xfree(buf); |
|
} |
} |
|
|
/* Retrieves an MP_INT from the buffer. */ |
int |
|
buffer_get_int64_ret(u_int64_t *v, Buffer *buffer) |
|
{ |
|
int ret; |
|
|
int buffer_get_mp_int(Buffer *buffer, MP_INT *value) |
if ((ret = sshbuf_get_u64(buffer, v)) != 0) { |
|
error("%s: %s", __func__, ssh_err(ret)); |
|
return -1; |
|
} |
|
return 0; |
|
} |
|
|
|
u_int64_t |
|
buffer_get_int64(Buffer *buffer) |
{ |
{ |
int i, bits, bytes; |
u_int64_t ret; |
char *hex; |
|
unsigned char buf[2]; |
|
|
|
/* Get the number for bits. */ |
if (buffer_get_int64_ret(&ret, buffer) == -1) |
buffer_get(buffer, (char *)buf, 2); |
fatal("%s: buffer error", __func__); |
bits = GET_16BIT(buf); |
|
/* Compute the number of binary bytes that follow. */ |
return (ret); |
bytes = (bits + 7) / 8; |
|
/* Allocate space for a corresponding hex string. */ |
|
hex = xmalloc(2 * bytes + 1); |
|
|
|
/* Read and convert the binary bytes into a hex string. */ |
|
for (i = 0; i < bytes; i++) |
|
{ |
|
unsigned char byte; |
|
buffer_get(buffer, (char *)&byte, 1); |
|
sprintf(hex + 2 * i, "%02x", byte); |
|
} |
|
/* Read the hex string into a mp-int. */ |
|
mpz_set_str(value, hex, 16); |
|
/* Free the string. */ |
|
xfree(hex); |
|
return 2 + bytes; |
|
} |
} |
|
|
/* Returns an integer from the buffer (4 bytes, msb first). */ |
void |
|
buffer_put_short(Buffer *buffer, u_short value) |
|
{ |
|
int ret; |
|
|
unsigned int buffer_get_int(Buffer *buffer) |
if ((ret = sshbuf_put_u16(buffer, value)) != 0) |
|
fatal("%s: %s", __func__, ssh_err(ret)); |
|
} |
|
|
|
void |
|
buffer_put_int(Buffer *buffer, u_int value) |
{ |
{ |
unsigned char buf[4]; |
int ret; |
buffer_get(buffer, (char *)buf, 4); |
|
return GET_32BIT(buf); |
if ((ret = sshbuf_put_u32(buffer, value)) != 0) |
|
fatal("%s: %s", __func__, ssh_err(ret)); |
} |
} |
|
|
/* Stores an integer in the buffer in 4 bytes, msb first. */ |
void |
|
buffer_put_int64(Buffer *buffer, u_int64_t value) |
|
{ |
|
int ret; |
|
|
void buffer_put_int(Buffer *buffer, unsigned int value) |
if ((ret = sshbuf_put_u64(buffer, value)) != 0) |
|
fatal("%s: %s", __func__, ssh_err(ret)); |
|
} |
|
|
|
void * |
|
buffer_get_string_ret(Buffer *buffer, u_int *length_ptr) |
{ |
{ |
char buf[4]; |
size_t len; |
PUT_32BIT(buf, value); |
int ret; |
buffer_append(buffer, buf, 4); |
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; |
} |
} |
|
|
/* Returns an arbitrary binary string from the buffer. The string cannot |
void * |
be longer than 256k. The returned value points to memory allocated |
buffer_get_string(Buffer *buffer, u_int *length_ptr) |
with xmalloc; it is the responsibility of the calling function to free |
{ |
the data. If length_ptr is non-NULL, the length of the returned data |
void *ret; |
will be stored there. A null character will be automatically appended |
|
to the returned string, and is not counted in length. */ |
|
|
|
char *buffer_get_string(Buffer *buffer, unsigned int *length_ptr) |
if ((ret = buffer_get_string_ret(buffer, length_ptr)) == NULL) |
|
fatal("%s: buffer error", __func__); |
|
return (ret); |
|
} |
|
|
|
char * |
|
buffer_get_cstring_ret(Buffer *buffer, u_int *length_ptr) |
{ |
{ |
unsigned int len; |
size_t len; |
char *value; |
int ret; |
/* Get the length. */ |
char *value; |
len = buffer_get_int(buffer); |
|
if (len > 256*1024) |
if ((ret = sshbuf_get_cstring(buffer, &value, &len)) != 0) { |
fatal("Received packet with bad string length %d", len); |
error("%s: %s", __func__, ssh_err(ret)); |
/* Allocate space for the string. Add one byte for a null character. */ |
return NULL; |
value = xmalloc(len + 1); |
} |
/* Get the string. */ |
if (length_ptr != NULL) |
buffer_get(buffer, value, len); |
*length_ptr = len; /* Safe: sshbuf never stores len > 2^31 */ |
/* Append a null character to make processing easier. */ |
return value; |
value[len] = 0; |
|
/* Optionally return the length of the string. */ |
|
if (length_ptr) |
|
*length_ptr = len; |
|
return value; |
|
} |
} |
|
|
/* Stores and arbitrary binary string in the buffer. */ |
char * |
|
buffer_get_cstring(Buffer *buffer, u_int *length_ptr) |
|
{ |
|
char *ret; |
|
|
void buffer_put_string(Buffer *buffer, const void *buf, unsigned int len) |
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) |
{ |
{ |
buffer_put_int(buffer, len); |
size_t len; |
buffer_append(buffer, buf, 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; |
} |
} |
|
|
/* Returns a character from the buffer (0 - 255). */ |
const void * |
|
buffer_get_string_ptr(Buffer *buffer, u_int *length_ptr) |
|
{ |
|
const void *ret; |
|
|
int buffer_get_char(Buffer *buffer) |
if ((ret = buffer_get_string_ptr_ret(buffer, length_ptr)) == NULL) |
|
fatal("%s: buffer error", __func__); |
|
return (ret); |
|
} |
|
|
|
void |
|
buffer_put_string(Buffer *buffer, const void *buf, u_int len) |
{ |
{ |
char ch; |
int ret; |
buffer_get(buffer, &ch, 1); |
|
return (unsigned char)ch; |
if ((ret = sshbuf_put_string(buffer, buf, len)) != 0) |
|
fatal("%s: %s", __func__, ssh_err(ret)); |
} |
} |
|
|
/* Stores a character in the buffer. */ |
void |
|
buffer_put_cstring(Buffer *buffer, const char *s) |
|
{ |
|
int ret; |
|
|
void buffer_put_char(Buffer *buffer, int value) |
if ((ret = sshbuf_put_cstring(buffer, s)) != 0) |
|
fatal("%s: %s", __func__, ssh_err(ret)); |
|
} |
|
|
|
int |
|
buffer_get_char_ret(char *v, Buffer *buffer) |
{ |
{ |
char ch = value; |
int ret; |
buffer_append(buffer, &ch, 1); |
|
|
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) |
|
{ |
|
char ch; |
|
|
|
if (buffer_get_char_ret(&ch, buffer) == -1) |
|
fatal("%s: buffer error", __func__); |
|
return (u_char) ch; |
|
} |
|
|
|
void |
|
buffer_put_char(Buffer *buffer, int value) |
|
{ |
|
int ret; |
|
|
|
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)); |
|
} |
|
|