Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
076944d9
T
Third Party Openssl
项目概览
OpenHarmony
/
Third Party Openssl
接近 2 年 前同步成功
通知
12
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看板
提交
076944d9
编写于
6月 15, 2006
作者:
B
Bodo Möller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix algorithm handling for ECC ciphersuites: Adapt to recent changes,
and allow more general RSA OIDs for ECC certs with RSA CA sig.
上级
09e20e0b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
25 addition
and
16 deletion
+25
-16
ssl/s3_lib.c
ssl/s3_lib.c
+3
-3
ssl/ssl_lib.c
ssl/ssl_lib.c
+22
-13
未找到文件。
ssl/s3_lib.c
浏览文件 @
076944d9
...
...
@@ -2309,7 +2309,7 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
#ifndef OPENSSL_NO_EC
if
(
/* if we are considering an ECC cipher suite that uses our certificate */
(
alg
&
SSL_aECDSA
)
(
alg
&
SSL_aECDSA
||
alg
&
SSL_aECDH
)
/* and we have an ECC certificate */
&&
(
s
->
cert
->
pkeys
[
SSL_PKEY_ECC
].
x509
!=
NULL
)
/* and the client specified a Supported Point Formats extension */
...
...
@@ -2361,7 +2361,7 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
}
if
(
/* if we are considering an ECC cipher suite that uses our certificate */
(
alg
&
SSL_aECDSA
)
(
alg
&
SSL_aECDSA
||
alg
&
SSL_aECDH
)
/* and we have an ECC certificate */
&&
(
s
->
cert
->
pkeys
[
SSL_PKEY_ECC
].
x509
!=
NULL
)
/* and the client specified an EllipticCurves extension */
...
...
@@ -2411,7 +2411,7 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
}
if
(
/* if we are considering an ECC cipher suite that uses an ephemeral EC key */
(
(
alg
&
SSL_kECDH
)
||
(
alg
&
SSL_kEECDH
)
)
(
alg
&
SSL_kEECDH
)
/* and we have an ephemeral EC key */
&&
(
s
->
cert
->
ecdh_tmp
!=
NULL
)
/* and the client specified an EllipticCurves extension */
...
...
ssl/ssl_lib.c
浏览文件 @
076944d9
...
...
@@ -1707,8 +1707,8 @@ void ssl_set_cert_masks(CERT *c, SSL_CIPHER *cipher)
emask
=
0
;
#ifdef CIPHER_DEBUG
printf
(
"rt=%d rte=%d dht=%d re=%d ree=%d rs=%d ds=%d dhr=%d dhd=%d
\n
"
,
rsa_tmp
,
rsa_tmp_export
,
dh_tmp
,
printf
(
"rt=%d rte=%d dht=%d
ecdht=%d
re=%d ree=%d rs=%d ds=%d dhr=%d dhd=%d
\n
"
,
rsa_tmp
,
rsa_tmp_export
,
dh_tmp
,
ec
dh_tmp
,
rsa_enc
,
rsa_enc_export
,
rsa_sign
,
dsa_sign
,
dh_rsa
,
dh_dsa
);
#endif
...
...
@@ -1780,14 +1780,20 @@ void ssl_set_cert_masks(CERT *c, SSL_CIPHER *cipher)
#ifndef OPENSSL_NO_ECDH
if
(
ecdh_ok
)
{
if
((
signature_nid
==
NID_md5WithRSAEncryption
)
||
(
signature_nid
==
NID_md4WithRSAEncryption
)
||
(
signature_nid
==
NID_md2WithRSAEncryption
))
const
char
*
sig
=
OBJ_nid2ln
(
signature_nid
);
if
(
sig
==
NULL
)
{
ERR_clear_error
();
sig
=
"unknown"
;
}
if
(
strstr
(
sig
,
"WithRSA"
))
{
mask
|=
SSL_kECDHr
|
SSL_aECDH
;
if
(
ecc_pkey_size
<=
163
)
emask
|=
SSL_kECDHr
|
SSL_aECDH
;
}
if
(
signature_nid
==
NID_ecdsa_with_SHA1
)
{
mask
|=
SSL_kECDHe
|
SSL_aECDH
;
...
...
@@ -1848,14 +1854,14 @@ int check_srvr_ecc_cert_and_alg(X509 *x, SSL_CIPHER *cs)
X509_check_purpose
(
x
,
-
1
,
0
);
if
((
x
->
sig_alg
)
&&
(
x
->
sig_alg
->
algorithm
))
signature_nid
=
OBJ_obj2nid
(
x
->
sig_alg
->
algorithm
);
if
(
alg
&
SSL_kECDH
)
if
(
alg
&
SSL_kECDH
e
||
alg
&
SSL_kECDHr
)
{
/* key usage, if present, must allow key agreement */
if
(
ku_reject
(
x
,
X509v3_KU_KEY_AGREEMENT
))
{
return
0
;
}
if
(
alg
&
SSL_
aECDSA
)
if
(
alg
&
SSL_
kECDHe
)
{
/* signature alg must be ECDSA */
if
(
signature_nid
!=
NID_ecdsa_with_SHA1
)
...
...
@@ -1863,18 +1869,21 @@ int check_srvr_ecc_cert_and_alg(X509 *x, SSL_CIPHER *cs)
return
0
;
}
}
if
(
alg
&
SSL_
aRSA
)
if
(
alg
&
SSL_
kECDHr
)
{
/* signature alg must be RSA */
if
((
signature_nid
!=
NID_md5WithRSAEncryption
)
&&
(
signature_nid
!=
NID_md4WithRSAEncryption
)
&&
(
signature_nid
!=
NID_md2WithRSAEncryption
)
)
const
char
*
sig
=
OBJ_nid2ln
(
signature_nid
);
if
(
sig
==
NULL
)
{
return
0
;
ERR_clear_error
();
sig
=
"unknown"
;
}
if
(
strstr
(
sig
,
"WithRSA"
)
==
NULL
)
return
0
;
}
}
else
if
(
alg
&
SSL_aECDSA
)
if
(
alg
&
SSL_aECDSA
)
{
/* key usage, if present, must allow signing */
if
(
ku_reject
(
x
,
X509v3_KU_DIGITAL_SIGNATURE
))
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录