319 lines
6.4 KiB
C
319 lines
6.4 KiB
C
/* $OpenBSD: bufaux.c,v 1.60 2014/04/30 05:29:56 djm Exp $ */
|
|
/*
|
|
* 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.
|
|
*/
|
|
|
|
/* Emulation wrappers for legacy OpenSSH buffer API atop sshbuf */
|
|
|
|
#include "includes.h"
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include "buffer.h"
|
|
#include "log.h"
|
|
#include "ssherr.h"
|
|
|
|
int
|
|
buffer_get_short_ret(u_short *v, Buffer *buffer)
|
|
{
|
|
int ret;
|
|
|
|
if ((ret = sshbuf_get_u16(buffer, v)) != 0) {
|
|
error("%s: %s", __func__, ssh_err(ret));
|
|
return -1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
u_short
|
|
buffer_get_short(Buffer *buffer)
|
|
{
|
|
u_short ret;
|
|
|
|
if (buffer_get_short_ret(&ret, buffer) == -1)
|
|
fatal("%s: buffer error", __func__);
|
|
|
|
return (ret);
|
|
}
|
|
|
|
int
|
|
buffer_get_int_ret(u_int *v, Buffer *buffer)
|
|
{
|
|
int ret;
|
|
|
|
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)
|
|
{
|
|
u_int ret;
|
|
|
|
if (buffer_get_int_ret(&ret, buffer) == -1)
|
|
fatal("%s: buffer error", __func__);
|
|
|
|
return (ret);
|
|
}
|
|
|
|
int
|
|
buffer_get_int64_ret(u_int64_t *v, Buffer *buffer)
|
|
{
|
|
int ret;
|
|
|
|
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)
|
|
{
|
|
u_int64_t ret;
|
|
|
|
if (buffer_get_int64_ret(&ret, buffer) == -1)
|
|
fatal("%s: buffer error", __func__);
|
|
|
|
return (ret);
|
|
}
|
|
|
|
void
|
|
buffer_put_short(Buffer *buffer, u_short value)
|
|
{
|
|
int ret;
|
|
|
|
if ((ret = sshbuf_put_u16(buffer, value)) != 0)
|
|
fatal("%s: %s", __func__, ssh_err(ret));
|
|
}
|
|
|
|
void
|
|
buffer_put_int(Buffer *buffer, u_int value)
|
|
{
|
|
int ret;
|
|
|
|
if ((ret = sshbuf_put_u32(buffer, value)) != 0)
|
|
fatal("%s: %s", __func__, ssh_err(ret));
|
|
}
|
|
|
|
void
|
|
buffer_put_int64(Buffer *buffer, u_int64_t value)
|
|
{
|
|
int ret;
|
|
|
|
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)
|
|
{
|
|
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 *
|
|
buffer_get_cstring_ret(Buffer *buffer, u_int *length_ptr)
|
|
{
|
|
size_t len;
|
|
int ret;
|
|
char *value;
|
|
|
|
if ((ret = sshbuf_get_cstring(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;
|
|
}
|
|
|
|
char *
|
|
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
|
|
buffer_put_string(Buffer *buffer, const void *buf, u_int len)
|
|
{
|
|
int ret;
|
|
|
|
if ((ret = sshbuf_put_string(buffer, buf, len)) != 0)
|
|
fatal("%s: %s", __func__, ssh_err(ret));
|
|
}
|
|
|
|
void
|
|
buffer_put_cstring(Buffer *buffer, const char *s)
|
|
{
|
|
int ret;
|
|
|
|
if ((ret = sshbuf_put_cstring(buffer, s)) != 0)
|
|
fatal("%s: %s", __func__, ssh_err(ret));
|
|
}
|
|
|
|
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)
|
|
{
|
|
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));
|
|
}
|
|
|
|
#ifdef WIN32_FIXME
|
|
|
|
/*
|
|
* Pop string UTF8 string from buffer and convert it to Local8.
|
|
* This function guaranty, that data (received in UTF8 from network)
|
|
* are correctly translated to local8 CP used by current thread.
|
|
*
|
|
* WARNING: Returned string MUST be free by caller.
|
|
*
|
|
* b - Buffer struct to read data (IN).
|
|
* len - length of returned Locla8 string (OUT).
|
|
*
|
|
* RETURNS: Pointer to new allocated Local8 string or NULL if error.
|
|
*/
|
|
|
|
void *buffer_get_string_local8_from_utf8(Buffer *b, u_int *len)
|
|
{
|
|
char *local8 = NULL;
|
|
|
|
char *utf8 = buffer_get_string(b, len);
|
|
|
|
if (utf8)
|
|
{
|
|
local8 = CovertUtf8ToLocal8(utf8, -1, len);
|
|
|
|
free(utf8);
|
|
}
|
|
|
|
return local8;
|
|
}
|
|
|
|
/*
|
|
* Convert string from Local8 to UTF8 and push it into buffer.
|
|
* This function guaranty, that data stored in local8 CP used by current
|
|
* thread are convert to UTF8 before sent to network.
|
|
*
|
|
* b - Buffer struct to read data (IN).
|
|
* str - Local8 string to push (IN).
|
|
* len - size of str size in bytes (IN).
|
|
*
|
|
*/
|
|
|
|
void buffer_put_string_local8_to_utf8(Buffer *b, const void *str, u_int len)
|
|
{
|
|
u_int utf8Len = 0;
|
|
|
|
char *utf8 = ConvertLocal8ToUtf8(str, len, &utf8Len);
|
|
|
|
if (utf8)
|
|
{
|
|
buffer_put_string(b, utf8, utf8Len);
|
|
|
|
free(utf8);
|
|
}
|
|
}
|
|
|
|
|
|
#endif /* WIN32_FIXME */
|
|
|