Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
e6f3c585
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看板
提交
e6f3c585
编写于
25年前
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
New {i2d,d2i}_PrivateKey_{bio, fp} functions.
上级
b96eb06f
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
89 addition
and
2 deletion
+89
-2
CHANGES
CHANGES
+5
-1
crypto/asn1/asn1.h
crypto/asn1/asn1.h
+2
-0
crypto/asn1/asn1_err.c
crypto/asn1/asn1_err.c
+2
-0
crypto/x509/x509.h
crypto/x509/x509.h
+5
-1
crypto/x509/x_all.c
crypto/x509/x_all.c
+71
-0
util/libeay.num
util/libeay.num
+4
-0
未找到文件。
CHANGES
浏览文件 @
e6f3c585
...
...
@@ -4,9 +4,13 @@
Changes between 0.9.4 and 0.9.5 [xx XXX 1999]
*) Add d2i,i2d bio/fp functions for PrivateKey: these convert the
traditional format into an EVP_PKEY structure.
[Steve Henson]
*) Add a password callback function PEM_cb() which either prompts for
a password if usr_data is NULL or otherwise assumes it is a null
terminate password. Allow passwords to be passed on command line
terminate
d
password. Allow passwords to be passed on command line
environment or config files in a few more utilities.
[Steve Henson]
...
...
This diff is collapsed.
Click to expand it.
crypto/asn1/asn1.h
浏览文件 @
e6f3c585
...
...
@@ -890,6 +890,8 @@ void ASN1_STRING_TABLE_cleanup(void);
#define ASN1_F_D2I_POLICYINFO 269
#define ASN1_F_D2I_POLICYQUALINFO 270
#define ASN1_F_D2I_PRIVATEKEY 155
#define ASN1_F_D2I_PRIVATEKEY_BIO 293
#define ASN1_F_D2I_PRIVATEKEY_FP 294
#define ASN1_F_D2I_PUBLICKEY 156
#define ASN1_F_D2I_RSAPRIVATEKEY 157
#define ASN1_F_D2I_RSAPUBLICKEY 158
...
...
This diff is collapsed.
Click to expand it.
crypto/asn1/asn1_err.c
浏览文件 @
e6f3c585
...
...
@@ -163,6 +163,8 @@ static ERR_STRING_DATA ASN1_str_functs[]=
{
ERR_PACK
(
0
,
ASN1_F_D2I_POLICYINFO
,
0
),
"d2i_POLICYINFO"
},
{
ERR_PACK
(
0
,
ASN1_F_D2I_POLICYQUALINFO
,
0
),
"d2i_POLICYQUALINFO"
},
{
ERR_PACK
(
0
,
ASN1_F_D2I_PRIVATEKEY
,
0
),
"d2i_PrivateKey"
},
{
ERR_PACK
(
0
,
ASN1_F_D2I_PRIVATEKEY_BIO
,
0
),
"d2i_PrivateKey_bio"
},
{
ERR_PACK
(
0
,
ASN1_F_D2I_PRIVATEKEY_FP
,
0
),
"d2i_PrivateKey_fp"
},
{
ERR_PACK
(
0
,
ASN1_F_D2I_PUBLICKEY
,
0
),
"d2i_PublicKey"
},
{
ERR_PACK
(
0
,
ASN1_F_D2I_RSAPRIVATEKEY
,
0
),
"d2i_RSAPrivateKey"
},
{
ERR_PACK
(
0
,
ASN1_F_D2I_RSAPUBLICKEY
,
0
),
"d2i_RSAPublicKey"
},
...
...
This diff is collapsed.
Click to expand it.
crypto/x509/x509.h
浏览文件 @
e6f3c585
...
...
@@ -658,13 +658,15 @@ DSA *d2i_DSA_PUBKEY_fp(FILE *fp, DSA **dsa);
int
i2d_DSA_PUBKEY_fp
(
FILE
*
fp
,
DSA
*
dsa
);
DSA
*
d2i_DSAPrivateKey_fp
(
FILE
*
fp
,
DSA
**
dsa
);
int
i2d_DSAPrivateKey_fp
(
FILE
*
fp
,
DSA
*
dsa
);
#endif
X509_SIG
*
d2i_PKCS8_fp
(
FILE
*
fp
,
X509_SIG
**
p8
);
int
i2d_PKCS8_fp
(
FILE
*
fp
,
X509_SIG
*
p8
);
PKCS8_PRIV_KEY_INFO
*
d2i_PKCS8_PRIV_KEY_INFO_fp
(
FILE
*
fp
,
PKCS8_PRIV_KEY_INFO
**
p8inf
);
int
i2d_PKCS8_PRIV_KEY_INFO_fp
(
FILE
*
fp
,
PKCS8_PRIV_KEY_INFO
*
p8inf
);
int
i2d_PKCS8PrivateKeyInfo_fp
(
FILE
*
fp
,
EVP_PKEY
*
key
);
#endif
int
i2d_PrivateKey_fp
(
FILE
*
fp
,
EVP_PKEY
*
pkey
);
EVP_PKEY
*
d2i_PrivateKey_fp
(
FILE
*
fp
,
int
type
,
EVP_PKEY
**
a
);
#endif
#ifdef HEADER_BIO_H
...
...
@@ -694,6 +696,8 @@ PKCS8_PRIV_KEY_INFO *d2i_PKCS8_PRIV_KEY_INFO_bio(BIO *bp,
PKCS8_PRIV_KEY_INFO
**
p8inf
);
int
i2d_PKCS8_PRIV_KEY_INFO_bio
(
BIO
*
bp
,
PKCS8_PRIV_KEY_INFO
*
p8inf
);
int
i2d_PKCS8PrivateKeyInfo_bio
(
BIO
*
bp
,
EVP_PKEY
*
key
);
int
i2d_PrivateKey_bio
(
BIO
*
bp
,
EVP_PKEY
*
pkey
);
EVP_PKEY
*
d2i_PrivateKey_bio
(
BIO
*
bp
,
int
type
,
EVP_PKEY
**
a
);
#endif
X509
*
X509_dup
(
X509
*
x509
);
...
...
This diff is collapsed.
Click to expand it.
crypto/x509/x_all.c
浏览文件 @
e6f3c585
...
...
@@ -481,6 +481,24 @@ int i2d_PKCS8PrivateKeyInfo_fp(FILE *fp, EVP_PKEY *key)
return
ret
;
}
int
i2d_PrivateKey_fp
(
FILE
*
fp
,
EVP_PKEY
*
pkey
)
{
return
(
ASN1_i2d_fp
(
i2d_PrivateKey
,
fp
,(
unsigned
char
*
)
pkey
));
}
EVP_PKEY
*
d2i_PrivateKey_fp
(
FILE
*
fp
,
int
type
,
EVP_PKEY
**
a
)
{
BIO
*
bp
;
EVP_PKEY
*
ret
;
if
(
!
(
bp
=
BIO_new_fp
(
fp
,
BIO_NOCLOSE
)))
{
ASN1err
(
ASN1_F_D2I_PRIVATEKEY_FP
,
ERR_R_MALLOC_FAILURE
);
return
NULL
;
}
ret
=
d2i_PrivateKey_bio
(
bp
,
type
,
a
);
BIO_free
(
bp
);
return
ret
;
}
#endif
PKCS8_PRIV_KEY_INFO
*
d2i_PKCS8_PRIV_KEY_INFO_bio
(
BIO
*
bp
,
...
...
@@ -507,3 +525,56 @@ int i2d_PKCS8PrivateKeyInfo_bio(BIO *bp, EVP_PKEY *key)
PKCS8_PRIV_KEY_INFO_free
(
p8inf
);
return
ret
;
}
int
i2d_PrivateKey_bio
(
BIO
*
bp
,
EVP_PKEY
*
pkey
)
{
return
(
ASN1_i2d_bio
(
i2d_PrivateKey
,
bp
,(
unsigned
char
*
)
pkey
));
}
EVP_PKEY
*
d2i_PrivateKey_bio
(
BIO
*
bp
,
int
type
,
EVP_PKEY
**
a
)
{
EVP_PKEY
*
ret
;
if
((
a
==
NULL
)
||
(
*
a
==
NULL
))
{
if
((
ret
=
EVP_PKEY_new
())
==
NULL
)
{
ASN1err
(
ASN1_F_D2I_PRIVATEKEY_BIO
,
ERR_R_EVP_LIB
);
return
(
NULL
);
}
}
else
ret
=
*
a
;
ret
->
save_type
=
type
;
ret
->
type
=
EVP_PKEY_type
(
type
);
switch
(
ret
->
type
)
{
#ifndef NO_RSA
case
EVP_PKEY_RSA
:
if
((
ret
->
pkey
.
rsa
=
d2i_RSAPrivateKey_bio
(
bp
,
NULL
))
==
NULL
)
{
ASN1err
(
ASN1_F_D2I_PRIVATEKEY_BIO
,
ERR_R_ASN1_LIB
);
goto
err
;
}
break
;
#endif
#ifndef NO_DSA
case
EVP_PKEY_DSA
:
if
((
ret
->
pkey
.
dsa
=
d2i_DSAPrivateKey_bio
(
bp
,
NULL
))
==
NULL
)
{
ASN1err
(
ASN1_F_D2I_PRIVATEKEY_BIO
,
ERR_R_ASN1_LIB
);
goto
err
;
}
break
;
#endif
default:
ASN1err
(
ASN1_F_D2I_PRIVATEKEY_BIO
,
ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE
);
goto
err
;
/* break; */
}
if
(
a
!=
NULL
)
(
*
a
)
=
ret
;
return
(
ret
);
err:
if
((
ret
!=
NULL
)
&&
((
a
==
NULL
)
||
(
*
a
!=
ret
)))
EVP_PKEY_free
(
ret
);
return
(
NULL
);
}
This diff is collapsed.
Click to expand it.
util/libeay.num
浏览文件 @
e6f3c585
...
...
@@ -2152,3 +2152,7 @@ i2d_PKCS8PrivateKey_nid_bio 2176
i2d_PKCS8PrivateKeyInfo_fp 2177
i2d_PKCS8PrivateKeyInfo_bio 2178
PEM_cb 2179
i2d_PrivateKey_fp 2180
d2i_PrivateKey_bio 2181
d2i_PrivateKey_fp 2182
i2d_PrivateKey_bio 2183
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
新手
引导
客服
返回
顶部