Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
fb7b3932
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看板
提交
fb7b3932
编写于
18年前
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Output MIME parameter micalg according to RFC3851 and RFC4490 instead of hard
coding it to "sha1".
上级
61e5ec4b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
84 addition
and
1 deletion
+84
-1
CHANGES
CHANGES
+4
-0
crypto/pkcs7/pk7_mime.c
crypto/pkcs7/pk7_mime.c
+80
-1
未找到文件。
CHANGES
浏览文件 @
fb7b3932
...
...
@@ -4,6 +4,10 @@
Changes between 0.9.8b and 0.9.9 [xx XXX xxxx]
*) Add additional S/MIME capabilities for AES and GOST ciphers if supported.
Use correct micalg parameters depending on digest(s) in signed message.
[Steve Henson]
*) Add engine support for EVP_PKEY_ASN1_METHOD. Add functions to process
an ENGINE asn1 method. Support ENGINE lookups in the ASN1 code.
[Steve Henson]
...
...
This diff is collapsed.
Click to expand it.
crypto/pkcs7/pk7_mime.c
浏览文件 @
fb7b3932
...
...
@@ -144,6 +144,83 @@ static PKCS7 *B64_read_PKCS7(BIO *bio)
return
p7
;
}
/* Generate the MIME "micalg" parameter from RFC3851, RFC4490 */
static
int
pk7_write_micalg
(
BIO
*
out
,
PKCS7
*
p7
)
{
STACK_OF
(
X509_ALGOR
)
*
mdalgs
;
STACK
*
mic_sk
;
int
i
,
have_unknown
=
0
,
ret
=
0
;
mdalgs
=
p7
->
d
.
sign
->
md_algs
;
mic_sk
=
sk_new_null
();
if
(
!
mic_sk
)
goto
err
;
have_unknown
=
0
;
for
(
i
=
0
;
i
<
sk_X509_ALGOR_num
(
mdalgs
);
i
++
)
{
switch
(
OBJ_obj2nid
(
sk_X509_ALGOR_value
(
mdalgs
,
i
)
->
algorithm
))
{
case
NID_sha1
:
if
(
!
sk_push
(
mic_sk
,
"sha1"
))
goto
err
;
break
;
case
NID_md5
:
if
(
!
sk_push
(
mic_sk
,
"md5"
))
goto
err
;
break
;
case
NID_sha256
:
if
(
!
sk_push
(
mic_sk
,
"sha-256"
))
goto
err
;
break
;
case
NID_sha384
:
if
(
!
sk_push
(
mic_sk
,
"sha-384"
))
goto
err
;
break
;
case
NID_sha512
:
if
(
!
sk_push
(
mic_sk
,
"sha-512"
))
goto
err
;
break
;
case
NID_id_GostR3411_94
:
if
(
!
sk_push
(
mic_sk
,
"gostr3411-94"
))
goto
err
;
break
;
default:
if
(
!
have_unknown
)
{
if
(
!
sk_push
(
mic_sk
,
"unknown"
))
goto
err
;
have_unknown
=
1
;
}
break
;
}
}
for
(
i
=
0
;
i
<
sk_num
(
mic_sk
);
i
++
)
{
BIO_puts
(
out
,
sk_value
(
mic_sk
,
i
));
if
(
i
>
0
)
BIO_write
(
out
,
","
,
1
);
}
ret
=
1
;
err:
if
(
mic_sk
)
sk_free
(
mic_sk
);
return
ret
;
}
/* SMIME sender */
int
SMIME_write_PKCS7
(
BIO
*
bio
,
PKCS7
*
p7
,
BIO
*
data
,
int
flags
)
...
...
@@ -174,7 +251,9 @@ int SMIME_write_PKCS7(BIO *bio, PKCS7 *p7, BIO *data, int flags)
BIO_printf
(
bio
,
"MIME-Version: 1.0%s"
,
mime_eol
);
BIO_printf
(
bio
,
"Content-Type: multipart/signed;"
);
BIO_printf
(
bio
,
" protocol=
\"
%ssignature
\"
;"
,
mime_prefix
);
BIO_printf
(
bio
,
" micalg=sha1; boundary=
\"
----%s
\"
%s%s"
,
BIO_puts
(
bio
,
" micalg=
\"
"
);
pk7_write_micalg
(
bio
,
p7
);
BIO_printf
(
bio
,
"
\"
; boundary=
\"
----%s
\"
%s%s"
,
bound
,
mime_eol
,
mime_eol
);
BIO_printf
(
bio
,
"This is an S/MIME signed message%s%s"
,
mime_eol
,
mime_eol
);
...
...
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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
新手
引导
客服
返回
顶部