Import of OpenSSH 3.1p1

[gssapi-openssh.git] / openssh / ssh-dss.c

diff --git a/openssh/ssh-dss.c b/openssh/ssh-dss.c
index 9f3a28706dde1b23ec7263218d150992474e3fe0..02403f550afc22388d6cc9e7f9d3aa31a5128849 100644 (file)
--- a/openssh/ssh-dss.c
+++ b/openssh/ssh-dss.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-dss.c,v 1.9 2001/11/07 22:10:28 markus Exp $");
+RCSID("$OpenBSD: ssh-dss.c,v 1.14 2002/02/28 15:46:33 markus Exp $");
 
 #include <openssl/bn.h>
 #include <openssl/evp.h>
@@ -42,13 +42,13 @@ RCSID("$OpenBSD: ssh-dss.c,v 1.9 2001/11/07 22:10:28 markus Exp $");
 int
 ssh_dss_sign(
     Key *key,
-    u_char **sigp, int *lenp,
-    u_char *data, int datalen)
+    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 +56,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;
@@ -109,13 +106,13 @@ ssh_dss_sign(
 int
 ssh_dss_verify(
     Key *key,
-    u_char *signature, int signaturelen,
-    u_char *data, int datalen)
+    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;
@@ -145,7 +142,7 @@ ssh_dss_verify(
                sigblob = buffer_get_string(&b, &len);
                rlen = buffer_len(&b);
                buffer_free(&b);
-               if(rlen != 0) {
+               if (rlen != 0) {
                        error("ssh_dss_verify: "
                            "remaining bytes in signature %d", rlen);
                        xfree(sigblob);
@@ -158,9 +155,12 @@ ssh_dss_verify(
        }
 
        /* parse signature */
-       sig = DSA_SIG_new();
-       sig->r = BN_new();
-       sig->s = BN_new();
+       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");
        BN_bin2bn(sigblob, INTBLOB_LEN, sig->r);
        BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s);
 
@@ -170,16 +170,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",