diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2021-03-09 10:52:15 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2021-03-18 17:52:37 +1000 |
| commit | 47864aeafd2ca0ea551f00df99c4c598b53c5912 (patch) | |
| tree | 5150af4fd7dbab314c6b6d2a2440e92a0e96441a /include | |
| parent | 4158b0dc1d73ce73b9a924b77205f4d2b67abdc1 (diff) | |
Add ossl_v3 symbols
Partial fix for #12964
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14473)
Diffstat (limited to 'include')
| -rw-r--r-- | include/crypto/x509.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/crypto/x509.h b/include/crypto/x509.h index c031dc56b1..4b179a07af 100644 --- a/include/crypto/x509.h +++ b/include/crypto/x509.h @@ -304,7 +304,7 @@ struct x509_object_st { } data; }; -int a2i_ipadd(unsigned char *ipout, const char *ipasc); +int ossl_a2i_ipadd(unsigned char *ipout, const char *ipasc); int x509_set1_time(ASN1_TIME **ptm, const ASN1_TIME *tm); int x509_print_ex_brief(BIO *bio, X509 *cert, unsigned long neg_cflags); int x509v3_cache_extensions(X509 *x); @@ -325,7 +325,7 @@ int ossl_x509_add_certs_new(STACK_OF(X509) **p_sk, STACK_OF(X509) *certs, int X509_PUBKEY_get0_libctx(OSSL_LIB_CTX **plibctx, const char **ppropq, const X509_PUBKEY *key); /* Calculate default key identifier according to RFC 5280 section 4.2.1.2 (1) */ -ASN1_OCTET_STRING *x509_pubkey_hash(X509_PUBKEY *pubkey); +ASN1_OCTET_STRING *ossl_x509_pubkey_hash(X509_PUBKEY *pubkey); /* A variant of d2i_PUBKEY() that is guaranteed to only return legacy keys */ EVP_PKEY *d2i_PUBKEY_legacy(EVP_PKEY **a, |