This commit was generated by cvs2git to track changes on a CVS vendor

branch.

3 files changed, 52 insertions, 2 deletions

diff --git a/src/lib/libcrypto/dsa/dsa_ameth.c b/src/lib/libcrypto/dsa/dsa_ameth.c
index 6413aae46e..376156ec5e 100644
--- a/src/lib/libcrypto/dsa/dsa_ameth.c
+++ b/src/lib/libcrypto/dsa/dsa_ameth.c
@@ -542,6 +542,52 @@ static int old_dsa_priv_encode(const EVP_PKEY *pkey, unsigned char **pder)
         return i2d_DSAPrivateKey(pkey->pkey.dsa, pder);
         }
 
+static int dsa_sig_print(BIO *bp, const X509_ALGOR *sigalg,
+                                        const ASN1_STRING *sig,
+                                        int indent, ASN1_PCTX *pctx)
+        {
+        DSA_SIG *dsa_sig;
+        const unsigned char *p;
+        if (!sig)
+                {
+                if (BIO_puts(bp, "\n") <= 0)
+                        return 0;
+                else
+                        return 1;
+                }
+        p = sig->data;
+        dsa_sig = d2i_DSA_SIG(NULL, &p, sig->length);
+        if (dsa_sig)
+                {
+                int rv = 0;
+                size_t buf_len = 0;
+                unsigned char *m=NULL;
+                update_buflen(dsa_sig->r, &buf_len);
+                update_buflen(dsa_sig->s, &buf_len);
+                m = OPENSSL_malloc(buf_len+10);
+                if (m == NULL)
+                        {
+                        DSAerr(DSA_F_DSA_SIG_PRINT,ERR_R_MALLOC_FAILURE);
+                        goto err;
+                        }
+
+                if (BIO_write(bp, "\n", 1) != 1)
+                        goto err;
+
+                if (!ASN1_bn_print(bp,"r:   ",dsa_sig->r,m,indent))
+                        goto err;
+                if (!ASN1_bn_print(bp,"s:   ",dsa_sig->s,m,indent))
+                        goto err;
+                rv = 1;
+                err:
+                if (m)
+                        OPENSSL_free(m);
+                DSA_SIG_free(dsa_sig);
+                return rv;
+                }
+        return X509_signature_dump(bp, sig, indent);
+        }
+
 static int dsa_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
         {
         switch (op)
@@ -647,6 +693,7 @@ const EVP_PKEY_ASN1_METHOD dsa_asn1_meths[] =
                 dsa_copy_parameters,
                 dsa_cmp_parameters,
                 dsa_param_print,
+                dsa_sig_print,
 
                 int_dsa_free,
                 dsa_pkey_ctrl,
diff --git a/src/lib/libcrypto/dsa/dsa_locl.h b/src/lib/libcrypto/dsa/dsa_locl.h
index 2b8cfee3db..21e2e45242 100644
--- a/src/lib/libcrypto/dsa/dsa_locl.h
+++ b/src/lib/libcrypto/dsa/dsa_locl.h
@@ -56,4 +56,5 @@
 
 int dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits,
         const EVP_MD *evpmd, const unsigned char *seed_in, size_t seed_len,
+        unsigned char *seed_out,
         int *counter_ret, unsigned long *h_ret, BN_GENCB *cb);
diff --git a/src/lib/libcrypto/dsa/dsa_pmeth.c b/src/lib/libcrypto/dsa/dsa_pmeth.c
index e2df54fec6..715d8d675b 100644
--- a/src/lib/libcrypto/dsa/dsa_pmeth.c
+++ b/src/lib/libcrypto/dsa/dsa_pmeth.c
@@ -189,7 +189,9 @@ static int pkey_dsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
                     EVP_MD_type((const EVP_MD *)p2) != NID_dsa    &&
                     EVP_MD_type((const EVP_MD *)p2) != NID_dsaWithSHA    &&
                     EVP_MD_type((const EVP_MD *)p2) != NID_sha224 &&
-                    EVP_MD_type((const EVP_MD *)p2) != NID_sha256)
+                    EVP_MD_type((const EVP_MD *)p2) != NID_sha256 &&
+                    EVP_MD_type((const EVP_MD *)p2) != NID_sha384 &&
+                    EVP_MD_type((const EVP_MD *)p2) != NID_sha512)
                         {
                         DSAerr(DSA_F_PKEY_DSA_CTRL, DSA_R_INVALID_DIGEST_TYPE);
                         return 0;
@@ -253,7 +255,7 @@ static int pkey_dsa_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
         if (!dsa)
                 return 0;
         ret = dsa_builtin_paramgen(dsa, dctx->nbits, dctx->qbits, dctx->pmd,
-                                   NULL, 0, NULL, NULL, pcb);
+                                   NULL, 0, NULL, NULL, NULL, pcb);
         if (ret)
                 EVP_PKEY_assign_DSA(pkey, dsa);
         else