Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
2d681b77
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看板
提交
2d681b77
编写于
25年前
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix for bug in pkcs12 program and typo in ASN1_tag2str().
上级
3908cdf4
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
9 addition
and
4 deletion
+9
-4
CHANGES
CHANGES
+4
-0
apps/pkcs12.c
apps/pkcs12.c
+4
-3
crypto/asn1/asn1_par.c
crypto/asn1/asn1_par.c
+1
-1
未找到文件。
CHANGES
浏览文件 @
2d681b77
...
...
@@ -4,6 +4,10 @@
Changes between 0.9.4 and 0.9.5 [xx XXX 1999]
*) Fix for pkcs12 program. It was hashing an invalid certificate pointer
when producing the local key id.
[Richard Levitte <levitte@stacken.kth.se>]
*) New option -dhparam in s_server. This allows a DH parameter file to be
stated explicitly. If it is not stated then it tries the first server
certificate file. The previous behaviour hard coded the filename
...
...
This diff is collapsed.
Click to expand it.
apps/pkcs12.c
浏览文件 @
2d681b77
...
...
@@ -281,13 +281,13 @@ int MAIN(int argc, char **argv)
}
}
if
(
export_cert
)
{
if
(
export_cert
)
{
EVP_PKEY
*
key
;
STACK
*
bags
,
*
safes
;
PKCS12_SAFEBAG
*
bag
;
PKCS8_PRIV_KEY_INFO
*
p8
;
PKCS7
*
authsafe
;
X509
*
cert
=
NULL
,
*
ucert
=
NULL
;
X509
*
ucert
=
NULL
;
STACK_OF
(
X509
)
*
certs
;
char
*
catmp
;
int
i
;
...
...
@@ -313,7 +313,7 @@ if (export_cert) {
for
(
i
=
0
;
i
<
sk_X509_num
(
certs
);
i
++
)
{
ucert
=
sk_X509_value
(
certs
,
i
);
if
(
X509_check_private_key
(
ucert
,
key
))
{
X509_digest
(
cert
,
EVP_sha1
(),
keyid
,
&
keyidlen
);
X509_digest
(
u
cert
,
EVP_sha1
(),
keyid
,
&
keyidlen
);
break
;
}
}
...
...
@@ -354,6 +354,7 @@ if (export_cert) {
/* We now have loads of certificates: include them all */
for
(
i
=
0
;
i
<
sk_X509_num
(
certs
);
i
++
)
{
X509
*
cert
=
NULL
;
cert
=
sk_X509_value
(
certs
,
i
);
bag
=
M_PKCS12_x5092certbag
(
cert
);
/* If it matches private key set id */
...
...
This diff is collapsed.
Click to expand it.
crypto/asn1/asn1_par.c
浏览文件 @
2d681b77
...
...
@@ -371,7 +371,7 @@ const char *ASN1_tag2str(int tag)
"ENUMERATED"
,
"<ASN1 11>"
,
"UTF8STRING"
,
"<ASN1 13>"
,
/* 10-13 */
"<ASN1 14>"
,
"<ASN1 15>"
,
"SEQUENCE"
,
"SET"
,
/* 15-17 */
"NUMERICSTRING"
,
"PRINTABLESTRING"
,
"T61STRING"
,
/* 18-20 */
"VIDEOTEXSTRING"
,
"IA5STRING"
,
"UTCTIME"
"GENERALIZEDTIME"
,
/* 21-24 */
"VIDEOTEXSTRING"
,
"IA5STRING"
,
"UTCTIME"
,
"GENERALIZEDTIME"
,
/* 21-24 */
"GRAPHICSTRING"
,
"VISIBLESTRING"
,
"GENERALSTRING"
,
/* 25-27 */
"UNIVERSALSTRING"
,
"<ASN1 29>"
,
"BMPSTRING"
/* 28-30 */
};
...
...
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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
新手
引导
客服
返回
顶部