tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-31 01:35:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2002/03/26 23:14:51

Browse Source 
[kex.c]
     generate a new cookie for each SSH2_MSG_KEXINIT message we send out
This commit is contained in:
Ben Lindstrom 2002-03-27 17:42:57 +00:00
parent e1f9e324e9
commit 599717246c
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -20,6 +20,9 @@
- markus@cvs.openbsd.org 2002/03/26 23:13:03 - markus@cvs.openbsd.org 2002/03/26 23:13:03
[auth-rsa.c] [auth-rsa.c]
disallow RSA keys < 768 for protocol 1, too (rhosts-rsa and rsa auth) disallow RSA keys < 768 for protocol 1, too (rhosts-rsa and rsa auth)
- markus@cvs.openbsd.org 2002/03/26 23:14:51
[kex.c]
generate a new cookie for each SSH2_MSG_KEXINIT message we send out
20020325 20020325
- (stevesk) import OpenBSD <sys/tree.h> as "openbsd-compat/tree.h" - (stevesk) import OpenBSD <sys/tree.h> as "openbsd-compat/tree.h"
@ -8083,4 +8086,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1999 2002/03/27 17:38:43 mouring Exp $ $Id: ChangeLog,v 1.2000 2002/03/27 17:42:57 mouring Exp $

30
kex.c
View File

@ -23,7 +23,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: kex.c,v 1.48 2002/03/18 17:50:31 provos Exp $"); RCSID("$OpenBSD: kex.c,v 1.49 2002/03/26 23:14:51 markus Exp $");
#include <openssl/crypto.h> #include <openssl/crypto.h>
@ -57,16 +57,15 @@ static void kex_choose_conf(Kex *);
static void static void
kex_prop2buf(Buffer *b, char *proposal[PROPOSAL_MAX]) kex_prop2buf(Buffer *b, char *proposal[PROPOSAL_MAX])
{ {
u_int32_t rand = 0;
int i; int i;
buffer_clear(b); buffer_clear(b);
for (i = 0; i < KEX_COOKIE_LEN; i++) { /*
if (i % 4 == 0) * add a dummy cookie, the cookie will be overwritten by
rand = arc4random(); * kex_send_kexinit(), each time a kexinit is set
buffer_put_char(b, rand & 0xff); */
rand >>= 8; for (i = 0; i < KEX_COOKIE_LEN; i++)
} buffer_put_char(b, 0);
for (i = 0; i < PROPOSAL_MAX; i++) for (i = 0; i < PROPOSAL_MAX; i++)
buffer_put_cstring(b, proposal[i]); buffer_put_cstring(b, proposal[i]);
buffer_put_char(b, 0); /* first_kex_packet_follows */ buffer_put_char(b, 0); /* first_kex_packet_follows */
@ -152,6 +151,10 @@ kex_finish(Kex *kex)
void void
kex_send_kexinit(Kex *kex) kex_send_kexinit(Kex *kex)
{ {
u_int32_t rand = 0;
u_char *cookie;
int i;
if (kex == NULL) { if (kex == NULL) {
error("kex_send_kexinit: no kex, cannot rekey"); error("kex_send_kexinit: no kex, cannot rekey");
return; return;
@ -161,6 +164,17 @@ kex_send_kexinit(Kex *kex)
return; return;
} }
kex->done = 0; kex->done = 0;
/* generate a random cookie */
if (buffer_len(&kex->my) < KEX_COOKIE_LEN)
fatal("kex_send_kexinit: kex proposal too short");
cookie = buffer_ptr(&kex->my);
for (i = 0; i < KEX_COOKIE_LEN; i++) {
if (i % 4 == 0)
rand = arc4random();
cookie[i] = rand;
rand >>= 8;
}
packet_start(SSH2_MSG_KEXINIT); packet_start(SSH2_MSG_KEXINIT);
packet_put_raw(buffer_ptr(&kex->my), buffer_len(&kex->my)); packet_put_raw(buffer_ptr(&kex->my), buffer_len(&kex->my));
packet_send(); packet_send();