===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh-dss.c,v
retrieving revision 1.6.2.7
retrieving revision 1.7
diff -u -r1.6.2.7 -r1.7
--- src/usr.bin/ssh/ssh-dss.c	2002/03/08 17:04:43	1.6.2.7
+++ src/usr.bin/ssh/ssh-dss.c	2001/06/06 23:13:54	1.7
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-dss.c,v 1.6.2.7 2002/03/08 17:04:43 brad Exp $");
+RCSID("$OpenBSD: ssh-dss.c,v 1.7 2001/06/06 23:13:54 markus Exp $");
 
 #include <openssl/bn.h>
 #include <openssl/evp.h>
@@ -42,13 +42,13 @@
 int
 ssh_dss_sign(
     Key *key,
-    u_char **sigp, u_int *lenp,
-    u_char *data, u_int datalen)
+    u_char **sigp, int *lenp,
+    u_char *data, int datalen)
 {
 	DSA_SIG *sig;
-	const EVP_MD *evp_md = EVP_sha1();
+	EVP_MD *evp_md = EVP_sha1();
 	EVP_MD_CTX md;
-	u_char *ret, digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN];
+	u_char *digest, *ret, sigblob[SIGBLOB_LEN];
 	u_int rlen, slen, len, dlen;
 	Buffer b;
 
@@ -56,13 +56,16 @@
 		error("ssh_dss_sign: no DSA key");
 		return -1;
 	}
+	dlen = evp_md->md_size;
+	digest = xmalloc(dlen);
 	EVP_DigestInit(&md, evp_md);
 	EVP_DigestUpdate(&md, data, datalen);
-	EVP_DigestFinal(&md, digest, &dlen);
+	EVP_DigestFinal(&md, digest, NULL);
 
 	sig = DSA_do_sign(digest, dlen, key->dsa);
-	memset(digest, 'd', sizeof(digest));
 
+	memset(digest, 0, dlen);
+	xfree(digest);
 	if (sig == NULL) {
 		error("ssh_dss_sign: sign failed");
 		return -1;
@@ -106,13 +109,13 @@
 int
 ssh_dss_verify(
     Key *key,
-    u_char *signature, u_int signaturelen,
-    u_char *data, u_int datalen)
+    u_char *signature, int signaturelen,
+    u_char *data, int datalen)
 {
 	DSA_SIG *sig;
-	const EVP_MD *evp_md = EVP_sha1();
+	EVP_MD *evp_md = EVP_sha1();
 	EVP_MD_CTX md;
-	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+	u_char *digest, *sigblob;
 	u_int len, dlen;
 	int rlen, ret;
 	Buffer b;
@@ -130,24 +133,22 @@
 		/* ietf-drafts */
 		char *ktype;
 		buffer_init(&b);
-		buffer_append(&b, signature, signaturelen);
+		buffer_append(&b, (char *) signature, signaturelen);
 		ktype = buffer_get_string(&b, NULL);
 		if (strcmp("ssh-dss", ktype) != 0) {
 			error("ssh_dss_verify: cannot handle type %s", ktype);
 			buffer_free(&b);
-			xfree(ktype);
 			return -1;
 		}
-		xfree(ktype);
-		sigblob = buffer_get_string(&b, &len);
+		sigblob = (u_char *)buffer_get_string(&b, &len);
 		rlen = buffer_len(&b);
-		buffer_free(&b);
-		if (rlen != 0) {
-			error("ssh_dss_verify: "
-			    "remaining bytes in signature %d", rlen);
-			xfree(sigblob);
+		if(rlen != 0) {
+			error("remaining bytes in signature %d", rlen);
+			buffer_free(&b);
 			return -1;
 		}
+		buffer_free(&b);
+		xfree(ktype);
 	}
 
 	if (len != SIGBLOB_LEN) {
@@ -155,12 +156,9 @@
 	}
 
 	/* parse signature */
-	if ((sig = DSA_SIG_new()) == NULL)
-		fatal("ssh_dss_verify: DSA_SIG_new failed");
-	if ((sig->r = BN_new()) == NULL)
-		fatal("ssh_dss_verify: BN_new failed");
-	if ((sig->s = BN_new()) == NULL)
-		fatal("ssh_dss_verify: BN_new failed");
+	sig = DSA_SIG_new();
+	sig->r = BN_new();
+	sig->s = BN_new();
 	BN_bin2bn(sigblob, INTBLOB_LEN, sig->r);
 	BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s);
 
@@ -170,13 +168,16 @@
 	}
 
 	/* sha1 the data */
+	dlen = evp_md->md_size;
+	digest = xmalloc(dlen);
 	EVP_DigestInit(&md, evp_md);
 	EVP_DigestUpdate(&md, data, datalen);
-	EVP_DigestFinal(&md, digest, &dlen);
+	EVP_DigestFinal(&md, digest, NULL);
 
 	ret = DSA_do_verify(digest, dlen, sig, key->dsa);
-	memset(digest, 'd', sizeof(digest));
 
+	memset(digest, 0, dlen);
+	xfree(digest);
 	DSA_SIG_free(sig);
 
 	debug("ssh_dss_verify: signature %s",