Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
btwise
openssl
提交
ae519a24
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,发现更多精彩内容 >>
提交
ae519a24
编写于
5月 17, 2006
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Extended PBES2 function supporting application supplied IV and PRF NID.
上级
8de916bc
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
26 addition
and
8 deletion
+26
-8
crypto/asn1/p5_pbev2.c
crypto/asn1/p5_pbev2.c
+23
-8
crypto/x509/x509.h
crypto/x509/x509.h
+3
-0
未找到文件。
crypto/asn1/p5_pbev2.c
浏览文件 @
ae519a24
...
...
@@ -82,10 +82,13 @@ IMPLEMENT_ASN1_FUNCTIONS(PBKDF2PARAM)
/* Return an algorithm identifier for a PKCS#5 v2.0 PBE algorithm:
* yes I know this is horrible!
*
* Extended version to allow application supplied PRF NID and IV.
*/
X509_ALGOR
*
PKCS5_pbe2_set
(
const
EVP_CIPHER
*
cipher
,
int
iter
,
unsigned
char
*
salt
,
int
saltlen
)
X509_ALGOR
*
PKCS5_pbe2_set_iv
(
const
EVP_CIPHER
*
cipher
,
int
iter
,
unsigned
char
*
salt
,
int
saltlen
,
unsigned
char
*
aiv
,
int
prf_nid
)
{
X509_ALGOR
*
scheme
=
NULL
,
*
kalg
=
NULL
,
*
ret
=
NULL
;
int
alg_nid
;
...
...
@@ -95,7 +98,6 @@ X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter,
PBE2PARAM
*
pbe2
=
NULL
;
ASN1_OCTET_STRING
*
osalt
=
NULL
;
ASN1_OBJECT
*
obj
;
int
prf_nid
;
alg_nid
=
EVP_CIPHER_type
(
cipher
);
if
(
alg_nid
==
NID_undef
)
{
...
...
@@ -114,9 +116,13 @@ X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter,
if
(
!
(
scheme
->
parameter
=
ASN1_TYPE_new
()))
goto
merr
;
/* Create random IV */
if
(
EVP_CIPHER_iv_length
(
cipher
)
&&
RAND_pseudo_bytes
(
iv
,
EVP_CIPHER_iv_length
(
cipher
))
<
0
)
goto
err
;
if
(
EVP_CIPHER_iv_length
(
cipher
))
{
if
(
aiv
)
memcpy
(
iv
,
aiv
,
EVP_CIPHER_iv_length
(
cipher
));
else
if
(
RAND_pseudo_bytes
(
iv
,
EVP_CIPHER_iv_length
(
cipher
))
<
0
)
goto
err
;
}
EVP_CIPHER_CTX_init
(
&
ctx
);
...
...
@@ -128,8 +134,11 @@ X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter,
EVP_CIPHER_CTX_cleanup
(
&
ctx
);
goto
err
;
}
/* An error is OK here: just means use default PRF */
if
(
EVP_CIPHER_CTX_ctrl
(
&
ctx
,
EVP_CTRL_PBE_PRF_NID
,
0
,
&
prf_nid
)
<=
0
)
/* If prf NID unspecified see if cipher has a preference.
* An error is OK here: just means use default PRF.
*/
if
((
prf_nid
==
-
1
)
&&
EVP_CIPHER_CTX_ctrl
(
&
ctx
,
EVP_CTRL_PBE_PRF_NID
,
0
,
&
prf_nid
)
<=
0
)
{
ERR_clear_error
();
prf_nid
=
NID_hmacWithSHA1
;
...
...
@@ -218,3 +227,9 @@ X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter,
return
NULL
;
}
X509_ALGOR
*
PKCS5_pbe2_set
(
const
EVP_CIPHER
*
cipher
,
int
iter
,
unsigned
char
*
salt
,
int
saltlen
)
{
return
PKCS5_pbe2_set_iv
(
cipher
,
iter
,
salt
,
saltlen
,
NULL
,
-
1
);
}
crypto/x509/x509.h
浏览文件 @
ae519a24
...
...
@@ -1238,6 +1238,9 @@ DECLARE_ASN1_FUNCTIONS(PBKDF2PARAM)
X509_ALGOR
*
PKCS5_pbe_set
(
int
alg
,
int
iter
,
unsigned
char
*
salt
,
int
saltlen
);
X509_ALGOR
*
PKCS5_pbe2_set
(
const
EVP_CIPHER
*
cipher
,
int
iter
,
unsigned
char
*
salt
,
int
saltlen
);
X509_ALGOR
*
PKCS5_pbe2_set_iv
(
const
EVP_CIPHER
*
cipher
,
int
iter
,
unsigned
char
*
salt
,
int
saltlen
,
unsigned
char
*
aiv
,
int
prf_nid
);
/* PKCS#8 utilities */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录