Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
d736bc1a
T
Third Party Openssl
项目概览
OpenHarmony
/
Third Party Openssl
1 年多 前同步成功
通知
10
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看板
提交
d736bc1a
编写于
10月 04, 2016
作者:
M
Matt Caswell
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update misc function params in libssl for size_t
Reviewed-by:
N
Rich Salz
<
rsalz@openssl.org
>
上级
6db6bc5a
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
12 addition
and
11 deletion
+12
-11
ssl/ssl_locl.h
ssl/ssl_locl.h
+4
-4
ssl/statem/statem_clnt.c
ssl/statem/statem_clnt.c
+1
-1
ssl/statem/statem_dtls.c
ssl/statem/statem_dtls.c
+2
-2
ssl/t1_lib.c
ssl/t1_lib.c
+5
-4
未找到文件。
ssl/ssl_locl.h
浏览文件 @
d736bc1a
...
...
@@ -1934,8 +1934,8 @@ __owur long tls1_default_timeout(void);
__owur
int
dtls1_do_write
(
SSL
*
s
,
int
type
);
void
dtls1_set_message_header
(
SSL
*
s
,
unsigned
char
mt
,
unsigned
long
len
,
unsigned
long
frag_off
,
unsigned
long
frag_len
);
size_t
len
,
size_t
frag_off
,
size_t
frag_len
);
int
dtls1_write_app_data_bytes
(
SSL
*
s
,
int
type
,
const
void
*
buf_
,
size_t
len
,
size_t
*
written
);
...
...
@@ -2037,7 +2037,7 @@ __owur int ssl_prepare_serverhello_tlsext(SSL *s);
# ifndef OPENSSL_NO_HEARTBEATS
__owur
int
dtls1_heartbeat
(
SSL
*
s
);
__owur
int
dtls1_process_heartbeat
(
SSL
*
s
,
unsigned
char
*
p
,
unsigned
in
t
length
);
size_
t
length
);
# endif
__owur
int
tls_check_serverhello_tlsext_early
(
SSL
*
s
,
const
PACKET
*
ext
,
...
...
@@ -2077,7 +2077,7 @@ __owur int ssl_parse_clienthello_renegotiate_ext(SSL *s, PACKET *pkt, int *al);
__owur
long
ssl_get_algorithm2
(
SSL
*
s
);
__owur
int
tls12_copy_sigalgs
(
SSL
*
s
,
WPACKET
*
pkt
,
const
unsigned
char
*
psig
,
size_t
psiglen
);
__owur
int
tls1_save_sigalgs
(
SSL
*
s
,
const
unsigned
char
*
data
,
in
t
dsize
);
__owur
int
tls1_save_sigalgs
(
SSL
*
s
,
const
unsigned
char
*
data
,
size_
t
dsize
);
__owur
int
tls1_process_sigalgs
(
SSL
*
s
);
__owur
size_t
tls12_get_psigalgs
(
SSL
*
s
,
const
unsigned
char
**
psigs
);
__owur
int
tls12_check_peer_sigalg
(
const
EVP_MD
**
pmd
,
SSL
*
s
,
...
...
ssl/statem/statem_clnt.c
浏览文件 @
d736bc1a
...
...
@@ -1780,7 +1780,7 @@ MSG_PROCESS_RETURN tls_process_certificate_request(SSL *s, PACKET *pkt)
goto
err
;
}
memcpy
(
s
->
cert
->
ctypes
,
data
,
ctype_num
);
s
->
cert
->
ctype_num
=
(
size_t
)
ctype_num
;
s
->
cert
->
ctype_num
=
ctype_num
;
ctype_num
=
SSL3_CT_NUMBER
;
}
for
(
i
=
0
;
i
<
ctype_num
;
i
++
)
...
...
ssl/statem/statem_dtls.c
浏览文件 @
d736bc1a
...
...
@@ -1119,8 +1119,8 @@ int dtls1_retransmit_message(SSL *s, unsigned short seq, int *found)
}
void
dtls1_set_message_header
(
SSL
*
s
,
unsigned
char
mt
,
unsigned
long
len
,
unsigned
long
frag_off
,
unsigned
long
frag_len
)
unsigned
char
mt
,
size_t
len
,
size_t
frag_off
,
size_t
frag_len
)
{
if
(
frag_off
==
0
)
{
s
->
d1
->
handshake_write_seq
=
s
->
d1
->
next_handshake_write_seq
;
...
...
ssl/t1_lib.c
浏览文件 @
d736bc1a
...
...
@@ -20,7 +20,7 @@
#include "ssl_locl.h"
#include <openssl/ct.h>
static
int
tls_decrypt_ticket
(
SSL
*
s
,
const
unsigned
char
*
tick
,
in
t
ticklen
,
static
int
tls_decrypt_ticket
(
SSL
*
s
,
const
unsigned
char
*
tick
,
size_
t
ticklen
,
const
unsigned
char
*
sess_id
,
size_t
sesslen
,
SSL_SESSION
**
psess
);
static
int
ssl_check_clienthello_tlsext_early
(
SSL
*
s
);
...
...
@@ -2963,7 +2963,7 @@ int tls_check_serverhello_tlsext_early(SSL *s, const PACKET *ext,
* 4: same as 3, but the ticket needs to be renewed.
*/
static
int
tls_decrypt_ticket
(
SSL
*
s
,
const
unsigned
char
*
etick
,
in
t
eticklen
,
const
unsigned
char
*
sess_id
,
size_
t
eticklen
,
const
unsigned
char
*
sess_id
,
size_t
sesslen
,
SSL_SESSION
**
psess
)
{
SSL_SESSION
*
sess
;
...
...
@@ -3017,13 +3017,14 @@ static int tls_decrypt_ticket(SSL *s, const unsigned char *etick,
* Attempt to process session ticket, first conduct sanity and integrity
* checks on ticket.
*/
/* TODO(size_t) : convert me */
mlen
=
HMAC_size
(
hctx
);
if
(
mlen
<
0
)
{
goto
err
;
}
/* Sanity check ticket length: must exceed keyname + IV + HMAC */
if
(
eticklen
<=
TLSEXT_KEYNAME_LENGTH
+
EVP_CIPHER_CTX_iv_length
(
ctx
)
+
mlen
)
{
TLSEXT_KEYNAME_LENGTH
+
EVP_CIPHER_CTX_iv_length
(
ctx
)
+
(
size_t
)
mlen
)
{
ret
=
2
;
goto
err
;
}
...
...
@@ -3411,7 +3412,7 @@ static int tls1_set_shared_sigalgs(SSL *s)
/* Set preferred digest for each key type */
int
tls1_save_sigalgs
(
SSL
*
s
,
const
unsigned
char
*
data
,
in
t
dsize
)
int
tls1_save_sigalgs
(
SSL
*
s
,
const
unsigned
char
*
data
,
size_
t
dsize
)
{
CERT
*
c
=
s
->
cert
;
/* Extension ignored for inappropriate versions */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录