QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-05-17 03:49:40 +00:00
Code Issues Projects Releases Wiki Activity

rename err_get_state_int() to ossl_err_get_state_int()

Browse Source 
Partial fix for #12964

Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14473)
This commit is contained in:
Shane Lontis 2021-03-09 14:47:25 +10:00
parent 6d7776892f
commit 78715dcc31
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
crypto/err/err.c
View File

@ -309,7 +309,7 @@ void ERR_clear_error(void)
int i; int i;
ERR_STATE *es; ERR_STATE *es;
es = err_get_state_int(); es = ossl_err_get_state_int();
if (es == NULL) if (es == NULL)
return; return;
@ -423,7 +423,7 @@ static unsigned long get_error_values(ERR_GET_ACTION g,
ERR_STATE *es; ERR_STATE *es;
unsigned long ret; unsigned long ret;
es = err_get_state_int(); es = ossl_err_get_state_int();
if (es == NULL) if (es == NULL)
return 0; return 0;
@ -633,7 +633,7 @@ DEFINE_RUN_ONCE_STATIC(err_do_init)
return CRYPTO_THREAD_init_local(&err_thread_local, NULL); 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; ERR_STATE *state;
int saveerrno = get_last_sys_error(); int saveerrno = get_last_sys_error();
@ -675,7 +675,7 @@ ERR_STATE *err_get_state_int(void)
#ifndef OPENSSL_NO_DEPRECATED_3_0 #ifndef OPENSSL_NO_DEPRECATED_3_0
ERR_STATE *ERR_get_state(void) ERR_STATE *ERR_get_state(void)
{ {
return err_get_state_int(); return ossl_err_get_state_int();
} }
#endif #endif
@ -743,7 +743,7 @@ static int err_set_error_data_int(char *data, size_t size, int flags,
{ {
ERR_STATE *es; ERR_STATE *es;
es = err_get_state_int(); es = ossl_err_get_state_int();
if (es == NULL) if (es == NULL)
return 0; return 0;
@ -788,7 +788,7 @@ void ERR_add_error_vdata(int num, va_list args)
ERR_STATE *es; ERR_STATE *es;
/* Get the current error data; if an allocated string get it. */ /* 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) if (es == NULL)
return; return;
i = es->top; i = es->top;
@ -843,7 +843,7 @@ int ERR_set_mark(void)
{ {
ERR_STATE *es; ERR_STATE *es;
es = err_get_state_int(); es = ossl_err_get_state_int();
if (es == NULL) if (es == NULL)
return 0; return 0;
@ -857,7 +857,7 @@ int ERR_pop_to_mark(void)
{ {
ERR_STATE *es; ERR_STATE *es;
es = err_get_state_int(); es = ossl_err_get_state_int();
if (es == NULL) if (es == NULL)
return 0; return 0;
@ -878,7 +878,7 @@ int ERR_clear_last_mark(void)
ERR_STATE *es; ERR_STATE *es;
int top; int top;
es = err_get_state_int(); es = ossl_err_get_state_int();
if (es == NULL) if (es == NULL)
return 0; return 0;
@ -899,7 +899,7 @@ void err_clear_last_constant_time(int clear)
ERR_STATE *es; ERR_STATE *es;
int top; int top;
es = err_get_state_int(); es = ossl_err_get_state_int();
if (es == NULL) if (es == NULL)
return; return;

6
crypto/err/err_blocks.c
View File

@ -18,7 +18,7 @@ void ERR_new(void)
{ {
ERR_STATE *es; ERR_STATE *es;
es = err_get_state_int(); es = ossl_err_get_state_int();
if (es == NULL) if (es == NULL)
return; return;
@ -31,7 +31,7 @@ void ERR_set_debug(const char *file, int line, const char *func)
{ {
ERR_STATE *es; ERR_STATE *es;
es = err_get_state_int(); es = ossl_err_get_state_int();
if (es == NULL) if (es == NULL)
return; return;
@ -55,7 +55,7 @@ void ERR_vset_error(int lib, int reason, const char *fmt, va_list args)
unsigned long flags = 0; unsigned long flags = 0;
size_t i; size_t i;
es = err_get_state_int(); es = ossl_err_get_state_int();
if (es == NULL) if (es == NULL)
return; return;
i = es->top; i = es->top;

2
crypto/err/err_local.h
View File

@ -86,6 +86,6 @@ static ossl_inline void err_clear(ERR_STATE *es, size_t i, int deall)
es->err_func[i] = NULL; 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, void ossl_err_string_int(unsigned long e, const char *func,
char *buf, size_t len); char *buf, size_t len);