src/usr.bin/ssh/bufaux.c - diff

Return to bufaux.c CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/Attic/bufaux.c between version 1.7 and 1.10

version 1.7, 1999/11/24 19:53:44

version 1.10, 2000/04/12 09:39:10

Line 12

* Auxiliary functions for storing and retrieving various data types to/from

* Buffers.

* SSH2 packet format added by Markus Friedl

#include "includes.h"

RCSID("$Id$");

#include "ssh.h"

#include <ssl/bn.h>

#include <openssl/bn.h>

#include "bufaux.h"

#include "xmalloc.h"

#include "getput.h"

Line 32

Line 34

{

int bits = BN_num_bits(value);

int bin_size = (bits + 7) / 8;

char *buf = xmalloc(bin_size);

char unsigned *buf = xmalloc(bin_size);

int oi;

char msg[2];

Line 46

Line 48

PUT_16BIT(msg, bits);

buffer_append(buffer, msg, 2);

/* Store the binary data. */

buffer_append(buffer, buf, oi);

buffer_append(buffer, (char *)buf, oi);

memset(buf, 0, bin_size);

xfree(buf);

Line 68

Line 70

bytes = (bits + 7) / 8;

if (buffer_len(buffer) < bytes)

fatal("buffer_get_bignum: input buffer too small");

bin = buffer_ptr(buffer);

bin = (unsigned char*) buffer_ptr(buffer);

BN_bin2bn(bin, bytes, value);

buffer_consume(buffer, bytes);

Line 76

Line 78

}

* Stores an BIGNUM in the buffer in SSH2 format.

void

buffer_put_bignum2(Buffer *buffer, BIGNUM *value)

{

int bytes = BN_num_bytes(value) + 1;

unsigned char *buf = xmalloc(bytes);

int oi;

int hasnohigh = 0;

buf[0] = '\0';

/* 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);

memset(buf, 0, bytes);

xfree(buf);

}

int

buffer_get_bignum2(Buffer *buffer, BIGNUM *value)

{

/**XXX should be two's-complement */

int len;

unsigned char *bin = (unsigned char *)buffer_get_string(buffer, (unsigned int *)&len);

BN_bin2bn(bin, len, value);

xfree(bin);

return len;

}

* Returns an integer from the buffer (4 bytes, msb first).

unsigned int

Line 134

Line 180

{

buffer_put_int(buffer, len);

buffer_append(buffer, buf, len);

}

void

buffer_put_cstring(Buffer *buffer, const char *s)

{

buffer_put_string(buffer, s, strlen(s));

}