QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-05-10 00:19:40 +00:00
Code Issues Projects Releases Wiki Activity

Rename CMS_si_check_attributes to ossl_cms_si_check_attributes

Browse Source 
Partial fix for #12964

Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14473)
This commit is contained in:
Shane Lontis 2021-03-09 14:49:27 +10:00
parent 78715dcc31
commit 3022b7f404
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/cms/cms_att.c
View File

@ -263,7 +263,7 @@ static int cms_check_attribute(int nid, int flags, int type,
* attributes. Only one instance of each is allowed, with each of these * attributes. Only one instance of each is allowed, with each of these
* attributes containing a single attribute value in its set. * attributes containing a single attribute value in its set.
*/ */
int CMS_si_check_attributes(const CMS_SignerInfo *si) int ossl_cms_si_check_attributes(const CMS_SignerInfo *si)
{ {
int i; int i;
int have_signed_attrs = (CMS_signed_get_attr_count(si) > 0); int have_signed_attrs = (CMS_signed_get_attr_count(si) > 0);

2
crypto/cms/cms_local.h
View File

@ -468,7 +468,7 @@ int ossl_cms_RecipientInfo_kari_encrypt(const CMS_ContentInfo *cms,
int ossl_cms_RecipientInfo_pwri_crypt(const CMS_ContentInfo *cms, int ossl_cms_RecipientInfo_pwri_crypt(const CMS_ContentInfo *cms,
CMS_RecipientInfo *ri, int en_de); CMS_RecipientInfo *ri, int en_de);
/* SignerInfo routines */ /* SignerInfo routines */
int CMS_si_check_attributes(const CMS_SignerInfo *si); int ossl_cms_si_check_attributes(const CMS_SignerInfo *si);
void ossl_cms_SignerInfos_set_cmsctx(CMS_ContentInfo *cms); void ossl_cms_SignerInfos_set_cmsctx(CMS_ContentInfo *cms);

4
crypto/cms/cms_sd.c
View File

@ -734,7 +734,7 @@ int CMS_SignerInfo_sign(CMS_SignerInfo *si)
goto err; goto err;
} }
if (!CMS_si_check_attributes(si)) if (!ossl_cms_si_check_attributes(si))
goto err; goto err;
if (si->pctx) if (si->pctx)
@ -829,7 +829,7 @@ int CMS_SignerInfo_verify(CMS_SignerInfo *si)
return -1; return -1;
} }
if (!CMS_si_check_attributes(si)) if (!ossl_cms_si_check_attributes(si))
return -1; return -1;
name = OBJ_nid2sn(OBJ_obj2nid(si->digestAlgorithm->algorithm)); name = OBJ_nid2sn(OBJ_obj2nid(si->digestAlgorithm->algorithm));