tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 08:14:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2004/02/23 15:12:46

Browse Source 
[bufaux.c]
     encode 0 correctly in buffer_put_bignum2; noted by Mikulas Patocka
     and drop support for negative BNs; ok otto@
This commit is contained in:
Darren Tucker 2004-02-24 09:21:41 +11:00
parent efa3706f05
commit 0acc92a93c
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -6,6 +6,10 @@
- markus@cvs.openbsd.org 2004/02/23 12:02:33 - markus@cvs.openbsd.org 2004/02/23 12:02:33
[sshd.c] [sshd.c]
backout revision 1.279; set listen socket to non-block; ok henning. backout revision 1.279; set listen socket to non-block; ok henning.
- markus@cvs.openbsd.org 2004/02/23 15:12:46
[bufaux.c]
encode 0 correctly in buffer_put_bignum2; noted by Mikulas Patocka
and drop support for negative BNs; ok otto@
20040223 20040223
- (dtucker) [session.c] Bug #789: Only make setcred call for !privsep in the - (dtucker) [session.c] Bug #789: Only make setcred call for !privsep in the
@ -1909,4 +1913,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au Report from murple@murple.net, diagnosis from dtucker@zip.com.au
$Id: ChangeLog,v 1.3245 2004/02/23 22:20:29 dtucker Exp $ $Id: ChangeLog,v 1.3246 2004/02/23 22:21:41 dtucker Exp $

35
bufaux.c
View File

@ -37,7 +37,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: bufaux.c,v 1.31 2003/11/10 16:23:41 jakob Exp $"); RCSID("$OpenBSD: bufaux.c,v 1.32 2004/02/23 15:12:46 markus Exp $");
#include <openssl/bn.h> #include <openssl/bn.h>
#include "bufaux.h" #include "bufaux.h"
@ -103,46 +103,47 @@ buffer_get_bignum(Buffer *buffer, BIGNUM *value)
void void
buffer_put_bignum2(Buffer *buffer, const BIGNUM *value) buffer_put_bignum2(Buffer *buffer, const BIGNUM *value)
{ {
u_int bytes = BN_num_bytes(value) + 1; u_int bytes;
u_char *buf = xmalloc(bytes); u_char *buf;
int oi; int oi;
u_int hasnohigh = 0; u_int hasnohigh = 0;
if (BN_is_zero(value)) {
buffer_put_int(buffer, 0);
return;
}
if (value->neg)
fatal("buffer_put_bignum2: negative numbers not supported");
bytes = BN_num_bytes(value) + 1; /* extra padding byte */
if (bytes < 2)
fatal("buffer_put_bignum2: BN too small");
buf = xmalloc(bytes);
buf[0] = '\0'; buf[0] = '\0';
/* Get the value of in binary */ /* Get the value of in binary */
oi = BN_bn2bin(value, buf+1); oi = BN_bn2bin(value, buf+1);
if (oi != bytes-1) if (oi != bytes-1)
fatal("buffer_put_bignum: BN_bn2bin() failed: oi %d != bin_size %d", fatal("buffer_put_bignum2: BN_bn2bin() failed: "
oi, bytes); "oi %d != bin_size %d", oi, bytes);
hasnohigh = (buf[1] & 0x80) ? 0 : 1; hasnohigh = (buf[1] & 0x80) ? 0 : 1;
if (value->neg) {
/**XXX should be two's-complement */
int i, carry;
u_char *uc = buf;
logit("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); buffer_put_string(buffer, buf+hasnohigh, bytes-hasnohigh);
memset(buf, 0, bytes); memset(buf, 0, bytes);
xfree(buf); xfree(buf);
} }
/* XXX does not handle negative BNs */
void void
buffer_get_bignum2(Buffer *buffer, BIGNUM *value) buffer_get_bignum2(Buffer *buffer, BIGNUM *value)
{ {
u_int len; u_int len;
u_char *bin = buffer_get_string(buffer, &len); u_char *bin = buffer_get_string(buffer, &len);
if (len > 0 && (bin[0] & 0x80))
fatal("buffer_get_bignum2: negative numbers not supported");
if (len > 8 * 1024) if (len > 8 * 1024)
fatal("buffer_get_bignum2: cannot handle BN of size %d", len); fatal("buffer_get_bignum2: cannot handle BN of size %d", len);
BN_bin2bn(bin, len, value); BN_bin2bn(bin, len, value);
xfree(bin); xfree(bin);
} }
/* /*
* Returns integers from the buffer (msb first). * Returns integers from the buffer (msb first).
*/ */