summaryrefslogtreecommitdiffstats
path: root/crypto/o_str.c
diff options
context:
space:
mode:
authorShane Lontis <shane.lontis@oracle.com>2021-02-25 09:08:54 +1000
committerShane Lontis <shane.lontis@oracle.com>2021-03-18 17:52:37 +1000
commit9500c8234d8e99396717b9e43f10cc518e8bf668 (patch)
tree51975e210b7900643c21d2ad67b3a65a902fc591 /crypto/o_str.c
parente4bec869104cf4ba51cbb1effb0f5437e327ecd8 (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 'crypto/o_str.c')
-rw-r--r--crypto/o_str.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/crypto/o_str.c b/crypto/o_str.c
index dbecf4841c..ec8f3512d3 100644
--- a/crypto/o_str.c
+++ b/crypto/o_str.c
@@ -181,8 +181,8 @@ int OPENSSL_hexstr2buf_ex(unsigned char *buf, size_t buf_n, size_t *buflen,
return hexstr2buf_sep(buf, buf_n, buflen, str, sep);
}
-unsigned char *openssl_hexstr2buf_sep(const char *str, long *buflen,
- const char sep)
+unsigned char *ossl_hexstr2buf_sep(const char *str, long *buflen,
+ const char sep)
{
unsigned char *buf;
size_t buf_n, tmp_buflen;
@@ -212,7 +212,7 @@ unsigned char *openssl_hexstr2buf_sep(const char *str, long *buflen,
unsigned char *OPENSSL_hexstr2buf(const char *str, long *buflen)
{
- return openssl_hexstr2buf_sep(str, buflen, DEFAULT_SEPARATOR);
+ return ossl_hexstr2buf_sep(str, buflen, DEFAULT_SEPARATOR);
}
static int buf2hexstr_sep(char *str, size_t str_n, size_t *strlen,
@@ -260,7 +260,7 @@ int OPENSSL_buf2hexstr_ex(char *str, size_t str_n, size_t *strlen,
return buf2hexstr_sep(str, str_n, strlen, buf, buflen, sep);
}
-char *openssl_buf2hexstr_sep(const unsigned char *buf, long buflen, char sep)
+char *ossl_buf2hexstr_sep(const unsigned char *buf, long buflen, char sep)
{
char *tmp;
size_t tmp_n;
@@ -288,7 +288,7 @@ char *openssl_buf2hexstr_sep(const unsigned char *buf, long buflen, char sep)
*/
char *OPENSSL_buf2hexstr(const unsigned char *buf, long buflen)
{
- return openssl_buf2hexstr_sep(buf, buflen, ':');
+ return ossl_buf2hexstr_sep(buf, buflen, ':');
}
int openssl_strerror_r(int errnum, char *buf, size_t buflen)