diff options
author | kris <kris@FreeBSD.org> | 2000-03-26 07:37:48 +0000 |
---|---|---|
committer | kris <kris@FreeBSD.org> | 2000-03-26 07:37:48 +0000 |
commit | 6948a837767a9680a772b450c7b732a4ae2cb6b3 (patch) | |
tree | b3a49bfc6fa4a3d8454dabb3d5e8eb13430c567f /crypto/openssh/bufaux.c | |
parent | e46dd7a5de99ccc52b80f94f507cb226ce21c6d0 (diff) | |
download | FreeBSD-src-6948a837767a9680a772b450c7b732a4ae2cb6b3.zip FreeBSD-src-6948a837767a9680a772b450c7b732a4ae2cb6b3.tar.gz |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/bufaux.c')
-rw-r--r-- | crypto/openssh/bufaux.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/openssh/bufaux.c b/crypto/openssh/bufaux.c index 4e25768..6a0c559 100644 --- a/crypto/openssh/bufaux.c +++ b/crypto/openssh/bufaux.c @@ -16,7 +16,7 @@ */ #include "includes.h" -RCSID("$Id: bufaux.c,v 1.7 1999/11/24 19:53:44 markus Exp $"); +RCSID("$Id: bufaux.c,v 1.8 2000/03/16 20:56:14 markus Exp $"); #include "ssh.h" #include <openssl/bn.h> @@ -33,7 +33,7 @@ buffer_put_bignum(Buffer *buffer, BIGNUM *value) { 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]; @@ -47,7 +47,7 @@ buffer_put_bignum(Buffer *buffer, BIGNUM *value) 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); @@ -69,7 +69,7 @@ buffer_get_bignum(Buffer *buffer, BIGNUM *value) 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); |