Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
btwise
openssl
提交
05338b58
O
openssl
项目概览
btwise
/
openssl
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
openssl
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
05338b58
编写于
5月 01, 2005
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Support for smime-type MIME parameter.
上级
081057c3
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
26 addition
and
2 deletion
+26
-2
CHANGES
CHANGES
+4
-0
crypto/pkcs7/pk7_mime.c
crypto/pkcs7/pk7_mime.c
+22
-2
未找到文件。
CHANGES
浏览文件 @
05338b58
...
...
@@ -794,6 +794,10 @@
Changes between 0.9.7g and 0.9.7h [XX xxx XXXX]
*) Add support for smime-type MIME parameter in S/MIME messages which some
clients need.
[Steve Henson]
*) New function BN_MONT_CTX_set_locked() to set montgomery parameters in
a threadsafe manner. Modify rsa code to use new function and add calls
to dsa and dh code (which had race conditions before).
...
...
crypto/pkcs7/pk7_mime.c
浏览文件 @
05338b58
...
...
@@ -3,7 +3,7 @@
* project.
*/
/* ====================================================================
* Copyright (c) 1999-200
3
The OpenSSL Project. All rights reserved.
* Copyright (c) 1999-200
5
The OpenSSL Project. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
...
...
@@ -150,11 +150,12 @@ int SMIME_write_PKCS7(BIO *bio, PKCS7 *p7, BIO *data, int flags)
{
char
bound
[
33
],
c
;
int
i
;
char
*
mime_prefix
,
*
mime_eol
;
char
*
mime_prefix
,
*
mime_eol
,
*
msg_type
=
NULL
;
if
(
flags
&
PKCS7_NOOLDMIMETYPE
)
mime_prefix
=
"application/pkcs7-"
;
else
mime_prefix
=
"application/x-pkcs7-"
;
if
(
flags
&
PKCS7_CRLFEOL
)
mime_eol
=
"
\r\n
"
;
else
...
...
@@ -196,11 +197,30 @@ int SMIME_write_PKCS7(BIO *bio, PKCS7 *p7, BIO *data, int flags)
mime_eol
,
mime_eol
);
return
1
;
}
/* Determine smime-type header */
if
(
PKCS7_type_is_enveloped
(
p7
))
msg_type
=
"enveloped-data"
;
else
if
(
PKCS7_type_is_signed
(
p7
))
{
/* If we have any signers it is signed-data othewise
* certs-only.
*/
STACK_OF
(
PKCS7_SIGNER_INFO
)
*
sinfos
;
sinfos
=
PKCS7_get_signer_info
(
p7
);
if
(
sk_PKCS7_SIGNER_INFO_num
(
sinfos
)
>
0
)
msg_type
=
"signed-data"
;
else
msg_type
=
"certs-only"
;
}
/* MIME headers */
BIO_printf
(
bio
,
"MIME-Version: 1.0%s"
,
mime_eol
);
BIO_printf
(
bio
,
"Content-Disposition: attachment;"
);
BIO_printf
(
bio
,
" filename=
\"
smime.p7m
\"
%s"
,
mime_eol
);
BIO_printf
(
bio
,
"Content-Type: %smime;"
,
mime_prefix
);
if
(
msg_type
)
BIO_printf
(
bio
,
" smime-type=%s;"
,
msg_type
);
BIO_printf
(
bio
,
" name=
\"
smime.p7m
\"
%s"
,
mime_eol
);
BIO_printf
(
bio
,
"Content-Transfer-Encoding: base64%s%s"
,
mime_eol
,
mime_eol
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录