- markus@cvs.openbsd.org 2002/06/26 14:51:33

[openssh.git] / ssh-dss.c

diff --git a/ssh-dss.c b/ssh-dss.c
index bd709a22660787da46b5bba0099b5e709da04c44..dbf8465bae54612d6160c2f7e7fff0f06f4b0d01 100644 (file)
--- a/ssh-dss.c
+++ b/ssh-dss.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-dss.c,v 1.11 2001/12/27 18:22:16 markus Exp $");
+RCSID("$OpenBSD: ssh-dss.c,v 1.15 2002/06/23 03:30:17 deraadt Exp $");
 
 #include <openssl/bn.h>
 #include <openssl/evp.h>
@@ -40,15 +40,13 @@ RCSID("$OpenBSD: ssh-dss.c,v 1.11 2001/12/27 18:22:16 markus Exp $");
 #define SIGBLOB_LEN    (2*INTBLOB_LEN)
 
 int
-ssh_dss_sign(
-    Key *key,
-    u_char **sigp, int *lenp,
-    u_char *data, int datalen)
+ssh_dss_sign(Key *key, u_char **sigp, u_int *lenp,
+    u_char *data, u_int datalen)
 {
        DSA_SIG *sig;
-       EVP_MD *evp_md = EVP_sha1();
+       const EVP_MD *evp_md = EVP_sha1();
        EVP_MD_CTX md;
-       u_char *digest, *ret, sigblob[SIGBLOB_LEN];
+       u_char *ret, digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN];
        u_int rlen, slen, len, dlen;
        Buffer b;
 
@@ -56,16 +54,13 @@ ssh_dss_sign(
                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, NULL);
+       EVP_DigestFinal(&md, digest, &dlen);
 
        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;
@@ -74,7 +69,7 @@ ssh_dss_sign(
        rlen = BN_num_bytes(sig->r);
        slen = BN_num_bytes(sig->s);
        if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) {
-               error("bad sig size %d %d", rlen, slen);
+               error("bad sig size %u %u", rlen, slen);
                DSA_SIG_free(sig);
                return -1;
        }
@@ -107,15 +102,13 @@ ssh_dss_sign(
        return 0;
 }
 int
-ssh_dss_verify(
-    Key *key,
-    u_char *signature, int signaturelen,
-    u_char *data, int datalen)
+ssh_dss_verify(Key *key, u_char *signature, u_int signaturelen,
+    u_char *data, u_int datalen)
 {
        DSA_SIG *sig;
-       EVP_MD *evp_md = EVP_sha1();
+       const EVP_MD *evp_md = EVP_sha1();
        EVP_MD_CTX md;
-       u_char *digest, *sigblob;
+       u_char digest[EVP_MAX_MD_SIZE], *sigblob;
        u_int len, dlen;
        int rlen, ret;
        Buffer b;
@@ -154,7 +147,7 @@ ssh_dss_verify(
        }
 
        if (len != SIGBLOB_LEN) {
-               fatal("bad sigbloblen %d != SIGBLOB_LEN", len);
+               fatal("bad sigbloblen %u != SIGBLOB_LEN", len);
        }
 
        /* parse signature */
@@ -173,16 +166,13 @@ ssh_dss_verify(
        }
 
        /* 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, NULL);
+       EVP_DigestFinal(&md, digest, &dlen);
 
        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",