Skip to content

T
Third Party Openssl

OpenHarmony / Third Party Openssl
1 年多 前同步成功

通知 9
Star 18
Fork 1
T
Third Party Openssl
提交 2d789604 编写于 作者: B Bodo Möller
浏览文件
操作

Bugfix: use write locks, not just read locks

上级 c4558f82
隐藏空白更改
内联 并排
Showing with 8 addition and 8 deletion
crypto/err/err.c
浏览文件 @ 2d789604
...@@ -558,7 +558,7 @@ const char *ERR_lib_error_string(unsigned long e) ...@@ -558,7 +558,7 @@ const char *ERR_lib_error_string(unsigned long e)
l=ERR_GET_LIB(e); l=ERR_GET_LIB(e);
CRYPTO_r_lock(CRYPTO_LOCK_ERR_HASH); CRYPTO_w_lock(CRYPTO_LOCK_ERR_HASH);
if (error_hash != NULL) if (error_hash != NULL)
{ {
...@@ -566,7 +566,7 @@ const char *ERR_lib_error_string(unsigned long e) ...@@ -566,7 +566,7 @@ const char *ERR_lib_error_string(unsigned long e)
p=(ERR_STRING_DATA *)lh_retrieve(error_hash,&d); p=(ERR_STRING_DATA *)lh_retrieve(error_hash,&d);
} }
CRYPTO_r_unlock(CRYPTO_LOCK_ERR_HASH); CRYPTO_w_unlock(CRYPTO_LOCK_ERR_HASH);
return((p == NULL)?NULL:p->string); return((p == NULL)?NULL:p->string);
} }
...@@ -579,7 +579,7 @@ const char *ERR_func_error_string(unsigned long e) ...@@ -579,7 +579,7 @@ const char *ERR_func_error_string(unsigned long e)
l=ERR_GET_LIB(e); l=ERR_GET_LIB(e);
f=ERR_GET_FUNC(e); f=ERR_GET_FUNC(e);
CRYPTO_r_lock(CRYPTO_LOCK_ERR_HASH); CRYPTO_w_lock(CRYPTO_LOCK_ERR_HASH);
if (error_hash != NULL) if (error_hash != NULL)
{ {
...@@ -587,7 +587,7 @@ const char *ERR_func_error_string(unsigned long e) ...@@ -587,7 +587,7 @@ const char *ERR_func_error_string(unsigned long e)
p=(ERR_STRING_DATA *)lh_retrieve(error_hash,&d); p=(ERR_STRING_DATA *)lh_retrieve(error_hash,&d);
} }
CRYPTO_r_unlock(CRYPTO_LOCK_ERR_HASH); CRYPTO_w_unlock(CRYPTO_LOCK_ERR_HASH);
return((p == NULL)?NULL:p->string); return((p == NULL)?NULL:p->string);
} }
...@@ -600,7 +600,7 @@ const char *ERR_reason_error_string(unsigned long e) ...@@ -600,7 +600,7 @@ const char *ERR_reason_error_string(unsigned long e)
l=ERR_GET_LIB(e); l=ERR_GET_LIB(e);
r=ERR_GET_REASON(e); r=ERR_GET_REASON(e);
CRYPTO_r_lock(CRYPTO_LOCK_ERR_HASH); CRYPTO_w_lock(CRYPTO_LOCK_ERR_HASH);
if (error_hash != NULL) if (error_hash != NULL)
{ {
...@@ -613,7 +613,7 @@ const char *ERR_reason_error_string(unsigned long e) ...@@ -613,7 +613,7 @@ const char *ERR_reason_error_string(unsigned long e)
} }
} }
CRYPTO_r_unlock(CRYPTO_LOCK_ERR_HASH); CRYPTO_w_unlock(CRYPTO_LOCK_ERR_HASH);
return((p == NULL)?NULL:p->string); return((p == NULL)?NULL:p->string);
} }
...@@ -674,13 +674,13 @@ ERR_STATE *ERR_get_state(void) ...@@ -674,13 +674,13 @@ ERR_STATE *ERR_get_state(void)
pid=(unsigned long)CRYPTO_thread_id(); pid=(unsigned long)CRYPTO_thread_id();
CRYPTO_r_lock(CRYPTO_LOCK_ERR); CRYPTO_w_lock(CRYPTO_LOCK_ERR);
if (thread_hash != NULL) if (thread_hash != NULL)
{ {
tmp.pid=pid; tmp.pid=pid;
ret=(ERR_STATE *)lh_retrieve(thread_hash,&tmp); ret=(ERR_STATE *)lh_retrieve(thread_hash,&tmp);
} }
CRYPTO_r_unlock(CRYPTO_LOCK_ERR); CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
/* ret == the error state, if NULL, make a new one */ /* ret == the error state, if NULL, make a new one */
if (ret == NULL) if (ret == NULL)
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或