diff options
author | Shane Lontis <shane.lontis@oracle.com> | 2021-03-09 14:47:25 +1000 |
---|---|---|
committer | Shane Lontis <shane.lontis@oracle.com> | 2021-03-18 17:52:38 +1000 |
commit | 78715dcc310e27a8c862ecdf3a956c1cfdc0f2c1 (patch) | |
tree | 80c1113c617fc8fce501c664acff7a94fcd0957d /crypto/err | |
parent | 6d7776892f571cb438563d65d5d252e0245cd57e (diff) |
rename err_get_state_int() to ossl_err_get_state_int()
Partial fix for #12964
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14473)
Diffstat (limited to 'crypto/err')
-rw-r--r-- | crypto/err/err.c | 20 | ||||
-rw-r--r-- | crypto/err/err_blocks.c | 6 | ||||
-rw-r--r-- | crypto/err/err_local.h | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/crypto/err/err.c b/crypto/err/err.c index 23836b844b..046bfcfe16 100644 --- a/crypto/err/err.c +++ b/crypto/err/err.c @@ -309,7 +309,7 @@ void ERR_clear_error(void) int i; ERR_STATE *es; - es = err_get_state_int(); + es = ossl_err_get_state_int(); if (es == NULL) return; @@ -423,7 +423,7 @@ static unsigned long get_error_values(ERR_GET_ACTION g, ERR_STATE *es; unsigned long ret; - es = err_get_state_int(); + es = ossl_err_get_state_int(); if (es == NULL) return 0; @@ -633,7 +633,7 @@ DEFINE_RUN_ONCE_STATIC(err_do_init) return CRYPTO_THREAD_init_local(&err_thread_local, NULL); } -ERR_STATE *err_get_state_int(void) +ERR_STATE *ossl_err_get_state_int(void) { ERR_STATE *state; int saveerrno = get_last_sys_error(); @@ -675,7 +675,7 @@ ERR_STATE *err_get_state_int(void) #ifndef OPENSSL_NO_DEPRECATED_3_0 ERR_STATE *ERR_get_state(void) { - return err_get_state_int(); + return ossl_err_get_state_int(); } #endif @@ -743,7 +743,7 @@ static int err_set_error_data_int(char *data, size_t size, int flags, { ERR_STATE *es; - es = err_get_state_int(); + es = ossl_err_get_state_int(); if (es == NULL) return 0; @@ -788,7 +788,7 @@ void ERR_add_error_vdata(int num, va_list args) ERR_STATE *es; /* Get the current error data; if an allocated string get it. */ - es = err_get_state_int(); + es = ossl_err_get_state_int(); if (es == NULL) return; i = es->top; @@ -843,7 +843,7 @@ int ERR_set_mark(void) { ERR_STATE *es; - es = err_get_state_int(); + es = ossl_err_get_state_int(); if (es == NULL) return 0; @@ -857,7 +857,7 @@ int ERR_pop_to_mark(void) { ERR_STATE *es; - es = err_get_state_int(); + es = ossl_err_get_state_int(); if (es == NULL) return 0; @@ -878,7 +878,7 @@ int ERR_clear_last_mark(void) ERR_STATE *es; int top; - es = err_get_state_int(); + es = ossl_err_get_state_int(); if (es == NULL) return 0; @@ -899,7 +899,7 @@ void err_clear_last_constant_time(int clear) ERR_STATE *es; int top; - es = err_get_state_int(); + es = ossl_err_get_state_int(); if (es == NULL) return; diff --git a/crypto/err/err_blocks.c b/crypto/err/err_blocks.c index 20888e9576..0a2458f801 100644 --- a/crypto/err/err_blocks.c +++ b/crypto/err/err_blocks.c @@ -18,7 +18,7 @@ void ERR_new(void) { ERR_STATE *es; - es = err_get_state_int(); + es = ossl_err_get_state_int(); if (es == NULL) return; @@ -31,7 +31,7 @@ void ERR_set_debug(const char *file, int line, const char *func) { ERR_STATE *es; - es = err_get_state_int(); + es = ossl_err_get_state_int(); if (es == NULL) return; @@ -55,7 +55,7 @@ void ERR_vset_error(int lib, int reason, const char *fmt, va_list args) unsigned long flags = 0; size_t i; - es = err_get_state_int(); + es = ossl_err_get_state_int(); if (es == NULL) return; i = es->top; diff --git a/crypto/err/err_local.h b/crypto/err/err_local.h index 3de74b5c0d..678f92dc04 100644 --- a/crypto/err/err_local.h +++ b/crypto/err/err_local.h @@ -86,6 +86,6 @@ static ossl_inline void err_clear(ERR_STATE *es, size_t i, int deall) es->err_func[i] = NULL; } -ERR_STATE *err_get_state_int(void); +ERR_STATE *ossl_err_get_state_int(void); void ossl_err_string_int(unsigned long e, const char *func, char *buf, size_t len); |