Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
58f41a92
T
Third Party Openssl
项目概览
OpenHarmony
/
Third Party Openssl
9 个月 前同步成功
通知
8
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,体验更适合开发者的 AI 搜索 >>
提交
58f41a92
编写于
6月 05, 2009
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Updates from 1.0.0-stable
上级
81d06ef2
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
31 addition
and
5 deletion
+31
-5
apps/s_server.c
apps/s_server.c
+2
-0
crypto/bio/bss_dgram.c
crypto/bio/bss_dgram.c
+9
-2
ssl/d1_both.c
ssl/d1_both.c
+6
-2
ssl/d1_clnt.c
ssl/d1_clnt.c
+1
-1
ssl/d1_pkt.c
ssl/d1_pkt.c
+10
-0
ssl/d1_srvr.c
ssl/d1_srvr.c
+2
-0
ssl/dtls1.h
ssl/dtls1.h
+1
-0
未找到文件。
apps/s_server.c
浏览文件 @
58f41a92
...
...
@@ -298,7 +298,9 @@ static const char *session_id_prefix=NULL;
static
int
enable_timeouts
=
0
;
static
long
socket_mtu
;
#ifndef OPENSSL_NO_DTLS1
static
int
cert_chain
=
0
;
#endif
#ifndef OPENSSL_NO_PSK
static
char
*
psk_identity
=
"Client_identity"
;
...
...
crypto/bio/bss_dgram.c
浏览文件 @
58f41a92
...
...
@@ -217,12 +217,19 @@ static void dgram_adjust_rcv_timeout(BIO *b)
timeleft
.
tv_usec
+=
1000000
;
}
if
(
timeleft
.
tv_sec
<
0
)
{
timeleft
.
tv_sec
=
0
;
timeleft
.
tv_usec
=
1
;
}
/* Adjust socket timeout if next handhake message timer
* will expire earlier.
*/
if
(
data
->
socket_timeout
.
tv_sec
<
timeleft
.
tv_sec
||
if
((
data
->
socket_timeout
.
tv_sec
==
0
&&
data
->
socket_timeout
.
tv_usec
==
0
)
||
(
data
->
socket_timeout
.
tv_sec
>
timeleft
.
tv_sec
)
||
(
data
->
socket_timeout
.
tv_sec
==
timeleft
.
tv_sec
&&
data
->
socket_timeout
.
tv_usec
<
=
timeleft
.
tv_usec
))
data
->
socket_timeout
.
tv_usec
>
=
timeleft
.
tv_usec
))
{
#ifdef OPENSSL_SYS_WINDOWS
timeout
=
timeleft
.
tv_sec
*
1000
+
timeleft
.
tv_usec
/
1000
;
...
...
ssl/d1_both.c
浏览文件 @
58f41a92
...
...
@@ -569,9 +569,13 @@ dtls1_process_out_of_seq_message(SSL *s, struct hm_header_st* msg_hdr, int *ok)
item
=
pqueue_find
(
s
->
d1
->
buffered_messages
,
seq64be
);
/* Discard the message if sequence number was already there, is
* too far in the future or the fragment is already in the queue */
* too far in the future, already in the queue or if we received
* a FINISHED before the SERVER_HELLO, which then must be a stale
* retransmit.
*/
if
(
msg_hdr
->
seq
<=
s
->
d1
->
handshake_read_seq
||
msg_hdr
->
seq
>
s
->
d1
->
handshake_read_seq
+
10
||
item
!=
NULL
)
msg_hdr
->
seq
>
s
->
d1
->
handshake_read_seq
+
10
||
item
!=
NULL
||
(
s
->
d1
->
handshake_read_seq
==
0
&&
msg_hdr
->
type
==
SSL3_MT_FINISHED
))
{
unsigned
char
devnull
[
256
];
...
...
ssl/d1_clnt.c
浏览文件 @
58f41a92
...
...
@@ -442,7 +442,7 @@ int dtls1_connect(SSL *s)
case
SSL3_ST_CR_FINISHED_A
:
case
SSL3_ST_CR_FINISHED_B
:
s
->
d1
->
change_cipher_spec_ok
=
1
;
ret
=
ssl3_get_finished
(
s
,
SSL3_ST_CR_FINISHED_A
,
SSL3_ST_CR_FINISHED_B
);
if
(
ret
<=
0
)
goto
end
;
...
...
ssl/d1_pkt.c
浏览文件 @
58f41a92
...
...
@@ -1102,6 +1102,16 @@ start:
s
->
msg_callback
(
0
,
s
->
version
,
SSL3_RT_CHANGE_CIPHER_SPEC
,
rr
->
data
,
1
,
s
,
s
->
msg_callback_arg
);
/* We can't process a CCS now, because previous handshake
* messages are still missing, so just drop it.
*/
if
(
!
s
->
d1
->
change_cipher_spec_ok
)
{
goto
start
;
}
s
->
d1
->
change_cipher_spec_ok
=
0
;
s
->
s3
->
change_cipher_spec
=
1
;
if
(
!
ssl3_do_change_cipher_spec
(
s
))
goto
err
;
...
...
ssl/d1_srvr.c
浏览文件 @
58f41a92
...
...
@@ -497,6 +497,7 @@ int dtls1_accept(SSL *s)
case
SSL3_ST_SR_CERT_VRFY_A
:
case
SSL3_ST_SR_CERT_VRFY_B
:
s
->
d1
->
change_cipher_spec_ok
=
1
;
/* we should decide if we expected this one */
ret
=
ssl3_get_cert_verify
(
s
);
if
(
ret
<=
0
)
goto
end
;
...
...
@@ -508,6 +509,7 @@ int dtls1_accept(SSL *s)
case
SSL3_ST_SR_FINISHED_A
:
case
SSL3_ST_SR_FINISHED_B
:
s
->
d1
->
change_cipher_spec_ok
=
1
;
ret
=
ssl3_get_finished
(
s
,
SSL3_ST_SR_FINISHED_A
,
SSL3_ST_SR_FINISHED_B
);
if
(
ret
<=
0
)
goto
end
;
...
...
ssl/dtls1.h
浏览文件 @
58f41a92
...
...
@@ -231,6 +231,7 @@ typedef struct dtls1_state_st
unsigned
int
handshake_fragment_len
;
unsigned
int
retransmitting
;
unsigned
int
change_cipher_spec_ok
;
}
DTLS1_STATE
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录