diff options
author | Shane Lontis <shane.lontis@oracle.com> | 2021-02-25 09:08:54 +1000 |
---|---|---|
committer | Shane Lontis <shane.lontis@oracle.com> | 2021-03-18 17:52:37 +1000 |
commit | 9500c8234d8e99396717b9e43f10cc518e8bf668 (patch) | |
tree | 51975e210b7900643c21d2ad67b3a65a902fc591 /include | |
parent | e4bec869104cf4ba51cbb1effb0f5437e327ecd8 (diff) |
Fix misc external ossl_ 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/security_bits.h | 2 | ||||
-rw-r--r-- | include/internal/cryptlib.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/crypto/security_bits.h b/include/crypto/security_bits.h index 3dc9e26ff3..58f49681dc 100644 --- a/include/crypto/security_bits.h +++ b/include/crypto/security_bits.h @@ -11,6 +11,6 @@ # define OSSL_SECURITY_BITS_H # pragma once -uint16_t ifc_ffc_compute_security_bits(int n); +uint16_t ossl_ifc_ffc_compute_security_bits(int n); #endif diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h index 663c3ef808..26862310d8 100644 --- a/include/internal/cryptlib.h +++ b/include/internal/cryptlib.h @@ -249,11 +249,11 @@ static ossl_inline void ossl_sleep(unsigned long millis) char *sk_ASN1_UTF8STRING2text(STACK_OF(ASN1_UTF8STRING) *text, const char *sep, size_t max_len); -char *ipaddr_to_asc(unsigned char *p, int len); +char *ossl_ipaddr_to_asc(unsigned char *p, int len); -char *openssl_buf2hexstr_sep(const unsigned char *buf, long buflen, char sep); -unsigned char *openssl_hexstr2buf_sep(const char *str, long *buflen, - const char sep); +char *ossl_buf2hexstr_sep(const unsigned char *buf, long buflen, char sep); +unsigned char *ossl_hexstr2buf_sep(const char *str, long *buflen, + const char sep); static ossl_inline int ossl_ends_with_dirsep(const char *path) { |