Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
5488bb61
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 搜索 >>
提交
5488bb61
编写于
8月 12, 2002
作者:
B
Bodo Möller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
get rid of EVP_PKEY_ECDSA (now we have EVP_PKEY_EC instead)
Submitted by: Nils Larsch
上级
8e28c671
变更
14
隐藏空白更改
内联
并排
Showing
14 changed file
with
46 addition
and
45 deletion
+46
-45
apps/ca.c
apps/ca.c
+2
-2
apps/req.c
apps/req.c
+3
-2
apps/speed.c
apps/speed.c
+8
-4
apps/x509.c
apps/x509.c
+3
-3
crypto/evp/evp.h
crypto/evp/evp.h
+3
-4
crypto/evp/evp_pkey.c
crypto/evp/evp_pkey.c
+7
-7
crypto/evp/p_lib.c
crypto/evp/p_lib.c
+3
-3
crypto/pem/pem_pkey.c
crypto/pem/pem_pkey.c
+1
-1
crypto/pkcs7/pk7_doit.c
crypto/pkcs7/pk7_doit.c
+2
-2
crypto/pkcs7/pk7_lib.c
crypto/pkcs7/pk7_lib.c
+2
-2
crypto/x509/x509type.c
crypto/x509/x509type.c
+4
-4
ssl/s3_both.c
ssl/s3_both.c
+2
-5
ssl/s3_clnt.c
ssl/s3_clnt.c
+3
-3
ssl/s3_srvr.c
ssl/s3_srvr.c
+3
-3
未找到文件。
apps/ca.c
浏览文件 @
5488bb61
...
...
@@ -1515,7 +1515,7 @@ bad:
else
#endif
#ifndef OPENSSL_NO_ECDSA
if
(
pkey
->
type
==
EVP_PKEY_EC
DSA
)
if
(
pkey
->
type
==
EVP_PKEY_EC
)
dgst
=
EVP_ecdsa
();
else
#endif
...
...
@@ -2293,7 +2293,7 @@ again2:
EVP_PKEY_free
(
pktmp
);
#endif
#ifndef OPENSSL_NO_ECDSA
if
(
pkey
->
type
==
EVP_PKEY_EC
DSA
)
if
(
pkey
->
type
==
EVP_PKEY_EC
)
dgst
=
EVP_ecdsa
();
pktmp
=
X509_get_pubkey
(
ret
);
if
(
EVP_PKEY_missing_parameters
(
pktmp
)
&&
...
...
apps/req.c
浏览文件 @
5488bb61
...
...
@@ -682,7 +682,8 @@ bad:
message */
goto
end
;
}
if
(
EVP_PKEY_type
(
pkey
->
type
)
==
EVP_PKEY_DSA
||
EVP_PKEY_type
(
pkey
->
type
)
==
EVP_PKEY_ECDSA
)
if
(
EVP_PKEY_type
(
pkey
->
type
)
==
EVP_PKEY_DSA
||
EVP_PKEY_type
(
pkey
->
type
)
==
EVP_PKEY_EC
)
{
char
*
randfile
=
NCONF_get_string
(
req_conf
,
SECTION
,
"RANDFILE"
);
if
(
randfile
==
NULL
)
...
...
@@ -852,7 +853,7 @@ loop:
digest
=
EVP_dss1
();
#endif
#ifndef OPENSSL_NO_ECDSA
if
(
pkey
->
type
==
EVP_PKEY_EC
DSA
)
if
(
pkey
->
type
==
EVP_PKEY_EC
)
digest
=
EVP_ecdsa
();
#endif
if
(
req
==
NULL
)
...
...
apps/speed.c
浏览文件 @
5488bb61
...
...
@@ -1937,7 +1937,7 @@ int MAIN(int argc, char **argv)
{
/* Perform ECDSA signature test */
EC_KEY_generate_key
(
ecdsa
[
j
]);
ret
=
ECDSA_sign
(
EVP_PKEY_ECDSA
,
buf
,
20
,
ecdsasig
,
ret
=
ECDSA_sign
(
0
,
buf
,
20
,
ecdsasig
,
&
ecdsasiglen
,
ecdsa
[
j
]);
if
(
ret
==
0
)
{
...
...
@@ -1953,9 +1953,12 @@ int MAIN(int argc, char **argv)
ECDSA_SECONDS
);
Time_F
(
START
);
for
(
count
=
0
,
run
=
1
;
COND
(
ecdsa_c
[
j
][
0
]);
count
++
)
for
(
count
=
0
,
run
=
1
;
COND
(
ecdsa_c
[
j
][
0
]);
count
++
)
{
ret
=
ECDSA_sign
(
EVP_PKEY_ECDSA
,
buf
,
20
,
ecdsasig
,
&
ecdsasiglen
,
ecdsa
[
j
]);
ret
=
ECDSA_sign
(
0
,
buf
,
20
,
ecdsasig
,
&
ecdsasiglen
,
ecdsa
[
j
]);
if
(
ret
==
0
)
{
BIO_printf
(
bio_err
,
"ECDSA sign failure
\n
"
);
...
...
@@ -1974,7 +1977,8 @@ int MAIN(int argc, char **argv)
}
/* Perform ECDSA verification test */
ret
=
ECDSA_verify
(
EVP_PKEY_ECDSA
,
buf
,
20
,
ecdsasig
,
ecdsasiglen
,
ecdsa
[
j
]);
ret
=
ECDSA_verify
(
0
,
buf
,
20
,
ecdsasig
,
ecdsasiglen
,
ecdsa
[
j
]);
if
(
ret
!=
1
)
{
BIO_printf
(
bio_err
,
"ECDSA verify failure. No ECDSA verify will be done.
\n
"
);
...
...
apps/x509.c
浏览文件 @
5488bb61
...
...
@@ -870,7 +870,7 @@ bad:
digest
=
EVP_dss1
();
#endif
#ifndef OPENSSL_NO_ECDSA
if
(
Upkey
->
type
==
EVP_PKEY_EC
DSA
)
if
(
Upkey
->
type
==
EVP_PKEY_EC
)
digest
=
EVP_ecdsa
();
#endif
...
...
@@ -894,7 +894,7 @@ bad:
digest
=
EVP_dss1
();
#endif
#ifndef OPENSSL_NO_ECDSA
if
(
CApkey
->
type
==
EVP_PKEY_EC
DSA
)
if
(
CApkey
->
type
==
EVP_PKEY_EC
)
digest
=
EVP_ecdsa
();
#endif
...
...
@@ -929,7 +929,7 @@ bad:
digest
=
EVP_dss1
();
#endif
#ifndef OPENSSL_NO_ECDSA
if
(
pk
->
type
==
EVP_PKEY_EC
DSA
)
if
(
pk
->
type
==
EVP_PKEY_EC
)
digest
=
EVP_ecdsa
();
#endif
...
...
crypto/evp/evp.h
浏览文件 @
5488bb61
...
...
@@ -150,13 +150,13 @@
#define EVP_PK_RSA 0x0001
#define EVP_PK_DSA 0x0002
#define EVP_PK_DH 0x0004
#define EVP_PK_EC
DSA
0x0008
#define EVP_PK_EC 0x0008
#define EVP_PKT_SIGN 0x0010
#define EVP_PKT_ENC 0x0020
#define EVP_PKT_EXCH 0x0040
#define EVP_PKS_RSA 0x0100
#define EVP_PKS_DSA 0x0200
#define EVP_PKS_EC
DSA
0x0400
#define EVP_PKS_EC 0x0400
#define EVP_PKT_EXP 0x1000
/* <= 512 bit key */
#define EVP_PKEY_NONE NID_undef
...
...
@@ -169,7 +169,6 @@
#define EVP_PKEY_DSA4 NID_dsaWithSHA1_2
#define EVP_PKEY_DH NID_dhKeyAgreement
#define EVP_PKEY_EC NID_X9_62_id_ecPublicKey
#define EVP_PKEY_ECDSA EVP_PKEY_EC
#ifdef __cplusplus
extern
"C"
{
...
...
@@ -310,7 +309,7 @@ struct env_md_st
#ifndef OPENSSL_NO_ECDSA
#define EVP_PKEY_ECDSA_method ECDSA_sign,ECDSA_verify, \
{EVP_PKEY_EC
DSA
,0,0,0}
{EVP_PKEY_EC,0,0,0}
#else
#define EVP_PKEY_ECDSA_method EVP_PKEY_NULL_method
#endif
...
...
crypto/evp/evp_pkey.c
浏览文件 @
5488bb61
...
...
@@ -83,7 +83,7 @@ EVP_PKEY *EVP_PKCS82PKEY (PKCS8_PRIV_KEY_INFO *p8)
#ifndef OPENSSL_NO_EC
EC_KEY
*
eckey
=
NULL
;
#endif
#if !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_EC
DSA
)
#if !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_EC)
ASN1_INTEGER
*
privkey
;
ASN1_TYPE
*
t1
,
*
t2
,
*
param
=
NULL
;
STACK_OF
(
ASN1_TYPE
)
*
n_stack
=
NULL
;
...
...
@@ -124,7 +124,7 @@ EVP_PKEY *EVP_PKCS82PKEY (PKCS8_PRIV_KEY_INFO *p8)
EVP_PKEY_assign_RSA
(
pkey
,
rsa
);
break
;
#endif
#if !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_EC
DSA
)
#if !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_EC)
case
NID_ecdsa_with_SHA1
:
case
NID_dsa
:
/* PKCS#8 DSA/ECDSA is weird: you just get a private key integer
...
...
@@ -235,7 +235,7 @@ EVP_PKEY *EVP_PKCS82PKEY (PKCS8_PRIV_KEY_INFO *p8)
}
else
/* nid == NID_ecdsa_with_SHA1 */
{
#ifndef OPENSSL_NO_EC
DSA
#ifndef OPENSSL_NO_EC
if
((
eckey
=
d2i_ECParameters
(
NULL
,
&
cp
,
plen
))
==
NULL
)
{
...
...
@@ -350,8 +350,8 @@ PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8_broken(EVP_PKEY *pkey, int broken)
break
;
#endif
#ifndef OPENSSL_NO_EC
DSA
case
EVP_PKEY_EC
DSA
:
#ifndef OPENSSL_NO_EC
case
EVP_PKEY_EC
:
if
(
!
eckey_pkey2pkcs8
(
p8
,
pkey
))
{
PKCS8_PRIV_KEY_INFO_free
(
p8
);
...
...
@@ -529,7 +529,7 @@ static int eckey_pkey2pkcs8(PKCS8_PRIV_KEY_INFO *p8, EVP_PKEY *pkey)
q
=
p
;
if
(
!
i2d_ECParameters
(
pkey
->
pkey
.
eckey
,
&
q
))
{
EVPerr
(
EVP_F_EC_KEY_PKEY2PKCS8
,
ERR_R_EC
DSA
_LIB
);
EVPerr
(
EVP_F_EC_KEY_PKEY2PKCS8
,
ERR_R_EC_LIB
);
OPENSSL_free
(
p
);
return
0
;
}
...
...
@@ -703,7 +703,7 @@ static int eckey_pkey2pkcs8(PKCS8_PRIV_KEY_INFO *p8, EVP_PKEY *pkey)
&
p8
->
pkey
->
value
.
octet_string
->
data
,
&
p8
->
pkey
->
value
.
octet_string
->
length
))
{
EVPerr
(
EVP_F_EC
DSA
_PKEY2PKCS8
,
ERR_R_MALLOC_FAILURE
);
EVPerr
(
EVP_F_EC
_KEY
_PKEY2PKCS8
,
ERR_R_MALLOC_FAILURE
);
sk_ASN1_TYPE_pop_free
(
neckey
,
ASN1_TYPE_free
);
return
0
;
}
...
...
crypto/evp/p_lib.c
浏览文件 @
5488bb61
...
...
@@ -137,8 +137,8 @@ int EVP_PKEY_save_parameters(EVP_PKEY *pkey, int mode)
return
(
ret
);
}
#endif
#ifndef OPENSSL_NO_EC
DSA
if
(
pkey
->
type
==
EVP_PKEY_EC
DSA
)
#ifndef OPENSSL_NO_EC
if
(
pkey
->
type
==
EVP_PKEY_EC
)
{
int
ret
=
pkey
->
save_parameters
;
...
...
@@ -182,7 +182,7 @@ int EVP_PKEY_copy_parameters(EVP_PKEY *to, EVP_PKEY *from)
}
#endif
#ifndef OPENSSL_NO_EC
if
(
to
->
type
==
EVP_PKEY_EC
DSA
)
if
(
to
->
type
==
EVP_PKEY_EC
)
{
if
(
to
->
pkey
.
eckey
->
group
!=
NULL
)
EC_GROUP_free
(
to
->
pkey
.
eckey
->
group
);
...
...
crypto/pem/pem_pkey.c
浏览文件 @
5488bb61
...
...
@@ -83,7 +83,7 @@ EVP_PKEY *PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, vo
else
if
(
strcmp
(
nm
,
PEM_STRING_DSA
)
==
0
)
ret
=
d2i_PrivateKey
(
EVP_PKEY_DSA
,
x
,
&
p
,
len
);
else
if
(
strcmp
(
nm
,
PEM_STRING_ECPRIVATEKEY
)
==
0
)
ret
=
d2i_PrivateKey
(
EVP_PKEY_EC
DSA
,
x
,
&
p
,
len
);
ret
=
d2i_PrivateKey
(
EVP_PKEY_EC
,
x
,
&
p
,
len
);
else
if
(
strcmp
(
nm
,
PEM_STRING_PKCS8INF
)
==
0
)
{
PKCS8_PRIV_KEY_INFO
*
p8inf
;
p8inf
=
d2i_PKCS8_PRIV_KEY_INFO
(
NULL
,
&
p
,
len
);
...
...
crypto/pkcs7/pk7_doit.c
浏览文件 @
5488bb61
...
...
@@ -629,7 +629,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
ctx_tmp
.
digest
=
EVP_dss1
();
#endif
#ifndef OPENSSL_NO_ECDSA
if
(
si
->
pkey
->
type
==
EVP_PKEY_EC
DSA
)
if
(
si
->
pkey
->
type
==
EVP_PKEY_EC
)
ctx_tmp
.
digest
=
EVP_ecdsa
();
#endif
...
...
@@ -830,7 +830,7 @@ for (ii=0; ii<md_len; ii++) printf("%02X",md_dat[ii]); printf(" calc\n");
if
(
pkey
->
type
==
EVP_PKEY_DSA
)
mdc_tmp
.
digest
=
EVP_dss1
();
#endif
#ifndef OPENSSL_NO_ECDSA
if
(
pkey
->
type
==
EVP_PKEY_EC
DSA
)
mdc_tmp
.
digest
=
EVP_ecdsa
();
if
(
pkey
->
type
==
EVP_PKEY_EC
)
mdc_tmp
.
digest
=
EVP_ecdsa
();
#endif
i
=
EVP_VerifyFinal
(
&
mdc_tmp
,
os
->
data
,
os
->
length
,
pkey
);
...
...
crypto/pkcs7/pk7_lib.c
浏览文件 @
5488bb61
...
...
@@ -310,7 +310,7 @@ int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
int
nid
;
char
is_dsa
;
if
(
pkey
->
type
==
EVP_PKEY_DSA
||
pkey
->
type
==
EVP_PKEY_EC
DSA
)
if
(
pkey
->
type
==
EVP_PKEY_DSA
||
pkey
->
type
==
EVP_PKEY_EC
)
is_dsa
=
1
;
else
is_dsa
=
0
;
...
...
@@ -363,7 +363,7 @@ int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
#endif
p7i
->
digest_enc_alg
->
parameter
=
NULL
;
/* special case for DSA: omit 'parameter'! */
}
else
if
(
nid
==
EVP_PKEY_EC
DSA
)
else
if
(
nid
==
EVP_PKEY_EC
)
{
p7i
->
digest_enc_alg
->
algorithm
=
OBJ_nid2obj
(
NID_ecdsa_with_SHA1
);
if
(
!
(
p7i
->
digest_enc_alg
->
parameter
=
ASN1_TYPE_new
()))
...
...
crypto/x509/x509type.c
浏览文件 @
5488bb61
...
...
@@ -86,8 +86,8 @@ int X509_certificate_type(X509 *x, EVP_PKEY *pkey)
case
EVP_PKEY_DSA
:
ret
=
EVP_PK_DSA
|
EVP_PKT_SIGN
;
break
;
case
EVP_PKEY_EC
DSA
:
ret
=
EVP_PK_EC
DSA
|
EVP_PKT_SIGN
;
case
EVP_PKEY_EC
:
ret
=
EVP_PK_EC
|
EVP_PKT_SIGN
|
EVP_PKT_EXCH
;
break
;
case
EVP_PKEY_DH
:
ret
=
EVP_PK_DH
|
EVP_PKT_EXCH
;
...
...
@@ -105,8 +105,8 @@ int X509_certificate_type(X509 *x, EVP_PKEY *pkey)
case
EVP_PKS_DSA
:
ret
|=
EVP_PKS_DSA
;
break
;
case
EVP_PKS_EC
DSA
:
ret
|=
EVP_PKS_EC
DSA
;
case
EVP_PKS_EC
:
ret
|=
EVP_PKS_EC
;
break
;
default:
break
;
...
...
ssl/s3_both.c
浏览文件 @
5488bb61
...
...
@@ -526,10 +526,7 @@ int ssl_cert_type(X509 *x, EVP_PKEY *pkey)
}
}
#ifndef OPENSSL_NO_EC
/* XXX: Structurally, there is no distinction between
* ECDSA and ECDH public keys (both are ECPoints).
* So EVP_PKEY_ECDSA should really be renamed EVP_PKEY_ECC
* (or similar). As for ECC certificates, additional
/* As for ECC certificates, additional
* information (e.g. in the optional key usage X509v3
* extension) could be used when available to distinguish
* between ECDH and ECDSA certificates. For now, we do not
...
...
@@ -537,7 +534,7 @@ int ssl_cert_type(X509 *x, EVP_PKEY *pkey)
* of checking for appropriate key usage to the SSL code
* responsible for sending/processing ECC certificates.
*/
else
if
(
i
==
EVP_PKEY_EC
DSA
)
else
if
(
i
==
EVP_PKEY_EC
)
{
ret
=
SSL_PKEY_ECC
;
}
...
...
ssl/s3_clnt.c
浏览文件 @
5488bb61
...
...
@@ -1349,7 +1349,7 @@ static int ssl3_get_key_exchange(SSL *s)
else
#endif
#ifndef OPENSSL_NO_ECDSA
if
(
pkey
->
type
==
EVP_PKEY_EC
DSA
)
if
(
pkey
->
type
==
EVP_PKEY_EC
)
{
/* let's do ECDSA */
EVP_VerifyInit_ex
(
&
md_ctx
,
EVP_ecdsa
(),
NULL
);
...
...
@@ -1907,7 +1907,7 @@ static int ssl3_send_client_key_exchange(SSL *s)
srvr_pub_pkey
=
X509_get_pubkey
(
s
->
session
->
\
sess_cert
->
peer_pkeys
[
SSL_PKEY_ECC
].
x509
);
if
((
srvr_pub_pkey
==
NULL
)
||
(
srvr_pub_pkey
->
type
!=
EVP_PKEY_EC
DSA
)
||
(
srvr_pub_pkey
->
type
!=
EVP_PKEY_EC
)
||
(
srvr_pub_pkey
->
pkey
.
eckey
==
NULL
))
{
SSLerr
(
SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE
,
...
...
@@ -2118,7 +2118,7 @@ static int ssl3_send_client_verify(SSL *s)
else
#endif
#ifndef OPENSSL_NO_ECDSA
if
(
pkey
->
type
==
EVP_PKEY_EC
DSA
)
if
(
pkey
->
type
==
EVP_PKEY_EC
)
{
if
(
!
ECDSA_sign
(
pkey
->
save_type
,
&
(
data
[
MD5_DIGEST_LENGTH
]),
...
...
ssl/s3_srvr.c
浏览文件 @
5488bb61
...
...
@@ -1446,7 +1446,7 @@ static int ssl3_send_server_key_exchange(SSL *s)
else
#endif
#if !defined(OPENSSL_NO_ECDSA)
if
(
pkey
->
type
==
EVP_PKEY_EC
DSA
)
if
(
pkey
->
type
==
EVP_PKEY_EC
)
{
/* let's do ECDSA */
EVP_SignInit_ex
(
&
md_ctx
,
EVP_ecdsa
(),
NULL
);
...
...
@@ -2001,7 +2001,7 @@ static int ssl3_get_client_key_exchange(SSL *s)
}
if
(((
clnt_pub_pkey
=
X509_get_pubkey
(
s
->
session
->
peer
))
==
NULL
)
||
(
clnt_pub_pkey
->
type
!=
EVP_PKEY_EC
DSA
))
(
clnt_pub_pkey
->
type
!=
EVP_PKEY_EC
))
{
/* XXX: For now, we do not support client
* authentication using ECDH certificates
...
...
@@ -2228,7 +2228,7 @@ static int ssl3_get_cert_verify(SSL *s)
else
#endif
#ifndef OPENSSL_NO_ECDSA
if
(
pkey
->
type
==
EVP_PKEY_EC
DSA
)
if
(
pkey
->
type
==
EVP_PKEY_EC
)
{
j
=
ECDSA_verify
(
pkey
->
save_type
,
&
(
s
->
s3
->
tmp
.
cert_verify_md
[
MD5_DIGEST_LENGTH
]),
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录