Various PKCS#7 related fixes,tidies and comments.

[openssl.git] / crypto / pkcs7 / pk7_lib.c

diff --git a/crypto/pkcs7/pk7_lib.c b/crypto/pkcs7/pk7_lib.c
index 43d991580a29053d9ee3aeb577778f694ca7d445..ea3a5a2c76e1a7429e2716d09fa12d3711805413 100644 (file)
--- a/crypto/pkcs7/pk7_lib.c
+++ b/crypto/pkcs7/pk7_lib.c
@@ -310,6 +310,12 @@ int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
        else    
                p7i->digest_alg->algorithm=OBJ_nid2obj(EVP_MD_type(dgst));
 
+       if (p7i->digest_alg->parameter != NULL)
+               ASN1_TYPE_free(p7i->digest_alg->parameter);
+       if ((p7i->digest_alg->parameter=ASN1_TYPE_new()) == NULL)
+               goto err;
+       p7i->digest_alg->parameter->type=V_ASN1_NULL;
+
        p7i->digest_enc_alg->algorithm=OBJ_nid2obj(EVP_PKEY_type(pkey->type));
 
        if (p7i->digest_enc_alg->parameter != NULL)