- djm@cvs.openbsd.org 2002/02/12 12:44:46

[openssh.git] / ssh-rsa.c

diff --git a/ssh-rsa.c b/ssh-rsa.c
index 15ce5e977f00a25890df8cb75591e2ad39009488..c4339b95bd12d3c5cc66436203afbfbc921cfcdf 100644 (file)
--- a/ssh-rsa.c
+++ b/ssh-rsa.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-rsa.c,v 1.10 2001/09/17 19:27:15 stevesk Exp $");
+RCSID("$OpenBSD: ssh-rsa.c,v 1.15 2002/01/25 21:42:11 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
@@ -45,7 +45,7 @@ ssh_rsa_sign(
 {
        const EVP_MD *evp_md;
        EVP_MD_CTX md;
-       u_char *digest, *sig, *ret;
+       u_char digest[EVP_MAX_MD_SIZE], *sig, *ret;
        u_int slen, dlen, len;
        int ok, nid;
        Buffer b;
@@ -54,23 +54,24 @@ ssh_rsa_sign(
                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;
        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, NULL);
+       EVP_DigestFinal(&md, digest, &dlen);
 
        slen = RSA_size(key->rsa);
        sig = xmalloc(slen);
 
        ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
-       memset(digest, 'd', dlen);
-       xfree(digest);
+       memset(digest, 'd', sizeof(digest));
 
        if (ok != 1) {
                int ecode = ERR_get_error();
@@ -116,7 +117,7 @@ ssh_rsa_verify(
        const EVP_MD *evp_md;
        EVP_MD_CTX md;
        char *ktype;
-       u_char *sigblob, *digest;
+       u_char digest[EVP_MAX_MD_SIZE], *sigblob;
        u_int len, dlen;
        int rlen, ret, nid;
 
@@ -124,6 +125,10 @@ ssh_rsa_verify(
                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));
@@ -142,26 +147,23 @@ ssh_rsa_verify(
        sigblob = buffer_get_string(&b, &len);
        rlen = buffer_len(&b);
        buffer_free(&b);
-       if(rlen != 0) {
-               xfree(sigblob);
+       if (rlen != 0) {
                error("ssh_rsa_verify: remaining bytes in signature %d", rlen);
+               xfree(sigblob);
                return -1;
        }
        nid = (datafellows & SSH_BUG_RSASIGMD5) ? NID_md5 : NID_sha1;
        if ((evp_md = EVP_get_digestbynid(nid)) == NULL) {
-               xfree(sigblob);
                error("ssh_rsa_verify: EVP_get_digestbynid %d failed", nid);
+               xfree(sigblob);
                return -1;
        }
-       dlen = evp_md->md_size;
-       digest = xmalloc(dlen);
        EVP_DigestInit(&md, evp_md);
        EVP_DigestUpdate(&md, data, datalen);
-       EVP_DigestFinal(&md, digest, NULL);
+       EVP_DigestFinal(&md, digest, &dlen);
 
        ret = RSA_verify(nid, digest, dlen, sigblob, len, key->rsa);
-       memset(digest, 'd', dlen);
-       xfree(digest);
+       memset(digest, 'd', sizeof(digest));
        memset(sigblob, 's', len);
        xfree(sigblob);
        if (ret == 0) {