mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-12-25 19:32:09 +00:00
6536c7d3c9
- markus@cvs.openbsd.org 2000/06/18 18:50:11 [auth2.c compat.c compat.h sshconnect2.c] make userauth+pubkey interop with ssh.com-2.2.0 - markus@cvs.openbsd.org 2000/06/18 20:56:17 [dsa.c] mem leak + be more paranoid in dsa_verify. - markus@cvs.openbsd.org 2000/06/18 21:29:50 [key.c] cleanup fingerprinting, less hardcoded sizes - markus@cvs.openbsd.org 2000/06/19 19:39:45 [atomicio.c auth-options.c auth-passwd.c auth-rh-rsa.c auth-rhosts.c] [auth-rsa.c auth-skey.c authfd.c authfd.h authfile.c bufaux.c bufaux.h] [buffer.c buffer.h canohost.c channels.c channels.h cipher.c cipher.h] [clientloop.c compat.c compat.h compress.c compress.h crc32.c crc32.h] [deattack.c dispatch.c dsa.c fingerprint.c fingerprint.h getput.h hmac.c] [kex.c log-client.c log-server.c login.c match.c mpaux.c mpaux.h nchan.c] [nchan.h packet.c packet.h pty.c pty.h readconf.c readconf.h readpass.c] [rsa.c rsa.h scp.c servconf.c servconf.h ssh-add.c ssh-keygen.c ssh.c] [ssh.h tildexpand.c ttymodes.c ttymodes.h uidswap.c xmalloc.c xmalloc.h] OpenBSD tag - markus@cvs.openbsd.org 2000/06/21 10:46:10 sshconnect2.c missing free; nuke old comment
162 lines
3.5 KiB
C
162 lines
3.5 KiB
C
/*
|
|
*
|
|
* buffer.c
|
|
*
|
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
|
*
|
|
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
|
* All rights reserved
|
|
*
|
|
* Created: Sat Mar 18 04:15:33 1995 ylo
|
|
*
|
|
* Functions for manipulating fifo buffers (that can grow if needed).
|
|
*
|
|
*/
|
|
|
|
#include "includes.h"
|
|
RCSID("$OpenBSD: buffer.c,v 1.7 2000/06/20 01:39:39 markus Exp $");
|
|
|
|
#include "xmalloc.h"
|
|
#include "buffer.h"
|
|
#include "ssh.h"
|
|
|
|
/* Initializes the buffer structure. */
|
|
|
|
void
|
|
buffer_init(Buffer *buffer)
|
|
{
|
|
buffer->alloc = 4096;
|
|
buffer->buf = xmalloc(buffer->alloc);
|
|
buffer->offset = 0;
|
|
buffer->end = 0;
|
|
}
|
|
|
|
/* Frees any memory used for the buffer. */
|
|
|
|
void
|
|
buffer_free(Buffer *buffer)
|
|
{
|
|
memset(buffer->buf, 0, buffer->alloc);
|
|
xfree(buffer->buf);
|
|
}
|
|
|
|
/*
|
|
* Clears any data from the buffer, making it empty. This does not actually
|
|
* zero the memory.
|
|
*/
|
|
|
|
void
|
|
buffer_clear(Buffer *buffer)
|
|
{
|
|
buffer->offset = 0;
|
|
buffer->end = 0;
|
|
}
|
|
|
|
/* Appends data to the buffer, expanding it if necessary. */
|
|
|
|
void
|
|
buffer_append(Buffer *buffer, const char *data, unsigned int len)
|
|
{
|
|
char *cp;
|
|
buffer_append_space(buffer, &cp, len);
|
|
memcpy(cp, data, len);
|
|
}
|
|
|
|
/*
|
|
* Appends space to the buffer, expanding the buffer if necessary. This does
|
|
* not actually copy the data into the buffer, but instead returns a pointer
|
|
* to the allocated region.
|
|
*/
|
|
|
|
void
|
|
buffer_append_space(Buffer *buffer, char **datap, unsigned int len)
|
|
{
|
|
/* If the buffer is empty, start using it from the beginning. */
|
|
if (buffer->offset == buffer->end) {
|
|
buffer->offset = 0;
|
|
buffer->end = 0;
|
|
}
|
|
restart:
|
|
/* If there is enough space to store all data, store it now. */
|
|
if (buffer->end + len < buffer->alloc) {
|
|
*datap = buffer->buf + buffer->end;
|
|
buffer->end += len;
|
|
return;
|
|
}
|
|
/*
|
|
* If the buffer is quite empty, but all data is at the end, move the
|
|
* data to the beginning and retry.
|
|
*/
|
|
if (buffer->offset > buffer->alloc / 2) {
|
|
memmove(buffer->buf, buffer->buf + buffer->offset,
|
|
buffer->end - buffer->offset);
|
|
buffer->end -= buffer->offset;
|
|
buffer->offset = 0;
|
|
goto restart;
|
|
}
|
|
/* Increase the size of the buffer and retry. */
|
|
buffer->alloc += len + 32768;
|
|
buffer->buf = xrealloc(buffer->buf, buffer->alloc);
|
|
goto restart;
|
|
}
|
|
|
|
/* Returns the number of bytes of data in the buffer. */
|
|
|
|
unsigned int
|
|
buffer_len(Buffer *buffer)
|
|
{
|
|
return buffer->end - buffer->offset;
|
|
}
|
|
|
|
/* Gets data from the beginning of the buffer. */
|
|
|
|
void
|
|
buffer_get(Buffer *buffer, char *buf, unsigned int len)
|
|
{
|
|
if (len > buffer->end - buffer->offset)
|
|
fatal("buffer_get: trying to get more bytes than in buffer");
|
|
memcpy(buf, buffer->buf + buffer->offset, len);
|
|
buffer->offset += len;
|
|
}
|
|
|
|
/* Consumes the given number of bytes from the beginning of the buffer. */
|
|
|
|
void
|
|
buffer_consume(Buffer *buffer, unsigned int bytes)
|
|
{
|
|
if (bytes > buffer->end - buffer->offset)
|
|
fatal("buffer_consume: trying to get more bytes than in buffer");
|
|
buffer->offset += bytes;
|
|
}
|
|
|
|
/* Consumes the given number of bytes from the end of the buffer. */
|
|
|
|
void
|
|
buffer_consume_end(Buffer *buffer, unsigned int bytes)
|
|
{
|
|
if (bytes > buffer->end - buffer->offset)
|
|
fatal("buffer_consume_end: trying to get more bytes than in buffer");
|
|
buffer->end -= bytes;
|
|
}
|
|
|
|
/* Returns a pointer to the first used byte in the buffer. */
|
|
|
|
char *
|
|
buffer_ptr(Buffer *buffer)
|
|
{
|
|
return buffer->buf + buffer->offset;
|
|
}
|
|
|
|
/* Dumps the contents of the buffer to stderr. */
|
|
|
|
void
|
|
buffer_dump(Buffer *buffer)
|
|
{
|
|
int i;
|
|
unsigned char *ucp = (unsigned char *) buffer->buf;
|
|
|
|
for (i = buffer->offset; i < buffer->end; i++)
|
|
fprintf(stderr, " %02x", ucp[i]);
|
|
fprintf(stderr, "\n");
|
|
}
|