===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh-rsa.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-rsa.c	2002/03/08 17:04:43	1.6.2.7
+++ src/usr.bin/ssh/ssh-rsa.c	2001/03/27 10:34:08	1.7
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-rsa.c,v 1.6.2.7 2002/03/08 17:04:43 brad Exp $");
+RCSID("$OpenBSD: ssh-rsa.c,v 1.7 2001/03/27 10:34:08 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
@@ -34,18 +34,17 @@
 #include "bufaux.h"
 #include "key.h"
 #include "ssh-rsa.h"
-#include "compat.h"
 
 /* RSASSA-PKCS1-v1_5 (PKCS #1 v2.0 signature) with SHA1 */
 int
 ssh_rsa_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)
 {
 	const EVP_MD *evp_md;
 	EVP_MD_CTX md;
-	u_char digest[EVP_MAX_MD_SIZE], *sig, *ret;
+	u_char *digest, *sig, *ret;
 	u_int slen, dlen, len;
 	int ok, nid;
 	Buffer b;
@@ -54,24 +53,23 @@
 		error("ssh_rsa_sign: no RSA key");
 		return -1;
 	}
-	if (datafellows & SSH_BUG_SIGBLOB) {
-		error("ssh_rsa_sign: SSH_BUG_SIGBLOB not supported");
-		return -1;
-	}
-	nid = (datafellows & SSH_BUG_RSASIGMD5) ? NID_md5 : NID_sha1;
+	nid = NID_sha1;
 	if ((evp_md = EVP_get_digestbynid(nid)) == NULL) {
 		error("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
 		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);
 
 	slen = RSA_size(key->rsa);
 	sig = xmalloc(slen);
 
 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
-	memset(digest, 'd', sizeof(digest));
+	memset(digest, 'd', dlen);
+	xfree(digest);
 
 	if (ok != 1) {
 		int ecode = ERR_get_error();
@@ -104,20 +102,21 @@
 		*lenp = len;
 	if (sigp != NULL)
 		*sigp = ret;
+	debug2("ssh_rsa_sign: done");
 	return 0;
 }
 
 int
 ssh_rsa_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)
 {
 	Buffer b;
 	const EVP_MD *evp_md;
 	EVP_MD_CTX md;
 	char *ktype;
-	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+	u_char *sigblob, *digest;
 	u_int len, dlen;
 	int rlen, ret, nid;
 
@@ -125,17 +124,13 @@
 		error("ssh_rsa_verify: no RSA key");
 		return -1;
 	}
-	if (datafellows & SSH_BUG_SIGBLOB) {
-		error("ssh_rsa_verify: SSH_BUG_SIGBLOB not supported");
-		return -1;
-	}
 	if (BN_num_bits(key->rsa->n) < 768) {
 		error("ssh_rsa_verify: n too small: %d bits",
 		    BN_num_bits(key->rsa->n));
 		return -1;
 	}
 	buffer_init(&b);
-	buffer_append(&b, signature, signaturelen);
+	buffer_append(&b, (char *) signature, signaturelen);
 	ktype = buffer_get_string(&b, NULL);
 	if (strcmp("ssh-rsa", ktype) != 0) {
 		error("ssh_rsa_verify: cannot handle type %s", ktype);
@@ -144,26 +139,29 @@
 		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_rsa_verify: remaining bytes in signature %d", rlen);
+	if(rlen != 0) {
 		xfree(sigblob);
+		error("ssh_rsa_verify: remaining bytes in signature %d", rlen);
 		return -1;
 	}
-	nid = (datafellows & SSH_BUG_RSASIGMD5) ? NID_md5 : NID_sha1;
+	nid = NID_sha1;
 	if ((evp_md = EVP_get_digestbynid(nid)) == NULL) {
-		error("ssh_rsa_verify: EVP_get_digestbynid %d failed", nid);
 		xfree(sigblob);
+		error("ssh_rsa_verify: EVP_get_digestbynid %d failed", nid);
 		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);
 
 	ret = RSA_verify(nid, digest, dlen, sigblob, len, key->rsa);
-	memset(digest, 'd', sizeof(digest));
+	memset(digest, 'd', dlen);
+	xfree(digest);
 	memset(sigblob, 's', len);
 	xfree(sigblob);
 	if (ret == 0) {