diff options
| author |   markus <markus@openbsd.org> | 1999-12-08 22:37:42 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 1999-12-08 22:37:42 +0000 |
| commit | c202891a8d84ed41df55552f148f0096240cbfbe (patch) | |
| tree | e70f675577d008c06d264c2b8caf227be01e76a3 | |
| parent | DEC/Intel 21143 and "tulip" clone Ethernet driver. Intended to replace the (diff) | |
| download | wireguard-openbsd-c202891a8d84ed41df55552f148f0096240cbfbe.tar.xz wireguard-openbsd-c202891a8d84ed41df55552f148f0096240cbfbe.zip | |
make code simpler. no need for memcpy. niels@ ok
| -rw-r--r-- | usr.bin/ssh/mpaux.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/ssh/mpaux.c b/usr.bin/ssh/mpaux.c index df045004b8d..1508650119d 100644 --- a/usr.bin/ssh/mpaux.c +++ b/usr.bin/ssh/mpaux.c @@ -15,7 +15,7 @@ */ #include "includes.h" -RCSID("$Id: mpaux.c,v 1.8 1999/11/24 00:26:02 deraadt Exp $"); +RCSID("$Id: mpaux.c,v 1.9 1999/12/08 22:37:42 markus Exp $"); #include <ssl/bn.h> #include "getput.h" @@ -29,17 +29,17 @@ compute_session_id(unsigned char session_id[16], BIGNUM* host_key_n, BIGNUM* session_key_n) { - unsigned int host_key_bits = BN_num_bits(host_key_n); - unsigned int session_key_bits = BN_num_bits(session_key_n); - unsigned int bytes = (host_key_bits + 7) / 8 + (session_key_bits + 7) / 8 + 8; + unsigned int host_key_bytes = BN_num_bytes(host_key_n); + unsigned int session_key_bytes = BN_num_bytes(session_key_n); + unsigned int bytes = host_key_bytes + session_key_bytes; unsigned char *buf = xmalloc(bytes); MD5_CTX md; BN_bn2bin(host_key_n, buf); - BN_bn2bin(session_key_n, buf + (host_key_bits + 7) / 8); - memcpy(buf + (host_key_bits + 7) / 8 + (session_key_bits + 7) / 8, cookie, 8); + BN_bn2bin(session_key_n, buf + host_key_bytes); MD5_Init(&md); MD5_Update(&md, buf, bytes); + MD5_Update(&md, cookie, 8); MD5_Final(session_id, &md); memset(buf, 0, bytes); xfree(buf); |