diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2021-03-09 14:49:27 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2021-03-18 17:52:38 +1000 |
| commit | 3022b7f40407aa9d50d1e4193e22a092b23c7717 (patch) | |
| tree | c96acbae2ec8667588365eb355f667c6e5df95e1 /crypto | |
| parent | 78715dcc310e27a8c862ecdf3a956c1cfdc0f2c1 (diff) | |
Rename CMS_si_check_attributes to ossl_cms_si_check_attributes
Partial fix for #12964
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14473)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/cms/cms_att.c | 2 | ||||
| -rw-r--r-- | crypto/cms/cms_local.h | 2 | ||||
| -rw-r--r-- | crypto/cms/cms_sd.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/crypto/cms/cms_att.c b/crypto/cms/cms_att.c index 2ac118b9e6..c7a757d80b 100644 --- a/crypto/cms/cms_att.c +++ b/crypto/cms/cms_att.c @@ -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 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 have_signed_attrs = (CMS_signed_get_attr_count(si) > 0); diff --git a/crypto/cms/cms_local.h b/crypto/cms/cms_local.h index 0827c55a1c..15b4a29ce0 100644 --- a/crypto/cms/cms_local.h +++ b/crypto/cms/cms_local.h @@ -468,7 +468,7 @@ int ossl_cms_RecipientInfo_kari_encrypt(const CMS_ContentInfo *cms, int ossl_cms_RecipientInfo_pwri_crypt(const CMS_ContentInfo *cms, CMS_RecipientInfo *ri, int en_de); /* 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); diff --git a/crypto/cms/cms_sd.c b/crypto/cms/cms_sd.c index 0c3f04388b..a57943513e 100644 --- a/crypto/cms/cms_sd.c +++ b/crypto/cms/cms_sd.c @@ -734,7 +734,7 @@ int CMS_SignerInfo_sign(CMS_SignerInfo *si) goto err; } - if (!CMS_si_check_attributes(si)) + if (!ossl_cms_si_check_attributes(si)) goto err; if (si->pctx) @@ -829,7 +829,7 @@ int CMS_SignerInfo_verify(CMS_SignerInfo *si) return -1; } - if (!CMS_si_check_attributes(si)) + if (!ossl_cms_si_check_attributes(si)) return -1; name = OBJ_nid2sn(OBJ_obj2nid(si->digestAlgorithm->algorithm)); |