tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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
This commit is contained in:
Ben Lindstrom 2002-12-23 02:04:22 +00:00
parent 1f53083fc4
commit 064496feaa
6 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -13,6 +13,9 @@
- markus@cvs.openbsd.org 2002/11/21 22:22:50 - markus@cvs.openbsd.org 2002/11/21 22:22:50
[dh.c] [dh.c]
debug->debug2 debug->debug2
- 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
20021205 20021205
- (djm) PERL-free fixpaths from stuge-openssh-unix-dev@cdy.org - (djm) PERL-free fixpaths from stuge-openssh-unix-dev@cdy.org
@ -848,4 +851,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284; save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@ ok provos@
$Id: ChangeLog,v 1.2518 2002/12/23 02:03:02 mouring Exp $ $Id: ChangeLog,v 1.2519 2002/12/23 02:04:22 mouring Exp $

4
cipher.c
View File

@ -35,7 +35,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: cipher.c,v 1.61 2002/07/12 15:50:17 markus Exp $"); RCSID("$OpenBSD: cipher.c,v 1.62 2002/11/21 22:45:31 markus Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "log.h" #include "log.h"
@ -239,7 +239,7 @@ cipher_init(CipherContext *cc, Cipher *cipher,
cipher->name); cipher->name);
klen = EVP_CIPHER_CTX_key_length(&cc->evp); klen = EVP_CIPHER_CTX_key_length(&cc->evp);
if (klen > 0 && keylen != klen) { if (klen > 0 && keylen != klen) {
debug("cipher_init: set keylen (%d -> %d)", klen, keylen); debug2("cipher_init: set keylen (%d -> %d)", klen, keylen);
if (EVP_CIPHER_CTX_set_key_length(&cc->evp, keylen) == 0) if (EVP_CIPHER_CTX_set_key_length(&cc->evp, keylen) == 0)
fatal("cipher_init: set keylen failed (%d -> %d)", fatal("cipher_init: set keylen failed (%d -> %d)",
klen, keylen); klen, keylen);

6
kex.c
View File

@ -23,7 +23,7 @@
*/ */
#include "includes.h" #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> #include <openssl/crypto.h>
@ -135,7 +135,7 @@ kex_finish(Kex *kex)
/* packet_write_wait(); */ /* packet_write_wait(); */
debug("SSH2_MSG_NEWKEYS sent"); debug("SSH2_MSG_NEWKEYS sent");
debug("waiting for SSH2_MSG_NEWKEYS"); debug("expecting SSH2_MSG_NEWKEYS");
packet_read_expect(SSH2_MSG_NEWKEYS); packet_read_expect(SSH2_MSG_NEWKEYS);
packet_check_eom(); packet_check_eom();
debug("SSH2_MSG_NEWKEYS received"); debug("SSH2_MSG_NEWKEYS received");
@ -433,7 +433,7 @@ kex_derive_keys(Kex *kex, u_char *hash, BIGNUM *shared_secret)
for (i = 0; i < NKEYS; i++) for (i = 0; i < NKEYS; i++)
keys[i] = derive_key(kex, 'A'+i, kex->we_need, hash, shared_secret); 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++) { for (mode = 0; mode < MODE_MAX; mode++) {
current_keys[mode] = kex->newkeys[mode]; current_keys[mode] = kex->newkeys[mode];
kex->newkeys[mode] = NULL; kex->newkeys[mode] = NULL;

6
packet.c
View File

@ -37,7 +37,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: packet.c,v 1.99 2002/11/04 10:09:51 markus Exp $"); RCSID("$OpenBSD: packet.c,v 1.100 2002/11/21 22:45:31 markus Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "buffer.h" #include "buffer.h"
@ -564,7 +564,7 @@ set_newkeys(int mode)
CipherContext *cc; CipherContext *cc;
int encrypt; int encrypt;
debug("newkeys: mode %d", mode); debug2("set_newkeys: mode %d", mode);
if (mode == MODE_OUT) { if (mode == MODE_OUT) {
cc = &send_context; cc = &send_context;
@ -574,7 +574,7 @@ set_newkeys(int mode)
encrypt = CIPHER_DECRYPT; encrypt = CIPHER_DECRYPT;
} }
if (newkeys[mode] != NULL) { if (newkeys[mode] != NULL) {
debug("newkeys: rekeying"); debug("set_newkeys: rekeying");
cipher_cleanup(cc); cipher_cleanup(cc);
enc = &newkeys[mode]->enc; enc = &newkeys[mode]->enc;
mac = &newkeys[mode]->mac; mac = &newkeys[mode]->mac;

4
sshconnect.c
View File

@ -13,7 +13,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sshconnect.c,v 1.135 2002/09/19 01:58:18 djm Exp $"); RCSID("$OpenBSD: sshconnect.c,v 1.136 2002/11/21 22:45:31 markus Exp $");
#include <openssl/bn.h> #include <openssl/bn.h>
@ -247,7 +247,7 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
*/ */
int full_failure = 1; int full_failure = 1;
debug("ssh_connect: needpriv %d", needpriv); debug2("ssh_connect: needpriv %d", needpriv);
/* Get default port if port has not been set. */ /* Get default port if port has not been set. */
if (port == 0) { if (port == 0) {

14
sshconnect2.c
View File

@ -23,7 +23,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sshconnect2.c,v 1.107 2002/07/01 19:48:46 markus Exp $"); RCSID("$OpenBSD: sshconnect2.c,v 1.108 2002/11/21 22:45:31 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "ssh2.h" #include "ssh2.h"
@ -128,7 +128,6 @@ ssh_kex2(char *host, struct sockaddr *hostaddr)
packet_send(); packet_send();
packet_write_wait(); packet_write_wait();
#endif #endif
debug("done: ssh_kex2.");
} }
/* /*
@ -224,24 +223,23 @@ ssh_userauth2(const char *local_user, const char *server_user, char *host,
if (options.challenge_response_authentication) if (options.challenge_response_authentication)
options.kbd_interactive_authentication = 1; options.kbd_interactive_authentication = 1;
debug("send SSH2_MSG_SERVICE_REQUEST");
packet_start(SSH2_MSG_SERVICE_REQUEST); packet_start(SSH2_MSG_SERVICE_REQUEST);
packet_put_cstring("ssh-userauth"); packet_put_cstring("ssh-userauth");
packet_send(); packet_send();
debug("SSH2_MSG_SERVICE_REQUEST sent");
packet_write_wait(); packet_write_wait();
type = packet_read(); type = packet_read();
if (type != SSH2_MSG_SERVICE_ACCEPT) { if (type != SSH2_MSG_SERVICE_ACCEPT)
fatal("denied SSH2_MSG_SERVICE_ACCEPT: %d", type); fatal("Server denied authentication request: %d", type);
}
if (packet_remaining() > 0) { if (packet_remaining() > 0) {
char *reply = packet_get_string(NULL); char *reply = packet_get_string(NULL);
debug("service_accept: %s", reply); debug2("service_accept: %s", reply);
xfree(reply); xfree(reply);
} else { } else {
debug("buggy server: service_accept w/o service"); debug("buggy server: service_accept w/o service");
} }
packet_check_eom(); packet_check_eom();
debug("got SSH2_MSG_SERVICE_ACCEPT"); debug("SSH2_MSG_SERVICE_ACCEPT received");
if (options.preferred_authentications == NULL) if (options.preferred_authentications == NULL)
options.preferred_authentications = authmethods_get(); options.preferred_authentications = authmethods_get();