New function to extract AlgorithmIdentifier for PKCS7_RECIP_INFO.

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

diff --git a/crypto/pkcs7/pk7_lib.c b/crypto/pkcs7/pk7_lib.c
index a45a0f06407236f10ed27c3c90eb58b5c39a41e7..8b6c153481b122d2f81db5acfcf93faec44ac8cf 100644 (file)
--- a/crypto/pkcs7/pk7_lib.c
+++ b/crypto/pkcs7/pk7_lib.c
@@ -60,6 +60,7 @@
 #include "cryptlib.h"
 #include <openssl/objects.h>
 #include <openssl/x509.h>
+#include "asn1_locl.h"
 
 long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg)
        {
@@ -187,7 +188,6 @@ int PKCS7_set_type(PKCS7 *p7, int type)
                ASN1_INTEGER_set(p7->d.signed_and_enveloped->version,1);
                if (!ASN1_INTEGER_set(p7->d.signed_and_enveloped->version,1))
                        goto err;
-               break;
                p7->d.signed_and_enveloped->enc_data->content_type
                                                = OBJ_nid2obj(NID_pkcs7_data);
                break;
@@ -341,13 +341,8 @@ int PKCS7_add_crl(PKCS7 *p7, X509_CRL *crl)
 int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
             const EVP_MD *dgst)
        {
-       int nid;
-       char is_dsa;
+       int ret;
 
-       if (pkey->type == EVP_PKEY_DSA || pkey->type == EVP_PKEY_EC)
-               is_dsa = 1;
-       else
-               is_dsa = 0;
        /* We now need to add another PKCS7_SIGNER_INFO entry */
        if (!ASN1_INTEGER_set(p7i->version,1))
                goto err;
@@ -367,50 +362,26 @@ int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
        p7i->pkey=pkey;
 
        /* Set the algorithms */
-       if (is_dsa) p7i->digest_alg->algorithm=OBJ_nid2obj(NID_sha1);
-       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;
+       X509_ALGOR_set0(p7i->digest_alg, OBJ_nid2obj(EVP_MD_type(dgst)),
+                               V_ASN1_NULL, NULL);
 
-       if (p7i->digest_enc_alg->parameter != NULL)
-               ASN1_TYPE_free(p7i->digest_enc_alg->parameter);
-       nid = EVP_PKEY_type(pkey->type);
-       if (nid == EVP_PKEY_RSA)
-               {
-               p7i->digest_enc_alg->algorithm=OBJ_nid2obj(NID_rsaEncryption);
-               if (!(p7i->digest_enc_alg->parameter=ASN1_TYPE_new()))
-                       goto err;
-               p7i->digest_enc_alg->parameter->type=V_ASN1_NULL;
-               }
-       else if (nid == EVP_PKEY_DSA)
+       if (pkey->ameth && pkey->ameth->pkey_ctrl)
                {
-#if 1
-               /* use 'dsaEncryption' OID for compatibility with other software
-                * (PKCS #7 v1.5 does specify how to handle DSA) ... */
-               p7i->digest_enc_alg->algorithm=OBJ_nid2obj(NID_dsa);
-#else
-               /* ... although the 'dsaWithSHA1' OID (as required by RFC 2630 for CMS)
-                * would make more sense. */
-               p7i->digest_enc_alg->algorithm=OBJ_nid2obj(NID_dsaWithSHA1);
-#endif
-               p7i->digest_enc_alg->parameter = NULL; /* special case for DSA: omit 'parameter'! */
-               }
-       else if (nid == EVP_PKEY_EC)
-               {
-               p7i->digest_enc_alg->algorithm=OBJ_nid2obj(NID_ecdsa_with_SHA1);
-               if (!(p7i->digest_enc_alg->parameter=ASN1_TYPE_new()))
-                       goto err;
-               p7i->digest_enc_alg->parameter->type=V_ASN1_NULL;
+               ret = pkey->ameth->pkey_ctrl(pkey, ASN1_PKEY_CTRL_PKCS7_SIGN,
+                                               0, p7i);
+               if (ret > 0)
+                       return 1;
+               if (ret != -2)
+                       {
+                       PKCS7err(PKCS7_F_PKCS7_SIGNER_INFO_SET,
+                                       PKCS7_R_SIGNING_CTRL_FAILURE);
+                       return 0;
+                       }
                }
-       else
-               return(0);
-
-       return(1);
+       PKCS7err(PKCS7_F_PKCS7_SIGNER_INFO_SET,
+                       PKCS7_R_SIGNING_NOT_SUPPORTED_FOR_THIS_KEY_TYPE);
+       return 0;
 err:
        return(0);
        }
@@ -425,6 +396,8 @@ PKCS7_SIGNER_INFO *PKCS7_add_signature(PKCS7 *p7, X509 *x509, EVP_PKEY *pkey,
        if (!PKCS7_add_signer(p7,si)) goto err;
        return(si);
 err:
+       if (si)
+               PKCS7_SIGNER_INFO_free(si);
        return(NULL);
        }
 
@@ -460,6 +433,23 @@ STACK_OF(PKCS7_SIGNER_INFO) *PKCS7_get_signer_info(PKCS7 *p7)
                return(NULL);
        }
 
+void PKCS7_SIGNER_INFO_get0_algs(PKCS7_SIGNER_INFO *si, EVP_PKEY **pk,
+                                       X509_ALGOR **pdig, X509_ALGOR **psig)
+       {
+       if (pk)
+               *pk = si->pkey;
+       if (pdig)
+               *pdig = si->digest_alg;
+       if (psig)
+               *psig = si->digest_enc_alg;
+       }
+
+void PKCS7_RECIP_INFO_get0_alg(PKCS7_RECIP_INFO *ri, X509_ALGOR **penc)
+       {
+       if (penc)
+               *penc = ri->key_enc_algor;
+       }
+
 PKCS7_RECIP_INFO *PKCS7_add_recipient(PKCS7 *p7, X509 *x509)
        {
        PKCS7_RECIP_INFO *ri;