From 4669015d7b0784d00812f6b015ca8080e37ff70b Mon Sep 17 00:00:00 2001 From: Shane Lontis Date: Tue, 9 Mar 2021 14:18:03 +1000 Subject: Add ossl_ x509 symbols Partial fix for #12964 Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/14473) --- include/crypto/x509.h | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) (limited to 'include') diff --git a/include/crypto/x509.h b/include/crypto/x509.h index 4b179a07af..623b880959 100644 --- a/include/crypto/x509.h +++ b/include/crypto/x509.h @@ -305,29 +305,27 @@ struct x509_object_st { }; 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); -int x509_init_sig_info(X509 *x); -int x509_check_issued_int(X509 *issuer, X509 *subject, OSSL_LIB_CTX *libctx, - const char *propq); - -int x509_set0_libctx(X509 *x, OSSL_LIB_CTX *libctx, const char *propq); -int x509_crl_set0_libctx(X509_CRL *x, OSSL_LIB_CTX *libctx, const char *propq); -int x509_init_sig_info(X509 *x); -int ossl_asn1_item_digest_ex(const ASN1_ITEM *it, const EVP_MD *type, void *data, - unsigned char *md, unsigned int *len, +int ossl_x509_set1_time(ASN1_TIME **ptm, const ASN1_TIME *tm); +int ossl_x509_print_ex_brief(BIO *bio, X509 *cert, unsigned long neg_cflags); +int ossl_x509v3_cache_extensions(X509 *x); +int ossl_x509_init_sig_info(X509 *x); + +int ossl_x509_set0_libctx(X509 *x, OSSL_LIB_CTX *libctx, const char *propq); +int ossl_x509_crl_set0_libctx(X509_CRL *x, OSSL_LIB_CTX *libctx, + const char *propq); +int ossl_asn1_item_digest_ex(const ASN1_ITEM *it, const EVP_MD *type, + void *data, unsigned char *md, unsigned int *len, OSSL_LIB_CTX *libctx, const char *propq); int ossl_x509_add_cert_new(STACK_OF(X509) **sk, X509 *cert, int flags); int ossl_x509_add_certs_new(STACK_OF(X509) **p_sk, STACK_OF(X509) *certs, int flags); -int X509_PUBKEY_get0_libctx(OSSL_LIB_CTX **plibctx, const char **ppropq, - const X509_PUBKEY *key); +int ossl_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 *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, - const unsigned char **in, long length); +EVP_PKEY *ossl_d2i_PUBKEY_legacy(EVP_PKEY **a, + const unsigned char **in, long length); #endif -- cgit v1.2.3