- OpenBSD CVS updates:

   - [channels.c]
     repair x11-fwd
   - [sshconnect.c]
     fix passwd prompt for ssh2, less debugging output.
   - [clientloop.c compat.c dsa.c kex.c sshd.c]
     less debugging output
   - [kex.c kex.h sshconnect.c sshd.c]
     check for reasonable public DH values
   - [README.openssh2 cipher.c cipher.h compat.c compat.h readconf.c]
     [readconf.h servconf.c servconf.h ssh.c ssh.h sshconnect.c sshd.c]
     add Cipher and Protocol options to ssh/sshd, e.g.:
     ssh -o 'Protocol 1,2' if you prefer proto 1, ssh -o 'Ciphers
     arcfour,3des-cbc'
   - [sshd.c]
     print 1.99 only if server supports both

1 files changed, 12 insertions, 12 deletions

diff --git a/dsa.c b/dsa.c
index eeb4ead1..a35d85bf 100644
--- a/dsa.c
+++ b/dsa.c
@@ -28,7 +28,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: dsa.c,v 1.1 2000/04/04 04:39:01 damien Exp $");
+RCSID("$Id: dsa.c,v 1.2 2000/04/12 06:37:02 markus Exp $");
 
 #include "ssh.h"
 #include "xmalloc.h"
@@ -80,7 +80,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;
 	}
@@ -90,10 +90,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
@@ -172,7 +172,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);
@@ -185,11 +185,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);
@@ -197,7 +197,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)
@@ -239,7 +239,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;
 	}
 
@@ -248,7 +248,7 @@ dsa_verify(
 		datafellows = 0;
 	}
 
-	log("len %d datafellows %d", signaturelen, datafellows);
+	debug("len %d datafellows %d", signaturelen, datafellows);
 
 	/* fetch signature */
 	if (datafellows) {
@@ -262,7 +262,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);
 	}
 
@@ -305,6 +305,6 @@ dsa_verify(
 		txt = "error";
 		break;
 	}
-	log("dsa_verify: signature %s", txt);
+	debug("dsa_verify: signature %s", txt);
 	return ret;
 }