Add ossl_asn1 symbols

Partial fix for #12964

Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14473)

2 files changed, 9 insertions, 9 deletions

diff --git a/crypto/cms/cms_ess.c b/crypto/cms/cms_ess.c
index 5982035c45..b713581c05 100644
--- a/crypto/cms/cms_ess.c
+++ b/crypto/cms/cms_ess.c
@@ -166,10 +166,10 @@ static int cms_msgSigDigest(CMS_SignerInfo *si,
 
     if (md == NULL)
         return 0;
-    if (!asn1_item_digest_ex(ASN1_ITEM_rptr(CMS_Attributes_Verify), md,
-                             si->signedAttrs, dig, diglen,
-                             ossl_cms_ctx_get0_libctx(si->cms_ctx),
-                             ossl_cms_ctx_get0_propq(si->cms_ctx)))
+    if (!ossl_asn1_item_digest_ex(ASN1_ITEM_rptr(CMS_Attributes_Verify), md,
+                                  si->signedAttrs, dig, diglen,
+                                  ossl_cms_ctx_get0_libctx(si->cms_ctx),
+                                  ossl_cms_ctx_get0_propq(si->cms_ctx)))
         return 0;
     return 1;
 }
diff --git a/crypto/cms/cms_rsa.c b/crypto/cms/cms_rsa.c
index f577d462f1..b9e895aed4 100644
--- a/crypto/cms/cms_rsa.c
+++ b/crypto/cms/cms_rsa.c
@@ -25,7 +25,7 @@ static RSA_OAEP_PARAMS *rsa_oaep_decode(const X509_ALGOR *alg)
         return NULL;
 
     if (oaep->maskGenFunc != NULL) {
-        oaep->maskHash = x509_algor_mgf1_decode(oaep->maskGenFunc);
+        oaep->maskHash = ossl_x509_algor_mgf1_decode(oaep->maskGenFunc);
         if (oaep->maskHash == NULL) {
             RSA_OAEP_PARAMS_free(oaep);
             return NULL;
@@ -65,10 +65,10 @@ static int rsa_cms_decrypt(CMS_RecipientInfo *ri)
         goto err;
     }
 
-    mgf1md = x509_algor_get_md(oaep->maskHash);
+    mgf1md = ossl_x509_algor_get_md(oaep->maskHash);
     if (mgf1md == NULL)
         goto err;
-    md = x509_algor_get_md(oaep->hashFunc);
+    md = ossl_x509_algor_get_md(oaep->hashFunc);
     if (md == NULL)
         goto err;
 
@@ -140,9 +140,9 @@ static int rsa_cms_encrypt(CMS_RecipientInfo *ri)
     oaep = RSA_OAEP_PARAMS_new();
     if (oaep == NULL)
         goto err;
-    if (!x509_algor_new_from_md(&oaep->hashFunc, md))
+    if (!ossl_x509_algor_new_from_md(&oaep->hashFunc, md))
         goto err;
-    if (!x509_algor_md_to_mgf1(&oaep->maskGenFunc, mgf1md))
+    if (!ossl_x509_algor_md_to_mgf1(&oaep->maskGenFunc, mgf1md))
         goto err;
     if (labellen > 0) {
         ASN1_OCTET_STRING *los;