Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
2b90b1f3
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,发现更多精彩内容 >>
提交
2b90b1f3
编写于
11月 10, 2001
作者:
B
Bodo Möller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
make code a little more similar to what it looked like before the fixes,
call ssl2_part_read again to parse error message
上级
65123f80
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
24 addition
and
10 deletion
+24
-10
CHANGES
CHANGES
+1
-1
ssl/s2_clnt.c
ssl/s2_clnt.c
+15
-6
ssl/s2_srvr.c
ssl/s2_srvr.c
+8
-3
未找到文件。
CHANGES
浏览文件 @
2b90b1f3
...
...
@@ -115,7 +115,7 @@
*) Change ssl/s2_clnt.c and ssl/s3_srvr.c so that received handshake
messages are stored in a single piece (fixed-length part and
variable-length part) and fix various bugs found on the way.
variable-length part
combined
) and fix various bugs found on the way.
[Bodo Moeller]
*) In ssl3_get_client_hello (ssl/s3_srvr.c), generate a fatal alert
...
...
ssl/s2_clnt.c
浏览文件 @
2b90b1f3
...
...
@@ -873,8 +873,8 @@ static int get_server_verify(SSL *s)
p
=
(
unsigned
char
*
)
s
->
init_buf
->
data
;
if
(
s
->
state
==
SSL2_ST_GET_SERVER_VERIFY_A
)
{
i
=
ssl2_read
(
s
,(
char
*
)
&
(
p
[
s
->
init_num
]),
3
-
s
->
init_num
);
if
(
i
<
(
3
-
s
->
init_num
))
i
=
ssl2_read
(
s
,(
char
*
)
&
(
p
[
s
->
init_num
]),
1
-
s
->
init_num
);
if
(
i
<
(
1
-
s
->
init_num
))
return
(
ssl2_part_read
(
s
,
SSL_F_GET_SERVER_VERIFY
,
i
));
s
->
init_num
+=
i
;
...
...
@@ -888,8 +888,12 @@ static int get_server_verify(SSL *s)
SSL_R_READ_WRONG_PACKET_TYPE
);
}
else
SSLerr
(
SSL_F_GET_SERVER_VERIFY
,
SSL_R_PEER_ERROR
);
{
SSLerr
(
SSL_F_GET_SERVER_VERIFY
,
SSL_R_PEER_ERROR
);
/* try to read the error message */
i
=
ssl2_read
(
s
,(
char
*
)
&
(
p
[
s
->
init_num
]),
3
-
s
->
init_num
);
return
ssl2_part_read
(
s
,
SSL_F_GET_SERVER_VERIFY
,
i
);
}
return
(
-
1
);
}
}
...
...
@@ -923,8 +927,8 @@ static int get_server_finished(SSL *s)
p
=
buf
;
if
(
s
->
state
==
SSL2_ST_GET_SERVER_FINISHED_A
)
{
i
=
ssl2_read
(
s
,(
char
*
)
&
(
buf
[
s
->
init_num
]),
3
-
s
->
init_num
);
if
(
i
<
(
3
-
s
->
init_num
))
i
=
ssl2_read
(
s
,(
char
*
)
&
(
buf
[
s
->
init_num
]),
1
-
s
->
init_num
);
if
(
i
<
(
1
-
s
->
init_num
))
return
(
ssl2_part_read
(
s
,
SSL_F_GET_SERVER_FINISHED
,
i
));
s
->
init_num
+=
i
;
...
...
@@ -941,7 +945,12 @@ static int get_server_finished(SSL *s)
SSLerr
(
SSL_F_GET_SERVER_FINISHED
,
SSL_R_READ_WRONG_PACKET_TYPE
);
}
else
{
SSLerr
(
SSL_F_GET_SERVER_FINISHED
,
SSL_R_PEER_ERROR
);
/* try to read the error message */
i
=
ssl2_read
(
s
,(
char
*
)
&
(
p
[
s
->
init_num
]),
3
-
s
->
init_num
);
return
ssl2_part_read
(
s
,
SSL_F_GET_SERVER_VERIFY
,
i
);
}
return
(
-
1
);
}
s
->
state
=
SSL2_ST_GET_SERVER_FINISHED_B
;
...
...
ssl/s2_srvr.c
浏览文件 @
2b90b1f3
...
...
@@ -801,10 +801,10 @@ static int get_client_finished(SSL *s)
p
=
(
unsigned
char
*
)
s
->
init_buf
->
data
;
if
(
s
->
state
==
SSL2_ST_GET_CLIENT_FINISHED_A
)
{
i
=
ssl2_read
(
s
,(
char
*
)
&
(
p
[
s
->
init_num
]),
3
-
s
->
init_num
);
if
(
i
<
3
-
s
->
init_num
)
i
=
ssl2_read
(
s
,(
char
*
)
&
(
p
[
s
->
init_num
]),
1
-
s
->
init_num
);
if
(
i
<
1
-
s
->
init_num
)
return
(
ssl2_part_read
(
s
,
SSL_F_GET_CLIENT_FINISHED
,
i
));
s
->
init_num
=
3
;
s
->
init_num
+=
i
;
if
(
*
p
!=
SSL2_MT_CLIENT_FINISHED
)
{
...
...
@@ -814,7 +814,12 @@ static int get_client_finished(SSL *s)
SSLerr
(
SSL_F_GET_CLIENT_FINISHED
,
SSL_R_READ_WRONG_PACKET_TYPE
);
}
else
{
SSLerr
(
SSL_F_GET_CLIENT_FINISHED
,
SSL_R_PEER_ERROR
);
/* try to read the error message */
i
=
ssl2_read
(
s
,(
char
*
)
&
(
p
[
s
->
init_num
]),
3
-
s
->
init_num
);
return
ssl2_part_read
(
s
,
SSL_F_GET_SERVER_VERIFY
,
i
);
}
return
(
-
1
);
}
s
->
state
=
SSL2_ST_GET_CLIENT_FINISHED_B
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录