diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | cipher.c | 4 | ||||
-rw-r--r-- | kex.c | 6 | ||||
-rw-r--r-- | packet.c | 6 | ||||
-rw-r--r-- | sshconnect.c | 4 | ||||
-rw-r--r-- | sshconnect2.c | 14 |
6 files changed, 20 insertions, 19 deletions
@@ -13,6 +13,9 @@ | |||
13 | - markus@cvs.openbsd.org 2002/11/21 22:22:50 | 13 | - markus@cvs.openbsd.org 2002/11/21 22:22:50 |
14 | [dh.c] | 14 | [dh.c] |
15 | debug->debug2 | 15 | debug->debug2 |
16 | - markus@cvs.openbsd.org 2002/11/21 22:45:31 | ||
17 | [cipher.c kex.c packet.c sshconnect.c sshconnect2.c] | ||
18 | debug->debug2, unify debug messages | ||
16 | 19 | ||
17 | 20021205 | 20 | 20021205 |
18 | - (djm) PERL-free fixpaths from stuge-openssh-unix-dev@cdy.org | 21 | - (djm) PERL-free fixpaths from stuge-openssh-unix-dev@cdy.org |
@@ -848,4 +851,4 @@ | |||
848 | save auth method before monitor_reset_key_state(); bugzilla bug #284; | 851 | save auth method before monitor_reset_key_state(); bugzilla bug #284; |
849 | ok provos@ | 852 | ok provos@ |
850 | 853 | ||
851 | $Id: ChangeLog,v 1.2518 2002/12/23 02:03:02 mouring Exp $ | 854 | $Id: ChangeLog,v 1.2519 2002/12/23 02:04:22 mouring Exp $ |
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: cipher.c,v 1.61 2002/07/12 15:50:17 markus Exp $"); | 38 | RCSID("$OpenBSD: cipher.c,v 1.62 2002/11/21 22:45:31 markus Exp $"); |
39 | 39 | ||
40 | #include "xmalloc.h" | 40 | #include "xmalloc.h" |
41 | #include "log.h" | 41 | #include "log.h" |
@@ -239,7 +239,7 @@ cipher_init(CipherContext *cc, Cipher *cipher, | |||
239 | cipher->name); | 239 | cipher->name); |
240 | klen = EVP_CIPHER_CTX_key_length(&cc->evp); | 240 | klen = EVP_CIPHER_CTX_key_length(&cc->evp); |
241 | if (klen > 0 && keylen != klen) { | 241 | if (klen > 0 && keylen != klen) { |
242 | debug("cipher_init: set keylen (%d -> %d)", klen, keylen); | 242 | debug2("cipher_init: set keylen (%d -> %d)", klen, keylen); |
243 | if (EVP_CIPHER_CTX_set_key_length(&cc->evp, keylen) == 0) | 243 | if (EVP_CIPHER_CTX_set_key_length(&cc->evp, keylen) == 0) |
244 | fatal("cipher_init: set keylen failed (%d -> %d)", | 244 | fatal("cipher_init: set keylen failed (%d -> %d)", |
245 | klen, keylen); | 245 | klen, keylen); |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: kex.c,v 1.51 2002/06/24 14:55:38 markus Exp $"); | 26 | RCSID("$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; |
@@ -37,7 +37,7 @@ | |||
37 | */ | 37 | */ |
38 | 38 | ||
39 | #include "includes.h" | 39 | #include "includes.h" |
40 | RCSID("$OpenBSD: packet.c,v 1.99 2002/11/04 10:09:51 markus Exp $"); | 40 | RCSID("$OpenBSD: packet.c,v 1.100 2002/11/21 22:45:31 markus Exp $"); |
41 | 41 | ||
42 | #include "xmalloc.h" | 42 | #include "xmalloc.h" |
43 | #include "buffer.h" | 43 | #include "buffer.h" |
@@ -564,7 +564,7 @@ set_newkeys(int mode) | |||
564 | CipherContext *cc; | 564 | CipherContext *cc; |
565 | int encrypt; | 565 | int encrypt; |
566 | 566 | ||
567 | debug("newkeys: mode %d", mode); | 567 | debug2("set_newkeys: mode %d", mode); |
568 | 568 | ||
569 | if (mode == MODE_OUT) { | 569 | if (mode == MODE_OUT) { |
570 | cc = &send_context; | 570 | cc = &send_context; |
@@ -574,7 +574,7 @@ set_newkeys(int mode) | |||
574 | encrypt = CIPHER_DECRYPT; | 574 | encrypt = CIPHER_DECRYPT; |
575 | } | 575 | } |
576 | if (newkeys[mode] != NULL) { | 576 | if (newkeys[mode] != NULL) { |
577 | debug("newkeys: rekeying"); | 577 | debug("set_newkeys: rekeying"); |
578 | cipher_cleanup(cc); | 578 | cipher_cleanup(cc); |
579 | enc = &newkeys[mode]->enc; | 579 | enc = &newkeys[mode]->enc; |
580 | mac = &newkeys[mode]->mac; | 580 | mac = &newkeys[mode]->mac; |
diff --git a/sshconnect.c b/sshconnect.c index 776d72065..f99fe0257 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -13,7 +13,7 @@ | |||
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include "includes.h" | 15 | #include "includes.h" |
16 | RCSID("$OpenBSD: sshconnect.c,v 1.135 2002/09/19 01:58:18 djm Exp $"); | 16 | RCSID("$OpenBSD: sshconnect.c,v 1.136 2002/11/21 22:45:31 markus Exp $"); |
17 | 17 | ||
18 | #include <openssl/bn.h> | 18 | #include <openssl/bn.h> |
19 | 19 | ||
@@ -247,7 +247,7 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr, | |||
247 | */ | 247 | */ |
248 | int full_failure = 1; | 248 | int full_failure = 1; |
249 | 249 | ||
250 | debug("ssh_connect: needpriv %d", needpriv); | 250 | debug2("ssh_connect: needpriv %d", needpriv); |
251 | 251 | ||
252 | /* Get default port if port has not been set. */ | 252 | /* Get default port if port has not been set. */ |
253 | if (port == 0) { | 253 | if (port == 0) { |
diff --git a/sshconnect2.c b/sshconnect2.c index 703d0721f..755be5cca 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: sshconnect2.c,v 1.107 2002/07/01 19:48:46 markus Exp $"); | 26 | RCSID("$OpenBSD: sshconnect2.c,v 1.108 2002/11/21 22:45:31 markus Exp $"); |
27 | 27 | ||
28 | #include "ssh.h" | 28 | #include "ssh.h" |
29 | #include "ssh2.h" | 29 | #include "ssh2.h" |
@@ -128,7 +128,6 @@ ssh_kex2(char *host, struct sockaddr *hostaddr) | |||
128 | packet_send(); | 128 | packet_send(); |
129 | packet_write_wait(); | 129 | packet_write_wait(); |
130 | #endif | 130 | #endif |
131 | debug("done: ssh_kex2."); | ||
132 | } | 131 | } |
133 | 132 | ||
134 | /* | 133 | /* |
@@ -224,24 +223,23 @@ ssh_userauth2(const char *local_user, const char *server_user, char *host, | |||
224 | if (options.challenge_response_authentication) | 223 | if (options.challenge_response_authentication) |
225 | options.kbd_interactive_authentication = 1; | 224 | options.kbd_interactive_authentication = 1; |
226 | 225 | ||
227 | debug("send SSH2_MSG_SERVICE_REQUEST"); | ||
228 | packet_start(SSH2_MSG_SERVICE_REQUEST); | 226 | packet_start(SSH2_MSG_SERVICE_REQUEST); |
229 | packet_put_cstring("ssh-userauth"); | 227 | packet_put_cstring("ssh-userauth"); |
230 | packet_send(); | 228 | packet_send(); |
229 | debug("SSH2_MSG_SERVICE_REQUEST sent"); | ||
231 | packet_write_wait(); | 230 | packet_write_wait(); |
232 | type = packet_read(); | 231 | type = packet_read(); |
233 | if (type != SSH2_MSG_SERVICE_ACCEPT) { | 232 | if (type != SSH2_MSG_SERVICE_ACCEPT) |
234 | fatal("denied SSH2_MSG_SERVICE_ACCEPT: %d", type); | 233 | fatal("Server denied authentication request: %d", type); |
235 | } | ||
236 | if (packet_remaining() > 0) { | 234 | if (packet_remaining() > 0) { |
237 | char *reply = packet_get_string(NULL); | 235 | char *reply = packet_get_string(NULL); |
238 | debug("service_accept: %s", reply); | 236 | debug2("service_accept: %s", reply); |
239 | xfree(reply); | 237 | xfree(reply); |
240 | } else { | 238 | } else { |
241 | debug("buggy server: service_accept w/o service"); | 239 | debug("buggy server: service_accept w/o service"); |
242 | } | 240 | } |
243 | packet_check_eom(); | 241 | packet_check_eom(); |
244 | debug("got SSH2_MSG_SERVICE_ACCEPT"); | 242 | debug("SSH2_MSG_SERVICE_ACCEPT received"); |
245 | 243 | ||
246 | if (options.preferred_authentications == NULL) | 244 | if (options.preferred_authentications == NULL) |
247 | options.preferred_authentications = authmethods_get(); | 245 | options.preferred_authentications = authmethods_get(); |