Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
e78f1378
T
Third Party Openssl
项目概览
OpenHarmony
/
Third Party Openssl
大约 1 年 前同步成功
通知
9
Star
18
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party Openssl
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e78f1378
编写于
9月 23, 2002
作者:
B
Bodo Möller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
really fix race condition
PR: 262
上级
40e66398
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
66 addition
and
28 deletion
+66
-28
CHANGES
CHANGES
+6
-2
crypto/cryptlib.c
crypto/cryptlib.c
+2
-1
crypto/crypto.h
crypto/crypto.h
+26
-25
ssl/s23_clnt.c
ssl/s23_clnt.c
+4
-0
ssl/s23_srvr.c
ssl/s23_srvr.c
+4
-0
ssl/s2_clnt.c
ssl/s2_clnt.c
+4
-0
ssl/s2_srvr.c
ssl/s2_srvr.c
+4
-0
ssl/s3_clnt.c
ssl/s3_clnt.c
+4
-0
ssl/s3_srvr.c
ssl/s3_srvr.c
+4
-0
ssl/t1_clnt.c
ssl/t1_clnt.c
+4
-0
ssl/t1_srvr.c
ssl/t1_srvr.c
+4
-0
未找到文件。
CHANGES
浏览文件 @
e78f1378
...
@@ -1927,8 +1927,12 @@ des-cbc 3624.96k 5258.21k 5530.91k 5624.30k 5628.26k
...
@@ -1927,8 +1927,12 @@ des-cbc 3624.96k 5258.21k 5530.91k 5624.30k 5628.26k
(the SSL 3.0 and TLS 1.0 specifications allow any length up to 32 bytes).
(the SSL 3.0 and TLS 1.0 specifications allow any length up to 32 bytes).
[Bodo Moeller]
[Bodo Moeller]
*) Fix race condition in SSLv3_client_method().
*) Fix initialization code race conditions in
[Bodo Moeller]
SSLv23_client_method(), SSLv23_server_method(),
SSLv2_client_method(), SSLv2_server_method(),
SSLv3_client_method(), SSLv3_server_method(),
TLSv1_client_method(), TLSv1_server_method().
[Patrick McCormick <patrick@tellme.com>, Bodo Moeller]
*) Reorder cleanup sequence in SSL_CTX_free(): only remove the ex_data after
*) Reorder cleanup sequence in SSL_CTX_free(): only remove the ex_data after
the cached sessions are flushed, as the remove_cb() might use ex_data
the cached sessions are flushed, as the remove_cb() might use ex_data
...
...
crypto/cryptlib.c
浏览文件 @
e78f1378
...
@@ -94,6 +94,7 @@ static const char* lock_names[CRYPTO_NUM_LOCKS] =
...
@@ -94,6 +94,7 @@ static const char* lock_names[CRYPTO_NUM_LOCKS] =
"ssl_session"
,
"ssl_session"
,
"ssl_sess_cert"
,
"ssl_sess_cert"
,
"ssl"
,
"ssl"
,
"ssl_method"
,
"rand"
,
"rand"
,
"rand2"
,
"rand2"
,
"debug_malloc"
,
"debug_malloc"
,
...
@@ -111,7 +112,7 @@ static const char* lock_names[CRYPTO_NUM_LOCKS] =
...
@@ -111,7 +112,7 @@ static const char* lock_names[CRYPTO_NUM_LOCKS] =
"ecdsa"
,
"ecdsa"
,
"ec"
,
"ec"
,
"ecdh"
,
"ecdh"
,
#if CRYPTO_NUM_LOCKS != 3
4
#if CRYPTO_NUM_LOCKS != 3
5
# error "Inconsistency between crypto.h and cryptlib.c"
# error "Inconsistency between crypto.h and cryptlib.c"
#endif
#endif
};
};
...
...
crypto/crypto.h
浏览文件 @
e78f1378
...
@@ -111,30 +111,31 @@ extern "C" {
...
@@ -111,30 +111,31 @@ extern "C" {
#define CRYPTO_LOCK_DSA 8
#define CRYPTO_LOCK_DSA 8
#define CRYPTO_LOCK_RSA 9
#define CRYPTO_LOCK_RSA 9
#define CRYPTO_LOCK_EVP_PKEY 10
#define CRYPTO_LOCK_EVP_PKEY 10
#define CRYPTO_LOCK_X509_STORE 11
#define CRYPTO_LOCK_X509_STORE 11
#define CRYPTO_LOCK_SSL_CTX 12
#define CRYPTO_LOCK_SSL_CTX 12
#define CRYPTO_LOCK_SSL_CERT 13
#define CRYPTO_LOCK_SSL_CERT 13
#define CRYPTO_LOCK_SSL_SESSION 14
#define CRYPTO_LOCK_SSL_SESSION 14
#define CRYPTO_LOCK_SSL_SESS_CERT 15
#define CRYPTO_LOCK_SSL_SESS_CERT 15
#define CRYPTO_LOCK_SSL 16
#define CRYPTO_LOCK_SSL 16
#define CRYPTO_LOCK_RAND 17
#define CRYPTO_LOCK_SSL_METHOD 17
#define CRYPTO_LOCK_RAND2 18
#define CRYPTO_LOCK_RAND 18
#define CRYPTO_LOCK_MALLOC 19
#define CRYPTO_LOCK_RAND2 19
#define CRYPTO_LOCK_BIO 20
#define CRYPTO_LOCK_MALLOC 20
#define CRYPTO_LOCK_GETHOSTBYNAME 21
#define CRYPTO_LOCK_BIO 21
#define CRYPTO_LOCK_GETSERVBYNAME 22
#define CRYPTO_LOCK_GETHOSTBYNAME 22
#define CRYPTO_LOCK_READDIR 23
#define CRYPTO_LOCK_GETSERVBYNAME 23
#define CRYPTO_LOCK_RSA_BLINDING 24
#define CRYPTO_LOCK_READDIR 24
#define CRYPTO_LOCK_DH 25
#define CRYPTO_LOCK_RSA_BLINDING 25
#define CRYPTO_LOCK_MALLOC2 26
#define CRYPTO_LOCK_DH 26
#define CRYPTO_LOCK_DSO 27
#define CRYPTO_LOCK_MALLOC2 27
#define CRYPTO_LOCK_DYNLOCK 28
#define CRYPTO_LOCK_DSO 28
#define CRYPTO_LOCK_ENGINE 29
#define CRYPTO_LOCK_DYNLOCK 29
#define CRYPTO_LOCK_UI 30
#define CRYPTO_LOCK_ENGINE 30
#define CRYPTO_LOCK_ECDSA 31
#define CRYPTO_LOCK_UI 31
#define CRYPTO_LOCK_EC 32
#define CRYPTO_LOCK_ECDSA 32
#define CRYPTO_LOCK_ECDH 33
#define CRYPTO_LOCK_EC 33
#define CRYPTO_NUM_LOCKS 34
#define CRYPTO_LOCK_ECDH 34
#define CRYPTO_NUM_LOCKS 35
#define CRYPTO_LOCK 1
#define CRYPTO_LOCK 1
#define CRYPTO_UNLOCK 2
#define CRYPTO_UNLOCK 2
...
@@ -156,7 +157,7 @@ extern "C" {
...
@@ -156,7 +157,7 @@ extern "C" {
#endif
#endif
#else
#else
#define CRYPTO_w_lock(a)
#define CRYPTO_w_lock(a)
#define
CRYPTO_w_unlock(a)
#define
CRYPTO_w_unlock(a)
#define CRYPTO_r_lock(a)
#define CRYPTO_r_lock(a)
#define CRYPTO_r_unlock(a)
#define CRYPTO_r_unlock(a)
#define CRYPTO_add(a,b,c) ((*(a))+=(b))
#define CRYPTO_add(a,b,c) ((*(a))+=(b))
...
...
ssl/s23_clnt.c
浏览文件 @
e78f1378
...
@@ -87,11 +87,15 @@ SSL_METHOD *SSLv23_client_method(void)
...
@@ -87,11 +87,15 @@ SSL_METHOD *SSLv23_client_method(void)
if
(
init
)
if
(
init
)
{
{
CRYPTO_w_lock
(
CRYPTO_LOCK_SSL_METHOD
);
memcpy
((
char
*
)
&
SSLv23_client_data
,
memcpy
((
char
*
)
&
SSLv23_client_data
,
(
char
*
)
sslv23_base_method
(),
sizeof
(
SSL_METHOD
));
(
char
*
)
sslv23_base_method
(),
sizeof
(
SSL_METHOD
));
SSLv23_client_data
.
ssl_connect
=
ssl23_connect
;
SSLv23_client_data
.
ssl_connect
=
ssl23_connect
;
SSLv23_client_data
.
get_ssl_method
=
ssl23_get_client_method
;
SSLv23_client_data
.
get_ssl_method
=
ssl23_get_client_method
;
init
=
0
;
init
=
0
;
CRYPTO_w_unlock
(
CRYPTO_LOCK_SSL_METHOD
);
}
}
return
(
&
SSLv23_client_data
);
return
(
&
SSLv23_client_data
);
}
}
...
...
ssl/s23_srvr.c
浏览文件 @
e78f1378
...
@@ -139,11 +139,15 @@ SSL_METHOD *SSLv23_server_method(void)
...
@@ -139,11 +139,15 @@ SSL_METHOD *SSLv23_server_method(void)
if
(
init
)
if
(
init
)
{
{
CRYPTO_w_lock
(
CRYPTO_LOCK_SSL_METHOD
);
memcpy
((
char
*
)
&
SSLv23_server_data
,
memcpy
((
char
*
)
&
SSLv23_server_data
,
(
char
*
)
sslv23_base_method
(),
sizeof
(
SSL_METHOD
));
(
char
*
)
sslv23_base_method
(),
sizeof
(
SSL_METHOD
));
SSLv23_server_data
.
ssl_accept
=
ssl23_accept
;
SSLv23_server_data
.
ssl_accept
=
ssl23_accept
;
SSLv23_server_data
.
get_ssl_method
=
ssl23_get_server_method
;
SSLv23_server_data
.
get_ssl_method
=
ssl23_get_server_method
;
init
=
0
;
init
=
0
;
CRYPTO_w_unlock
(
CRYPTO_LOCK_SSL_METHOD
);
}
}
return
(
&
SSLv23_server_data
);
return
(
&
SSLv23_server_data
);
}
}
...
...
ssl/s2_clnt.c
浏览文件 @
e78f1378
...
@@ -145,11 +145,15 @@ SSL_METHOD *SSLv2_client_method(void)
...
@@ -145,11 +145,15 @@ SSL_METHOD *SSLv2_client_method(void)
if
(
init
)
if
(
init
)
{
{
CRYPTO_w_lock
(
CRYPTO_LOCK_SSL_METHOD
);
memcpy
((
char
*
)
&
SSLv2_client_data
,(
char
*
)
sslv2_base_method
(),
memcpy
((
char
*
)
&
SSLv2_client_data
,(
char
*
)
sslv2_base_method
(),
sizeof
(
SSL_METHOD
));
sizeof
(
SSL_METHOD
));
SSLv2_client_data
.
ssl_connect
=
ssl2_connect
;
SSLv2_client_data
.
ssl_connect
=
ssl2_connect
;
SSLv2_client_data
.
get_ssl_method
=
ssl2_get_client_method
;
SSLv2_client_data
.
get_ssl_method
=
ssl2_get_client_method
;
init
=
0
;
init
=
0
;
CRYPTO_w_unlock
(
CRYPTO_LOCK_SSL_METHOD
);
}
}
return
(
&
SSLv2_client_data
);
return
(
&
SSLv2_client_data
);
}
}
...
...
ssl/s2_srvr.c
浏览文件 @
e78f1378
...
@@ -145,11 +145,15 @@ SSL_METHOD *SSLv2_server_method(void)
...
@@ -145,11 +145,15 @@ SSL_METHOD *SSLv2_server_method(void)
if
(
init
)
if
(
init
)
{
{
CRYPTO_w_lock
(
CRYPTO_LOCK_SSL_METHOD
);
memcpy
((
char
*
)
&
SSLv2_server_data
,(
char
*
)
sslv2_base_method
(),
memcpy
((
char
*
)
&
SSLv2_server_data
,(
char
*
)
sslv2_base_method
(),
sizeof
(
SSL_METHOD
));
sizeof
(
SSL_METHOD
));
SSLv2_server_data
.
ssl_accept
=
ssl2_accept
;
SSLv2_server_data
.
ssl_accept
=
ssl2_accept
;
SSLv2_server_data
.
get_ssl_method
=
ssl2_get_server_method
;
SSLv2_server_data
.
get_ssl_method
=
ssl2_get_server_method
;
init
=
0
;
init
=
0
;
CRYPTO_w_unlock
(
CRYPTO_LOCK_SSL_METHOD
);
}
}
return
(
&
SSLv2_server_data
);
return
(
&
SSLv2_server_data
);
}
}
...
...
ssl/s3_clnt.c
浏览文件 @
e78f1378
...
@@ -178,11 +178,15 @@ SSL_METHOD *SSLv3_client_method(void)
...
@@ -178,11 +178,15 @@ SSL_METHOD *SSLv3_client_method(void)
if
(
init
)
if
(
init
)
{
{
CRYPTO_w_lock
(
CRYPTO_LOCK_SSL_METHOD
);
memcpy
((
char
*
)
&
SSLv3_client_data
,(
char
*
)
sslv3_base_method
(),
memcpy
((
char
*
)
&
SSLv3_client_data
,(
char
*
)
sslv3_base_method
(),
sizeof
(
SSL_METHOD
));
sizeof
(
SSL_METHOD
));
SSLv3_client_data
.
ssl_connect
=
ssl3_connect
;
SSLv3_client_data
.
ssl_connect
=
ssl3_connect
;
SSLv3_client_data
.
get_ssl_method
=
ssl3_get_client_method
;
SSLv3_client_data
.
get_ssl_method
=
ssl3_get_client_method
;
init
=
0
;
init
=
0
;
CRYPTO_w_unlock
(
CRYPTO_LOCK_SSL_METHOD
);
}
}
return
(
&
SSLv3_client_data
);
return
(
&
SSLv3_client_data
);
}
}
...
...
ssl/s3_srvr.c
浏览文件 @
e78f1378
...
@@ -181,11 +181,15 @@ SSL_METHOD *SSLv3_server_method(void)
...
@@ -181,11 +181,15 @@ SSL_METHOD *SSLv3_server_method(void)
if
(
init
)
if
(
init
)
{
{
CRYPTO_w_lock
(
CRYPTO_LOCK_SSL_METHOD
);
memcpy
((
char
*
)
&
SSLv3_server_data
,(
char
*
)
sslv3_base_method
(),
memcpy
((
char
*
)
&
SSLv3_server_data
,(
char
*
)
sslv3_base_method
(),
sizeof
(
SSL_METHOD
));
sizeof
(
SSL_METHOD
));
SSLv3_server_data
.
ssl_accept
=
ssl3_accept
;
SSLv3_server_data
.
ssl_accept
=
ssl3_accept
;
SSLv3_server_data
.
get_ssl_method
=
ssl3_get_server_method
;
SSLv3_server_data
.
get_ssl_method
=
ssl3_get_server_method
;
init
=
0
;
init
=
0
;
CRYPTO_w_unlock
(
CRYPTO_LOCK_SSL_METHOD
);
}
}
return
(
&
SSLv3_server_data
);
return
(
&
SSLv3_server_data
);
}
}
...
...
ssl/t1_clnt.c
浏览文件 @
e78f1378
...
@@ -79,11 +79,15 @@ SSL_METHOD *TLSv1_client_method(void)
...
@@ -79,11 +79,15 @@ SSL_METHOD *TLSv1_client_method(void)
if
(
init
)
if
(
init
)
{
{
CRYPTO_w_lock
(
CRYPTO_LOCK_SSL_METHOD
);
memcpy
((
char
*
)
&
TLSv1_client_data
,(
char
*
)
tlsv1_base_method
(),
memcpy
((
char
*
)
&
TLSv1_client_data
,(
char
*
)
tlsv1_base_method
(),
sizeof
(
SSL_METHOD
));
sizeof
(
SSL_METHOD
));
TLSv1_client_data
.
ssl_connect
=
ssl3_connect
;
TLSv1_client_data
.
ssl_connect
=
ssl3_connect
;
TLSv1_client_data
.
get_ssl_method
=
tls1_get_client_method
;
TLSv1_client_data
.
get_ssl_method
=
tls1_get_client_method
;
init
=
0
;
init
=
0
;
CRYPTO_w_unlock
(
CRYPTO_LOCK_SSL_METHOD
);
}
}
return
(
&
TLSv1_client_data
);
return
(
&
TLSv1_client_data
);
}
}
...
...
ssl/t1_srvr.c
浏览文件 @
e78f1378
...
@@ -80,11 +80,15 @@ SSL_METHOD *TLSv1_server_method(void)
...
@@ -80,11 +80,15 @@ SSL_METHOD *TLSv1_server_method(void)
if
(
init
)
if
(
init
)
{
{
CRYPTO_w_lock
(
CRYPTO_LOCK_SSL_METHOD
);
memcpy
((
char
*
)
&
TLSv1_server_data
,(
char
*
)
tlsv1_base_method
(),
memcpy
((
char
*
)
&
TLSv1_server_data
,(
char
*
)
tlsv1_base_method
(),
sizeof
(
SSL_METHOD
));
sizeof
(
SSL_METHOD
));
TLSv1_server_data
.
ssl_accept
=
ssl3_accept
;
TLSv1_server_data
.
ssl_accept
=
ssl3_accept
;
TLSv1_server_data
.
get_ssl_method
=
tls1_get_server_method
;
TLSv1_server_data
.
get_ssl_method
=
tls1_get_server_method
;
init
=
0
;
init
=
0
;
CRYPTO_w_unlock
(
CRYPTO_LOCK_SSL_METHOD
);
}
}
return
(
&
TLSv1_server_data
);
return
(
&
TLSv1_server_data
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录