diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2021-03-09 14:18:03 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2021-03-18 17:52:38 +1000 |
| commit | 4669015d7b0784d00812f6b015ca8080e37ff70b (patch) | |
| tree | f49b993d32f962a4f86833cea889140aa625f2fb /crypto/cmp | |
| parent | 6dd4b77a855570a6433af0a8584bdb9bfe353bc3 (diff) | |
Add ossl_ x509 symbols
Partial fix for #12964
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14473)
Diffstat (limited to 'crypto/cmp')
| -rw-r--r-- | crypto/cmp/cmp_ctx.c | 2 | ||||
| -rw-r--r-- | crypto/cmp/cmp_msg.c | 2 | ||||
| -rw-r--r-- | crypto/cmp/cmp_vfy.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/crypto/cmp/cmp_ctx.c b/crypto/cmp/cmp_ctx.c index e65dabe323..0016569356 100644 --- a/crypto/cmp/cmp_ctx.c +++ b/crypto/cmp/cmp_ctx.c @@ -607,7 +607,7 @@ int OSSL_CMP_CTX_set1_##FIELD(OSSL_CMP_CTX *ctx, const TYPE *val) \ return 1; \ } -#define X509_invalid(cert) (!x509v3_cache_extensions(cert)) +#define X509_invalid(cert) (!ossl_x509v3_cache_extensions(cert)) #define EVP_PKEY_invalid(key) 0 #define DEFINE_OSSL_CMP_CTX_set1_up_ref(FIELD, TYPE) \ int OSSL_CMP_CTX_set1_##FIELD(OSSL_CMP_CTX *ctx, TYPE *val) \ diff --git a/crypto/cmp/cmp_msg.c b/crypto/cmp/cmp_msg.c index 09b2d7b03b..77b2175b11 100644 --- a/crypto/cmp/cmp_msg.c +++ b/crypto/cmp/cmp_msg.c @@ -1027,7 +1027,7 @@ X509 *ossl_cmp_certresponse_get1_cert(const OSSL_CMP_CERTRESPONSE *crep, if (crt == NULL) ERR_raise(ERR_LIB_CMP, CMP_R_CERTIFICATE_NOT_FOUND); else - (void)x509_set0_libctx(crt, ctx->libctx, ctx->propq); + (void)ossl_x509_set0_libctx(crt, ctx->libctx, ctx->propq); return crt; } diff --git a/crypto/cmp/cmp_vfy.c b/crypto/cmp/cmp_vfy.c index 88052d5ec5..064e8e37b3 100644 --- a/crypto/cmp/cmp_vfy.c +++ b/crypto/cmp/cmp_vfy.c @@ -58,7 +58,7 @@ static int verify_signature(const OSSL_CMP_CTX *cmp_ctx, } sig_err: - res = x509_print_ex_brief(bio, cert, X509_FLAG_NO_EXTENSIONS); + res = ossl_x509_print_ex_brief(bio, cert, X509_FLAG_NO_EXTENSIONS); ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_VALIDATING_SIGNATURE); if (res) ERR_add_error_mem_bio("\n", bio); @@ -266,7 +266,7 @@ static int cert_acceptable(const OSSL_CMP_CTX *ctx, if (!check_kid(ctx, X509_get0_subject_key_id(cert), msg->header->senderKID)) return 0; /* prevent misleading error later in case x509v3_cache_extensions() fails */ - if (!x509v3_cache_extensions(cert)) { + if (!ossl_x509v3_cache_extensions(cert)) { ossl_cmp_warn(ctx, "cert appears to be invalid"); return 0; } |