summaryrefslogtreecommitdiff
path: root/packet.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-04-04 17:52:53 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-04-04 17:52:53 +0000
commit238abf6a14d6ed038918fa35f618089230e68fd6 (patch)
tree7a856c03b822853fc08ef711e6a0bf05c738e6a0 /packet.c
parent22b19b43e420c9fc711a38631187820573d0f047 (diff)
- markus@cvs.openbsd.org 2001/04/04 09:48:35
[kex.c kex.h kexdh.c kexgex.c packet.c sshconnect2.c sshd.c] don't sent multiple kexinit-requests. send newkeys, block while waiting for newkeys. fix comments.
Diffstat (limited to 'packet.c')
-rw-r--r--packet.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/packet.c b/packet.c
index a4a0b0595..cf081a0f8 100644
--- a/packet.c
+++ b/packet.c
@@ -37,7 +37,7 @@
37 */ 37 */
38 38
39#include "includes.h" 39#include "includes.h"
40RCSID("$OpenBSD: packet.c,v 1.57 2001/04/03 23:32:12 markus Exp $"); 40RCSID("$OpenBSD: packet.c,v 1.58 2001/04/04 09:48:34 markus Exp $");
41 41
42#include "xmalloc.h" 42#include "xmalloc.h"
43#include "buffer.h" 43#include "buffer.h"
@@ -525,7 +525,8 @@ set_newkeys(int mode)
525 if (newkeys[mode] != NULL) { 525 if (newkeys[mode] != NULL) {
526 debug("newkeys: rekeying"); 526 debug("newkeys: rekeying");
527 memset(cc, 0, sizeof(*cc)); 527 memset(cc, 0, sizeof(*cc));
528 // free old keys, reset compression cipher-contexts; 528 /* todo: free old keys, reset compression/cipher-ctxt; */
529 xfree(newkeys[mode]);
529 } 530 }
530 newkeys[mode] = kex_get_newkeys(mode); 531 newkeys[mode] = kex_get_newkeys(mode);
531 if (newkeys[mode] == NULL) 532 if (newkeys[mode] == NULL)