Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
btwise
openssl
提交
eda3766b
O
openssl
项目概览
btwise
/
openssl
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
openssl
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
eda3766b
编写于
5月 30, 2011
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Output supported curves in preference order instead of numerically.
上级
62b6c5c4
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
43 addition
and
5 deletion
+43
-5
CHANGES
CHANGES
+5
-0
ssl/t1_lib.c
ssl/t1_lib.c
+38
-5
未找到文件。
CHANGES
浏览文件 @
eda3766b
...
...
@@ -4,6 +4,11 @@
Changes between 1.0.1 and 1.1.0 [xx XXX xxxx]
*) Output TLS supported curves in preference order instead of numerical
order. This is currently hardcoded for the highest order curves first.
This should be configurable so applications can judge speed vs strength.
[Steve Henson]
*) Add protection against ECDSA timing attacks as mentioned in the paper
by Billy Bob Brumley and Nicola Tuveri, see:
...
...
ssl/t1_lib.c
浏览文件 @
eda3766b
...
...
@@ -170,6 +170,7 @@ void tls1_clear(SSL *s)
}
#ifndef OPENSSL_NO_EC
static
int
nid_list
[]
=
{
NID_sect163k1
,
/* sect163k1 (1) */
...
...
@@ -198,7 +199,36 @@ static int nid_list[] =
NID_secp384r1
,
/* secp384r1 (24) */
NID_secp521r1
/* secp521r1 (25) */
};
static
int
pref_list
[]
=
{
NID_sect571r1
,
/* sect571r1 (14) */
NID_sect571k1
,
/* sect571k1 (13) */
NID_secp521r1
,
/* secp521r1 (25) */
NID_sect409k1
,
/* sect409k1 (11) */
NID_sect409r1
,
/* sect409r1 (12) */
NID_secp384r1
,
/* secp384r1 (24) */
NID_sect283k1
,
/* sect283k1 (9) */
NID_sect283r1
,
/* sect283r1 (10) */
NID_secp256k1
,
/* secp256k1 (22) */
NID_X9_62_prime256v1
,
/* secp256r1 (23) */
NID_sect239k1
,
/* sect239k1 (8) */
NID_sect233k1
,
/* sect233k1 (6) */
NID_sect233r1
,
/* sect233r1 (7) */
NID_secp224k1
,
/* secp224k1 (20) */
NID_secp224r1
,
/* secp224r1 (21) */
NID_sect193r1
,
/* sect193r1 (4) */
NID_sect193r2
,
/* sect193r2 (5) */
NID_secp192k1
,
/* secp192k1 (18) */
NID_X9_62_prime192v1
,
/* secp192r1 (19) */
NID_sect163k1
,
/* sect163k1 (1) */
NID_sect163r1
,
/* sect163r1 (2) */
NID_sect163r2
,
/* sect163r2 (3) */
NID_secp160k1
,
/* secp160k1 (15) */
NID_secp160r1
,
/* secp160r1 (16) */
NID_secp160r2
,
/* secp160r2 (17) */
};
int
tls1_ec_curve_id2nid
(
int
curve_id
)
{
/* ECC curves from draft-ietf-tls-ecc-12.txt (Oct. 17, 2005) */
...
...
@@ -1487,16 +1517,19 @@ int ssl_prepare_clienthello_tlsext(SSL *s)
/* we support all named elliptic curves in draft-ietf-tls-ecc-12 */
if
(
s
->
tlsext_ellipticcurvelist
!=
NULL
)
OPENSSL_free
(
s
->
tlsext_ellipticcurvelist
);
s
->
tlsext_ellipticcurvelist_length
=
sizeof
(
nid_list
)
/
sizeof
(
nid
_list
[
0
])
*
2
;
s
->
tlsext_ellipticcurvelist_length
=
sizeof
(
pref_list
)
/
sizeof
(
pref
_list
[
0
])
*
2
;
if
((
s
->
tlsext_ellipticcurvelist
=
OPENSSL_malloc
(
s
->
tlsext_ellipticcurvelist_length
))
==
NULL
)
{
s
->
tlsext_ellipticcurvelist_length
=
0
;
SSLerr
(
SSL_F_SSL_PREPARE_CLIENTHELLO_TLSEXT
,
ERR_R_MALLOC_FAILURE
);
return
-
1
;
}
for
(
i
=
1
,
j
=
s
->
tlsext_ellipticcurvelist
;
(
unsigned
int
)
i
<=
sizeof
(
nid_list
)
/
sizeof
(
nid_list
[
0
]);
i
++
)
s2n
(
i
,
j
);
for
(
i
=
0
,
j
=
s
->
tlsext_ellipticcurvelist
;
(
unsigned
int
)
i
<
sizeof
(
pref_list
)
/
sizeof
(
pref_list
[
0
]);
i
++
)
{
int
id
=
tls1_ec_nid2curve_id
(
pref_list
[
i
]);
s2n
(
id
,
j
);
}
}
#endif
/* OPENSSL_NO_EC */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录