mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-12-19 08:34:32 +00:00
05e82c3b96
[bufaux.c bufbn.c bufec.c buffer.c buffer.h sshbuf-getput-basic.c]
[sshbuf-getput-crypto.c sshbuf-misc.c sshbuf.c sshbuf.h ssherr.c]
[ssherr.h]
New buffer API; the first installment of the conversion/replacement
of OpenSSH's internals to make them usable as a standalone library.
This includes a set of wrappers to make it compatible with the
existing buffer API so replacement can occur incrementally.
With and ok markus@
Thanks also to Ben Hawkes, David Tomaschik, Ivan Fratric, Matthew
Dempsky and Ron Bowes for a detailed review.
99 lines
3.5 KiB
C
99 lines
3.5 KiB
C
/* $OpenBSD: buffer.h,v 1.25 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 */
|
|
|
|
#ifndef BUFFER_H
|
|
#define BUFFER_H
|
|
|
|
#include "sshbuf.h"
|
|
|
|
typedef struct sshbuf Buffer;
|
|
|
|
#define buffer_init(b) sshbuf_init(b)
|
|
#define buffer_clear(b) sshbuf_reset(b)
|
|
#define buffer_free(b) sshbuf_free(b)
|
|
#define buffer_dump(b) sshbuf_dump(b, stderr)
|
|
|
|
/* XXX cast is safe: sshbuf never stores more than len 2^31 */
|
|
#define buffer_len(b) ((u_int) sshbuf_len(b))
|
|
#define buffer_ptr(b) sshbuf_mutable_ptr(b)
|
|
|
|
void buffer_append(Buffer *, const void *, u_int);
|
|
void *buffer_append_space(Buffer *, u_int);
|
|
int buffer_check_alloc(Buffer *, u_int);
|
|
void buffer_get(Buffer *, void *, u_int);
|
|
|
|
void buffer_consume(Buffer *, u_int);
|
|
void buffer_consume_end(Buffer *, u_int);
|
|
|
|
|
|
int buffer_get_ret(Buffer *, void *, u_int);
|
|
int buffer_consume_ret(Buffer *, u_int);
|
|
int buffer_consume_end_ret(Buffer *, u_int);
|
|
|
|
#include <openssl/bn.h>
|
|
void buffer_put_bignum(Buffer *, const BIGNUM *);
|
|
void buffer_put_bignum2(Buffer *, const BIGNUM *);
|
|
void buffer_get_bignum(Buffer *, BIGNUM *);
|
|
void buffer_get_bignum2(Buffer *, BIGNUM *);
|
|
void buffer_put_bignum2_from_string(Buffer *, const u_char *, u_int);
|
|
|
|
u_short buffer_get_short(Buffer *);
|
|
void buffer_put_short(Buffer *, u_short);
|
|
|
|
u_int buffer_get_int(Buffer *);
|
|
void buffer_put_int(Buffer *, u_int);
|
|
|
|
u_int64_t buffer_get_int64(Buffer *);
|
|
void buffer_put_int64(Buffer *, u_int64_t);
|
|
|
|
int buffer_get_char(Buffer *);
|
|
void buffer_put_char(Buffer *, int);
|
|
|
|
void *buffer_get_string(Buffer *, u_int *);
|
|
const void *buffer_get_string_ptr(Buffer *, u_int *);
|
|
void buffer_put_string(Buffer *, const void *, u_int);
|
|
char *buffer_get_cstring(Buffer *, u_int *);
|
|
void buffer_put_cstring(Buffer *, const char *);
|
|
|
|
#define buffer_skip_string(b) (void)buffer_get_string_ptr(b, NULL);
|
|
|
|
int buffer_put_bignum_ret(Buffer *, const BIGNUM *);
|
|
int buffer_get_bignum_ret(Buffer *, BIGNUM *);
|
|
int buffer_put_bignum2_ret(Buffer *, const BIGNUM *);
|
|
int buffer_get_bignum2_ret(Buffer *, BIGNUM *);
|
|
int buffer_get_short_ret(u_short *, Buffer *);
|
|
int buffer_get_int_ret(u_int *, Buffer *);
|
|
int buffer_get_int64_ret(u_int64_t *, Buffer *);
|
|
void *buffer_get_string_ret(Buffer *, u_int *);
|
|
char *buffer_get_cstring_ret(Buffer *, u_int *);
|
|
const void *buffer_get_string_ptr_ret(Buffer *, u_int *);
|
|
int buffer_get_char_ret(char *, Buffer *);
|
|
|
|
#ifdef OPENSSL_HAS_ECC
|
|
#include <openssl/ec.h>
|
|
int buffer_put_ecpoint_ret(Buffer *, const EC_GROUP *, const EC_POINT *);
|
|
void buffer_put_ecpoint(Buffer *, const EC_GROUP *, const EC_POINT *);
|
|
int buffer_get_ecpoint_ret(Buffer *, const EC_GROUP *, EC_POINT *);
|
|
void buffer_get_ecpoint(Buffer *, const EC_GROUP *, EC_POINT *);
|
|
#endif
|
|
|
|
#endif /* BUFFER_H */
|
|
|