less debugging output

5 files changed, 21 insertions, 20 deletions

diff --git a/usr.bin/ssh/clientloop.c b/usr.bin/ssh/clientloop.c
index f63ff7ab5ee..cf6d3816445 100644
--- a/usr.bin/ssh/clientloop.c
+++ b/usr.bin/ssh/clientloop.c
@@ -16,7 +16,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: clientloop.c,v 1.17 2000/04/04 17:29:46 markus Exp $");
+RCSID("$Id: clientloop.c,v 1.18 2000/04/12 06:37:02 markus Exp $");
 
 #include "xmalloc.h"
 #include "ssh.h"
@@ -1013,7 +1013,7 @@ client_input_channel_req(int id, void *arg)
 	rtype = packet_get_string(&len);
 	reply = packet_get_char();
 
-	log("session_input_channel_req: rtype %s reply %d", rtype, reply);
+	debug("session_input_channel_req: rtype %s reply %d", rtype, reply);
 
 	c = channel_lookup(id);
 	if (c == NULL)
diff --git a/usr.bin/ssh/compat.c b/usr.bin/ssh/compat.c
index c4bc676e5c2..0b309dbb8d9 100644
--- a/usr.bin/ssh/compat.c
+++ b/usr.bin/ssh/compat.c
@@ -28,7 +28,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: compat.c,v 1.8 2000/04/07 09:17:39 markus Exp $");
+RCSID("$Id: compat.c,v 1.9 2000/04/12 06:37:02 markus Exp $");
 
 #include "ssh.h"
 #include "packet.h"
@@ -65,7 +65,7 @@ compat_datafellows(const char *version)
 		len = strlen(check[i]);
 		if (strlen(version) >= len &&
 		   (strncmp(version, check[i], len) == 0)) {
-			log("datafellows: %.200s", version);
+			verbose("datafellows: %.200s", version);
 			datafellows = 1;
 			return;
 		}
diff --git a/usr.bin/ssh/dsa.c b/usr.bin/ssh/dsa.c
index 86c66cbb484..ec4b2c6595f 100644
--- a/usr.bin/ssh/dsa.c
+++ b/usr.bin/ssh/dsa.c
@@ -28,7 +28,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: dsa.c,v 1.1 2000/04/03 20:06:14 markus Exp $");
+RCSID("$Id: dsa.c,v 1.2 2000/04/12 06:37:02 markus Exp $");
 
 #include "ssh.h"
 #include "xmalloc.h"
@@ -68,7 +68,7 @@ dsa_serverkey_from_blob(
 	buffer_append(&b, serverhostkey, serverhostkeylen);
 	ktype = buffer_get_string(&b, NULL);
 	if (strcmp(KEX_DSS, ktype) != 0) {
-		log("dsa_serverkey_from_blob: cannot handle type  %s", ktype);
+		error("dsa_serverkey_from_blob: cannot handle type  %s", ktype);
 		key_free(key);
 		return NULL;
 	}
@@ -78,10 +78,10 @@ dsa_serverkey_from_blob(
 	buffer_get_bignum2(&b, dsa->pub_key);
 	rlen = buffer_len(&b);
 	if(rlen != 0)
-		log("dsa_serverkey_from_blob: remaining bytes in serverhostkey %d", rlen);
+		error("dsa_serverkey_from_blob: remaining bytes in serverhostkey %d", rlen);
 	buffer_free(&b);
 
-	log("keytype %s", ktype);
+	debug("keytype %s", ktype);
 #ifdef DEBUG_DSS
 	DSA_print_fp(stderr, dsa, 8);
 #endif
@@ -160,7 +160,7 @@ dsa_sign(
 	Buffer b;
 
 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
-		log("dsa_sign: no DSA key");
+		error("dsa_sign: no DSA key");
 		return -1;
 	}
 	digest = xmalloc(evp_md->md_size);
@@ -173,11 +173,11 @@ dsa_sign(
         rlen = BN_num_bytes(sig->r);
         slen = BN_num_bytes(sig->s);
         if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) {
-		log("bad sig size %d %d", rlen, slen);
+		error("bad sig size %d %d", rlen, slen);
 		DSA_SIG_free(sig);
 		return -1;
 	}
-	log("sig size %d %d", rlen, slen);
+	debug("sig size %d %d", rlen, slen);
 
 	memset(sigblob, 0, SIGBLOB_LEN);
 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
@@ -185,7 +185,7 @@ dsa_sign(
 	DSA_SIG_free(sig);
 
 	if (datafellows) {
-		log("datafellows");
+		debug("datafellows");
 		ret = xmalloc(SIGBLOB_LEN);
 		memcpy(ret, sigblob, SIGBLOB_LEN);
 		if (lenp != NULL)
@@ -227,7 +227,7 @@ dsa_verify(
 	int ret;
 
 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
-		log("dsa_verify: no DSA key");
+		error("dsa_verify: no DSA key");
 		return -1;
 	}
 
@@ -236,7 +236,7 @@ dsa_verify(
 		datafellows = 0;
 	}
 
-	log("len %d datafellows %d", signaturelen, datafellows);
+	debug("len %d datafellows %d", signaturelen, datafellows);
 
 	/* fetch signature */
 	if (datafellows) {
@@ -250,7 +250,7 @@ dsa_verify(
 		sigblob = (unsigned char *)buffer_get_string(&b, &len);
 		rlen = buffer_len(&b);
 		if(rlen != 0)
-			log("remaining bytes in signature %d", rlen);
+			error("remaining bytes in signature %d", rlen);
 		buffer_free(&b);
 	}
 
@@ -293,6 +293,6 @@ dsa_verify(
 		txt = "error";
 		break;
 	}
-	log("dsa_verify: signature %s", txt);
+	debug("dsa_verify: signature %s", txt);
 	return ret;
 }
diff --git a/usr.bin/ssh/kex.c b/usr.bin/ssh/kex.c
index a52af72abf3..cc2543a0ea1 100644
--- a/usr.bin/ssh/kex.c
+++ b/usr.bin/ssh/kex.c
@@ -28,7 +28,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: kex.c,v 1.1 2000/04/03 20:06:15 markus Exp $");
+RCSID("$Id: kex.c,v 1.2 2000/04/12 06:37:02 markus Exp $");
 
 #include "ssh.h"
 #include "ssh2.h"
@@ -342,7 +342,7 @@ kex_choose_conf(char *cprop[PROPOSAL_MAX], char *sprop[PROPOSAL_MAX], int server
 		choose_enc (&k->enc [mode], cprop[nenc],  sprop[nenc]);
 		choose_mac (&k->mac [mode], cprop[nmac],  sprop[nmac]);
 		choose_comp(&k->comp[mode], cprop[ncomp], sprop[ncomp]);
-		log("kex: %s %s %s %s",
+		debug("kex: %s %s %s %s",
 		    ctos ? "client->server" : "server->client",
 		    k->enc[mode].name,
 		    k->mac[mode].name,
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c
index a22396cfdef..7d8963ffa22 100644
--- a/usr.bin/ssh/sshd.c
+++ b/usr.bin/ssh/sshd.c
@@ -14,7 +14,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.99 2000/04/07 09:17:39 markus Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.100 2000/04/12 06:37:02 markus Exp $");
 
 #include "xmalloc.h"
 #include "rsa.h"
@@ -1248,11 +1248,12 @@ do_ssh2_kex()
 	packet_read_expect(&payload_len, SSH2_MSG_NEWKEYS);
 	debug("GOT SSH2_MSG_NEWKEYS.");
 
+#ifdef DEBUG_KEXDH
 	/* send 1st encrypted/maced/compressed message */
 	packet_start(SSH2_MSG_IGNORE);
 	packet_put_cstring("markus");
 	packet_send();
 	packet_write_wait();
-
+#endif
 	debug("done: KEX2.");
 }