Change AR to ARX to allow exclusion of fips object modules

[openssl.git] / crypto / cms / cms_dd.c

diff --git a/crypto/cms/cms_dd.c b/crypto/cms/cms_dd.c
index a927caad8e5bfb1cf705151ae7fa097eb5b3dcc4..93d6747ae80026f8d1850f065070c6c623b56ce6 100644 (file)
--- a/crypto/cms/cms_dd.c
+++ b/crypto/cms/cms_dd.c
@@ -58,7 +58,6 @@
 #include <openssl/err.h>
 #include <openssl/cms.h>
 #include "cms_lcl.h"
-#include "asn1_locl.h"
 
 DECLARE_ASN1_ITEM(CMS_DigestedData)
 
@@ -83,7 +82,7 @@ CMS_ContentInfo *cms_DigestedData_create(const EVP_MD *md)
        dd->version = 0;
        dd->encapContentInfo->eContentType = OBJ_nid2obj(NID_pkcs7_data);
 
-       cms_DigestAlgorithm_set(dd->digestAlgorithm, md);
+       X509_ALGOR_set_md(dd->digestAlgorithm, md);
 
        return cms;
 
@@ -121,7 +120,7 @@ int cms_DigestedData_do_final(CMS_ContentInfo *cms, BIO *chain, int verify)
 
        if (verify)
                {
-               if (mdlen != dd->digest->length)
+               if (mdlen != (unsigned int)dd->digest->length)
                        {
                        CMSerr(CMS_F_CMS_DIGESTEDDATA_DO_FINAL,
                                CMS_R_MESSAGEDIGEST_WRONG_LENGTH);