commit 064496feaab2183b6dc5db0b0bebe0b226e2d31d
author Ben Lindstrom <mouring@eviladmin.org> Mon Dec 23 02:04:22 2002 +0000
committer Ben Lindstrom <mouring@eviladmin.org> Mon Dec 23 02:04:22 2002 +0000
tree c1fc7c10d211e2cbe05252d873ebbcc78cfd7376
parent 1f53083fc47e1ebd9f08f8d04035720316385560

   - markus@cvs.openbsd.org 2002/11/21 22:45:31
     [cipher.c kex.c packet.c sshconnect.c sshconnect2.c]
     debug->debug2, unify debug messages

kex.c

diff --git a/kex.c b/kex.c
index bdbf388..1136635 100644
--- a/kex.c
+++ b/kex.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: kex.c,v 1.51 2002/06/24 14:55:38 markus Exp $");
+RCSID("$OpenBSD: kex.c,v 1.52 2002/11/21 22:45:31 markus Exp $");
 
 #include <openssl/crypto.h>
 
@@ -135,7 +135,7 @@
 	/* packet_write_wait(); */
 	debug("SSH2_MSG_NEWKEYS sent");
 
-	debug("waiting for SSH2_MSG_NEWKEYS");
+	debug("expecting SSH2_MSG_NEWKEYS");
 	packet_read_expect(SSH2_MSG_NEWKEYS);
 	packet_check_eom();
 	debug("SSH2_MSG_NEWKEYS received");
@@ -433,7 +433,7 @@
 	for (i = 0; i < NKEYS; i++)
 		keys[i] = derive_key(kex, 'A'+i, kex->we_need, hash, shared_secret);
 
-	debug("kex_derive_keys");
+	debug2("kex_derive_keys");
 	for (mode = 0; mode < MODE_MAX; mode++) {
 		current_keys[mode] = kex->newkeys[mode];
 		kex->newkeys[mode] = NULL;