diff options
author | Shane Lontis <shane.lontis@oracle.com> | 2021-03-09 09:48:16 +1000 |
---|---|---|
committer | Shane Lontis <shane.lontis@oracle.com> | 2021-03-18 17:52:37 +1000 |
commit | adf7e6d1d63890f037625031789ed042187c3947 (patch) | |
tree | 48c61a773e33b6df45664d1a46e8be54e0a9092d /include | |
parent | 1335ca4b0799d1714a2f8e21525cb23edf660e93 (diff) |
Add ossl_asn1 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/asn1.h | 42 | ||||
-rw-r--r-- | include/crypto/ctype.h | 2 | ||||
-rw-r--r-- | include/crypto/x509.h | 6 | ||||
-rw-r--r-- | include/internal/cryptlib.h | 4 |
4 files changed, 27 insertions, 27 deletions
diff --git a/include/crypto/asn1.h b/include/crypto/asn1.h index 7d9dec10db..b812bdd614 100644 --- a/include/crypto/asn1.h +++ b/include/crypto/asn1.h @@ -92,18 +92,18 @@ struct evp_pkey_asn1_method_st { DEFINE_STACK_OF_CONST(EVP_PKEY_ASN1_METHOD) -extern const EVP_PKEY_ASN1_METHOD dh_asn1_meth; -extern const EVP_PKEY_ASN1_METHOD dhx_asn1_meth; -extern const EVP_PKEY_ASN1_METHOD dsa_asn1_meths[5]; -extern const EVP_PKEY_ASN1_METHOD eckey_asn1_meth; -extern const EVP_PKEY_ASN1_METHOD ecx25519_asn1_meth; -extern const EVP_PKEY_ASN1_METHOD ecx448_asn1_meth; -extern const EVP_PKEY_ASN1_METHOD ed25519_asn1_meth; -extern const EVP_PKEY_ASN1_METHOD ed448_asn1_meth; -extern const EVP_PKEY_ASN1_METHOD sm2_asn1_meth; - -extern const EVP_PKEY_ASN1_METHOD rsa_asn1_meths[2]; -extern const EVP_PKEY_ASN1_METHOD rsa_pss_asn1_meth; +extern const EVP_PKEY_ASN1_METHOD ossl_dh_asn1_meth; +extern const EVP_PKEY_ASN1_METHOD ossl_dhx_asn1_meth; +extern const EVP_PKEY_ASN1_METHOD ossl_dsa_asn1_meths[5]; +extern const EVP_PKEY_ASN1_METHOD ossl_eckey_asn1_meth; +extern const EVP_PKEY_ASN1_METHOD ossl_ecx25519_asn1_meth; +extern const EVP_PKEY_ASN1_METHOD ossl_ecx448_asn1_meth; +extern const EVP_PKEY_ASN1_METHOD ossl_ed25519_asn1_meth; +extern const EVP_PKEY_ASN1_METHOD ossl_ed448_asn1_meth; +extern const EVP_PKEY_ASN1_METHOD ossl_sm2_asn1_meth; + +extern const EVP_PKEY_ASN1_METHOD ossl_rsa_asn1_meths[2]; +extern const EVP_PKEY_ASN1_METHOD ossl_rsa_pss_asn1_meth; /* * These are used internally in the ASN1_OBJECT to keep track of whether the @@ -133,15 +133,15 @@ struct asn1_pctx_st { /* ASN1 type functions */ -int asn1_type_set_octetstring_int(ASN1_TYPE *a, long num, - unsigned char *data, int len); -int asn1_type_get_octetstring_int(const ASN1_TYPE *a, long *num, - unsigned char *data, int max_len); +int ossl_asn1_type_set_octetstring_int(ASN1_TYPE *a, long num, + unsigned char *data, int len); +int ossl_asn1_type_get_octetstring_int(const ASN1_TYPE *a, long *num, + unsigned char *data, int max_len); -int x509_algor_new_from_md(X509_ALGOR **palg, const EVP_MD *md); -const EVP_MD *x509_algor_get_md(X509_ALGOR *alg); -X509_ALGOR *x509_algor_mgf1_decode(X509_ALGOR *alg); -int x509_algor_md_to_mgf1(X509_ALGOR **palg, const EVP_MD *mgf1md); -int asn1_time_print_ex(BIO *bp, const ASN1_TIME *tm); +int ossl_x509_algor_new_from_md(X509_ALGOR **palg, const EVP_MD *md); +const EVP_MD *ossl_x509_algor_get_md(X509_ALGOR *alg); +X509_ALGOR *ossl_x509_algor_mgf1_decode(X509_ALGOR *alg); +int ossl_x509_algor_md_to_mgf1(X509_ALGOR **palg, const EVP_MD *mgf1md); +int ossl_asn1_time_print_ex(BIO *bp, const ASN1_TIME *tm); #endif /* ndef OSSL_CRYPTO_ASN1_H */ diff --git a/include/crypto/ctype.h b/include/crypto/ctype.h index cb6e81b56e..a35c137e84 100644 --- a/include/crypto/ctype.h +++ b/include/crypto/ctype.h @@ -58,7 +58,7 @@ int ossl_ctype_check(int c, unsigned int mask); int ossl_tolower(int c); int ossl_toupper(int c); -int ascii_isdigit(const char inchar); +int ossl_ascii_isdigit(const char inchar); # define ossl_isalnum(c) (ossl_ctype_check((c), CTYPE_MASK_alnum)) # define ossl_isalpha(c) (ossl_ctype_check((c), CTYPE_MASK_alpha)) diff --git a/include/crypto/x509.h b/include/crypto/x509.h index 67fd88dbc4..c031dc56b1 100644 --- a/include/crypto/x509.h +++ b/include/crypto/x509.h @@ -315,9 +315,9 @@ int x509_check_issued_int(X509 *issuer, X509 *subject, OSSL_LIB_CTX *libctx, 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 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_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); diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h index 26862310d8..fb46657dba 100644 --- a/include/internal/cryptlib.h +++ b/include/internal/cryptlib.h @@ -247,8 +247,8 @@ static ossl_inline void ossl_sleep(unsigned long millis) } #endif /* defined OPENSSL_SYS_UNIX */ -char *sk_ASN1_UTF8STRING2text(STACK_OF(ASN1_UTF8STRING) *text, const char *sep, - size_t max_len); +char *ossl_sk_ASN1_UTF8STRING2text(STACK_OF(ASN1_UTF8STRING) *text, + const char *sep, size_t max_len); char *ossl_ipaddr_to_asc(unsigned char *p, int len); char *ossl_buf2hexstr_sep(const unsigned char *buf, long buflen, char sep); |