diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2021-03-09 05:18:03 +0100 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2021-03-18 08:52:38 +0100 |
| commit | 4669015d7b0784d00812f6b015ca8080e37ff70b (patch) | |
| tree | f49b993d32f962a4f86833cea889140aa625f2fb /crypto/x509/x_x509.c | |
| parent | Add ossl_gost symbols (diff) | |
| download | openssl-4669015d7b0784d00812f6b015ca8080e37ff70b.tar.xz openssl-4669015d7b0784d00812f6b015ca8080e37ff70b.zip | |
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/x509/x_x509.c')
| -rw-r--r-- | crypto/x509/x_x509.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/x509/x_x509.c b/crypto/x509/x_x509.c index b6f9f043b8..a4a169a97e 100644 --- a/crypto/x509/x_x509.c +++ b/crypto/x509/x_x509.c @@ -102,7 +102,7 @@ static int x509_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, { X509 *old = exarg; - if (!x509_set0_libctx(ret, old->libctx, old->propq)) + if (!ossl_x509_set0_libctx(ret, old->libctx, old->propq)) return 0; } break; @@ -130,7 +130,7 @@ X509 *d2i_X509(X509 **a, const unsigned char **in, long len) cert = (X509 *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, (X509_it())); /* Only cache the extensions if the cert object was passed in */ if (cert != NULL && a != NULL) { - if (!x509v3_cache_extensions(cert)) { + if (!ossl_x509v3_cache_extensions(cert)) { if (free_on_error) X509_free(cert); cert = NULL; @@ -148,7 +148,7 @@ int i2d_X509(const X509 *a, unsigned char **out) * asn1 object and it needs a libctx to operate. * Use X509_new_ex() instead if possible. */ -int x509_set0_libctx(X509 *x, OSSL_LIB_CTX *libctx, const char *propq) +int ossl_x509_set0_libctx(X509 *x, OSSL_LIB_CTX *libctx, const char *propq) { if (x != NULL) { x->libctx = libctx; @@ -168,7 +168,7 @@ X509 *X509_new_ex(OSSL_LIB_CTX *libctx, const char *propq) X509 *cert = NULL; cert = (X509 *)ASN1_item_new((X509_it())); - if (!x509_set0_libctx(cert, libctx, propq)) { + if (!ossl_x509_set0_libctx(cert, libctx, propq)) { X509_free(cert); cert = NULL; } |