diff options
author | Shane Lontis <shane.lontis@oracle.com> | 2021-02-19 17:29:29 +1000 |
---|---|---|
committer | Shane Lontis <shane.lontis@oracle.com> | 2021-02-22 09:16:37 +1000 |
commit | 681618cfc18b4f01f2c07e823308d30f6f47504b (patch) | |
tree | 92e2f52154e886b18213bdffd854df0dfa34f49b /crypto/pkcs7 | |
parent | 53155f1c814be6d8bfdd77333a16ec9cee7fc3bb (diff) |
Fix external symbols for pkcs7.
Partial fix for #12964
This adds ossl_ names for symbols related to pkcs7_*
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14241)
Diffstat (limited to 'crypto/pkcs7')
-rw-r--r-- | crypto/pkcs7/pk7_asn1.c | 2 | ||||
-rw-r--r-- | crypto/pkcs7/pk7_doit.c | 40 | ||||
-rw-r--r-- | crypto/pkcs7/pk7_lib.c | 20 | ||||
-rw-r--r-- | crypto/pkcs7/pk7_local.h | 6 | ||||
-rw-r--r-- | crypto/pkcs7/pk7_mime.c | 8 | ||||
-rw-r--r-- | crypto/pkcs7/pk7_smime.c | 8 |
6 files changed, 42 insertions, 42 deletions
diff --git a/crypto/pkcs7/pk7_asn1.c b/crypto/pkcs7/pk7_asn1.c index 3d6e524248..60ad5b1e76 100644 --- a/crypto/pkcs7/pk7_asn1.c +++ b/crypto/pkcs7/pk7_asn1.c @@ -69,7 +69,7 @@ PKCS7 *d2i_PKCS7(PKCS7 **a, const unsigned char **in, long len) ret = (PKCS7 *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, (PKCS7_it())); if (ret != NULL) - pkcs7_resolve_libctx(ret); + ossl_pkcs7_resolve_libctx(ret); return ret; } diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c index a979544aeb..ab23100f49 100644 --- a/crypto/pkcs7/pk7_doit.c +++ b/crypto/pkcs7/pk7_doit.c @@ -69,8 +69,8 @@ static int pkcs7_bio_add_digest(BIO **pbio, X509_ALGOR *alg, name = OBJ_nid2sn(OBJ_obj2nid(alg->algorithm)); (void)ERR_set_mark(); - fetched = EVP_MD_fetch(pkcs7_ctx_get0_libctx(ctx), name, - pkcs7_ctx_get0_propq(ctx)); + fetched = EVP_MD_fetch(ossl_pkcs7_ctx_get0_libctx(ctx), name, + ossl_pkcs7_ctx_get0_propq(ctx)); if (fetched != NULL) md = fetched; else @@ -114,8 +114,8 @@ static int pkcs7_encode_rinfo(PKCS7_RECIP_INFO *ri, if (pkey == NULL) return 0; - pctx = EVP_PKEY_CTX_new_from_pkey(pkcs7_ctx_get0_libctx(ctx), pkey, - pkcs7_ctx_get0_propq(ctx)); + pctx = EVP_PKEY_CTX_new_from_pkey(ossl_pkcs7_ctx_get0_libctx(ctx), pkey, + ossl_pkcs7_ctx_get0_propq(ctx)); if (pctx == NULL) return 0; @@ -163,8 +163,8 @@ static int pkcs7_decrypt_rinfo(unsigned char **pek, int *peklen, int ret = -1; const PKCS7_CTX *ctx = ri->ctx; - pctx = EVP_PKEY_CTX_new_from_pkey(pkcs7_ctx_get0_libctx(ctx), pkey, - pkcs7_ctx_get0_propq(ctx)); + pctx = EVP_PKEY_CTX_new_from_pkey(ossl_pkcs7_ctx_get0_libctx(ctx), pkey, + ossl_pkcs7_ctx_get0_propq(ctx)); if (pctx == NULL) return -1; @@ -232,9 +232,9 @@ BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio) ERR_raise(ERR_LIB_PKCS7, PKCS7_R_INVALID_NULL_POINTER); return NULL; } - p7_ctx = pkcs7_get0_ctx(p7); - libctx = pkcs7_ctx_get0_libctx(p7_ctx); - propq = pkcs7_ctx_get0_propq(p7_ctx); + p7_ctx = ossl_pkcs7_get0_ctx(p7); + libctx = ossl_pkcs7_ctx_get0_libctx(p7_ctx); + propq = ossl_pkcs7_ctx_get0_propq(p7_ctx); /* * The content field in the PKCS7 ContentInfo is optional, but that really @@ -426,9 +426,9 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert) return NULL; } - p7_ctx = pkcs7_get0_ctx(p7); - libctx = pkcs7_ctx_get0_libctx(p7_ctx); - propq = pkcs7_ctx_get0_propq(p7_ctx); + p7_ctx = ossl_pkcs7_get0_ctx(p7); + libctx = ossl_pkcs7_ctx_get0_libctx(p7_ctx); + propq = ossl_pkcs7_ctx_get0_propq(p7_ctx); if (p7->d.ptr == NULL) { ERR_raise(ERR_LIB_PKCS7, PKCS7_R_NO_CONTENT); @@ -744,7 +744,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio) return 0; } - p7_ctx = pkcs7_get0_ctx(p7); + p7_ctx = ossl_pkcs7_get0_ctx(p7); if (p7->d.ptr == NULL) { ERR_raise(ERR_LIB_PKCS7, PKCS7_R_NO_CONTENT); @@ -854,8 +854,8 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio) goto err; if (!EVP_SignFinal_ex(ctx_tmp, abuf, &abuflen, si->pkey, - pkcs7_ctx_get0_libctx(p7_ctx), - pkcs7_ctx_get0_propq(p7_ctx))) { + ossl_pkcs7_ctx_get0_libctx(p7_ctx), + ossl_pkcs7_ctx_get0_propq(p7_ctx))) { OPENSSL_free(abuf); ERR_raise(ERR_LIB_PKCS7, ERR_R_EVP_LIB); goto err; @@ -927,8 +927,8 @@ int PKCS7_SIGNER_INFO_sign(PKCS7_SIGNER_INFO *si) } if (EVP_DigestSignInit_ex(mctx, &pctx, EVP_MD_name(md), - pkcs7_ctx_get0_libctx(ctx), - pkcs7_ctx_get0_propq(ctx), si->pkey) <= 0) + ossl_pkcs7_ctx_get0_libctx(ctx), + ossl_pkcs7_ctx_get0_propq(ctx), si->pkey) <= 0) goto err; /* @@ -1073,9 +1073,9 @@ int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si, STACK_OF(X509_ATTRIBUTE) *sk; BIO *btmp; EVP_PKEY *pkey; - const PKCS7_CTX *ctx = pkcs7_get0_ctx(p7); - OSSL_LIB_CTX *libctx = pkcs7_ctx_get0_libctx(ctx); - const char *propq = pkcs7_ctx_get0_propq(ctx); + const PKCS7_CTX *ctx = ossl_pkcs7_get0_ctx(p7); + OSSL_LIB_CTX *libctx = ossl_pkcs7_ctx_get0_libctx(ctx); + const char *propq = ossl_pkcs7_ctx_get0_propq(ctx); mdc_tmp = EVP_MD_CTX_new(); if (mdc_tmp == NULL) { diff --git a/crypto/pkcs7/pk7_lib.c b/crypto/pkcs7/pk7_lib.c index 95aab3368a..39e1c983e8 100644 --- a/crypto/pkcs7/pk7_lib.c +++ b/crypto/pkcs7/pk7_lib.c @@ -233,7 +233,7 @@ int PKCS7_add_signer(PKCS7 *p7, PKCS7_SIGNER_INFO *psi) } } - psi->ctx = pkcs7_get0_ctx(p7); + psi->ctx = ossl_pkcs7_get0_ctx(p7); if (!sk_PKCS7_SIGNER_INFO_push(signer_sk, psi)) return 0; return 1; @@ -425,12 +425,12 @@ static STACK_OF(PKCS7_RECIP_INFO) *pkcs7_get_recipient_info(const PKCS7 *p7) * Set up the library context into any loaded structure that needs it. * i.e loaded X509 objects. */ -void pkcs7_resolve_libctx(PKCS7 *p7) +void ossl_pkcs7_resolve_libctx(PKCS7 *p7) { int i; - const PKCS7_CTX *ctx = pkcs7_get0_ctx(p7); - OSSL_LIB_CTX *libctx = pkcs7_ctx_get0_libctx(ctx); - const char *propq = pkcs7_ctx_get0_propq(ctx); + const PKCS7_CTX *ctx = ossl_pkcs7_get0_ctx(p7); + OSSL_LIB_CTX *libctx = ossl_pkcs7_ctx_get0_libctx(ctx); + const char *propq = ossl_pkcs7_ctx_get0_propq(ctx); STACK_OF(PKCS7_RECIP_INFO) *rinfos = pkcs7_get_recipient_info(p7); STACK_OF(PKCS7_SIGNER_INFO) *sinfos = PKCS7_get_signer_info(p7); STACK_OF(X509) *certs = pkcs7_get_signer_certs(p7); @@ -455,16 +455,16 @@ void pkcs7_resolve_libctx(PKCS7 *p7) } } -const PKCS7_CTX *pkcs7_get0_ctx(const PKCS7 *p7) +const PKCS7_CTX *ossl_pkcs7_get0_ctx(const PKCS7 *p7) { return p7 != NULL ? &p7->ctx : NULL; } -OSSL_LIB_CTX *pkcs7_ctx_get0_libctx(const PKCS7_CTX *ctx) +OSSL_LIB_CTX *ossl_pkcs7_ctx_get0_libctx(const PKCS7_CTX *ctx) { return ctx != NULL ? ctx->libctx : NULL; } -const char *pkcs7_ctx_get0_propq(const PKCS7_CTX *ctx) +const char *ossl_pkcs7_ctx_get0_propq(const PKCS7_CTX *ctx) { return ctx != NULL ? ctx->propq : NULL; } @@ -524,7 +524,7 @@ PKCS7_RECIP_INFO *PKCS7_add_recipient(PKCS7 *p7, X509 *x509) goto err; if (!PKCS7_add_recipient_info(p7, ri)) goto err; - ri->ctx = pkcs7_get0_ctx(p7); + ri->ctx = ossl_pkcs7_get0_ctx(p7); return ri; err: PKCS7_RECIP_INFO_free(ri); @@ -656,7 +656,7 @@ int PKCS7_set_cipher(PKCS7 *p7, const EVP_CIPHER *cipher) } ec->cipher = cipher; - ec->ctx = pkcs7_get0_ctx(p7); + ec->ctx = ossl_pkcs7_get0_ctx(p7); return 1; } diff --git a/crypto/pkcs7/pk7_local.h b/crypto/pkcs7/pk7_local.h index 5db0127e1d..77c6fbcf26 100644 --- a/crypto/pkcs7/pk7_local.h +++ b/crypto/pkcs7/pk7_local.h @@ -9,6 +9,6 @@ #include "crypto/pkcs7.h" -const PKCS7_CTX *pkcs7_get0_ctx(const PKCS7 *p7); -OSSL_LIB_CTX *pkcs7_ctx_get0_libctx(const PKCS7_CTX *ctx); -const char *pkcs7_ctx_get0_propq(const PKCS7_CTX *ctx); +const PKCS7_CTX *ossl_pkcs7_get0_ctx(const PKCS7 *p7); +OSSL_LIB_CTX *ossl_pkcs7_ctx_get0_libctx(const PKCS7_CTX *ctx); +const char *ossl_pkcs7_ctx_get0_propq(const PKCS7_CTX *ctx); diff --git a/crypto/pkcs7/pk7_mime.c b/crypto/pkcs7/pk7_mime.c index 98f9e2483a..e191e4e3b8 100644 --- a/crypto/pkcs7/pk7_mime.c +++ b/crypto/pkcs7/pk7_mime.c @@ -31,7 +31,7 @@ int SMIME_write_PKCS7(BIO *bio, PKCS7 *p7, BIO *data, int flags) { STACK_OF(X509_ALGOR) *mdalgs; int ctype_nid = OBJ_obj2nid(p7->type); - const PKCS7_CTX *ctx = pkcs7_get0_ctx(p7); + const PKCS7_CTX *ctx = ossl_pkcs7_get0_ctx(p7); if (ctype_nid == NID_pkcs7_signed) mdalgs = p7->d.sign->md_algs; @@ -42,8 +42,8 @@ int SMIME_write_PKCS7(BIO *bio, PKCS7 *p7, BIO *data, int flags) return SMIME_write_ASN1_ex(bio, (ASN1_VALUE *)p7, data, flags, ctype_nid, NID_undef, mdalgs, ASN1_ITEM_rptr(PKCS7), - pkcs7_ctx_get0_libctx(ctx), - pkcs7_ctx_get0_propq(ctx)); + ossl_pkcs7_ctx_get0_libctx(ctx), + ossl_pkcs7_ctx_get0_propq(ctx)); } PKCS7 *SMIME_read_PKCS7_ex(BIO *bio, BIO **bcont, PKCS7 **p7) @@ -53,7 +53,7 @@ PKCS7 *SMIME_read_PKCS7_ex(BIO *bio, BIO **bcont, PKCS7 **p7) ret = (PKCS7 *)SMIME_read_ASN1_ex(bio, bcont, ASN1_ITEM_rptr(PKCS7), (ASN1_VALUE **)p7); if (ret != NULL) - pkcs7_resolve_libctx(ret); + ossl_pkcs7_resolve_libctx(ret); return ret; } diff --git a/crypto/pkcs7/pk7_smime.c b/crypto/pkcs7/pk7_smime.c index f6853513e0..8bc83bc9f4 100644 --- a/crypto/pkcs7/pk7_smime.c +++ b/crypto/pkcs7/pk7_smime.c @@ -131,7 +131,7 @@ PKCS7_SIGNER_INFO *PKCS7_sign_add_signer(PKCS7 *p7, X509 *signcert, return NULL; } - si->ctx = pkcs7_get0_ctx(p7); + si->ctx = ossl_pkcs7_get0_ctx(p7); if (!(flags & PKCS7_NOCERTS)) { if (!PKCS7_add_certificate(p7, signcert)) goto err; @@ -265,9 +265,9 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store, return 0; /* Now verify the certificates */ - p7_ctx = pkcs7_get0_ctx(p7); - cert_ctx = X509_STORE_CTX_new_ex(pkcs7_ctx_get0_libctx(p7_ctx), - pkcs7_ctx_get0_propq(p7_ctx)); + p7_ctx = ossl_pkcs7_get0_ctx(p7); + cert_ctx = X509_STORE_CTX_new_ex(ossl_pkcs7_ctx_get0_libctx(p7_ctx), + ossl_pkcs7_ctx_get0_propq(p7_ctx)); if (cert_ctx == NULL) goto err; if (!(flags & PKCS7_NOVERIFY)) |