summaryrefslogtreecommitdiff
path: root/kex.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-12-23 02:04:22 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-12-23 02:04:22 +0000
commit064496feaab2183b6dc5db0b0bebe0b226e2d31d (patch)
treec1fc7c10d211e2cbe05252d873ebbcc78cfd7376 /kex.c
parent1f53083fc47e1ebd9f08f8d04035720316385560 (diff)
- 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
Diffstat (limited to 'kex.c')
-rw-r--r--kex.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kex.c b/kex.c
index bdbf3882c..113663598 100644
--- a/kex.c
+++ b/kex.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: kex.c,v 1.51 2002/06/24 14:55:38 markus Exp $"); 26RCSID("$OpenBSD: kex.c,v 1.52 2002/11/21 22:45:31 markus Exp $");
27 27
28#include <openssl/crypto.h> 28#include <openssl/crypto.h>
29 29
@@ -135,7 +135,7 @@ kex_finish(Kex *kex)
135 /* packet_write_wait(); */ 135 /* packet_write_wait(); */
136 debug("SSH2_MSG_NEWKEYS sent"); 136 debug("SSH2_MSG_NEWKEYS sent");
137 137
138 debug("waiting for SSH2_MSG_NEWKEYS"); 138 debug("expecting SSH2_MSG_NEWKEYS");
139 packet_read_expect(SSH2_MSG_NEWKEYS); 139 packet_read_expect(SSH2_MSG_NEWKEYS);
140 packet_check_eom(); 140 packet_check_eom();
141 debug("SSH2_MSG_NEWKEYS received"); 141 debug("SSH2_MSG_NEWKEYS received");
@@ -433,7 +433,7 @@ kex_derive_keys(Kex *kex, u_char *hash, BIGNUM *shared_secret)
433 for (i = 0; i < NKEYS; i++) 433 for (i = 0; i < NKEYS; i++)
434 keys[i] = derive_key(kex, 'A'+i, kex->we_need, hash, shared_secret); 434 keys[i] = derive_key(kex, 'A'+i, kex->we_need, hash, shared_secret);
435 435
436 debug("kex_derive_keys"); 436 debug2("kex_derive_keys");
437 for (mode = 0; mode < MODE_MAX; mode++) { 437 for (mode = 0; mode < MODE_MAX; mode++) {
438 current_keys[mode] = kex->newkeys[mode]; 438 current_keys[mode] = kex->newkeys[mode];
439 kex->newkeys[mode] = NULL; 439 kex->newkeys[mode] = NULL;