Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
3d63b396
T
Third Party Openssl
项目概览
OpenHarmony
/
Third Party Openssl
8 个月 前同步成功
通知
8
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看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
3d63b396
编写于
11月 25, 2009
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Split PBES2 into cipher and PBKDF2 versions. This tidies the code somewhat
and is a pre-requisite to adding password based CMS support.
上级
451038b4
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
165 addition
and
91 deletion
+165
-91
CHANGES
CHANGES
+15
-7
crypto/asn1/asn1.h
crypto/asn1/asn1.h
+1
-0
crypto/asn1/asn1_err.c
crypto/asn1/asn1_err.c
+1
-0
crypto/asn1/p5_pbev2.c
crypto/asn1/p5_pbev2.c
+91
-49
crypto/evp/evp.h
crypto/evp/evp.h
+1
-0
crypto/evp/evp_err.c
crypto/evp/evp_err.c
+1
-0
crypto/evp/evp_locl.h
crypto/evp/evp_locl.h
+4
-0
crypto/evp/evp_pbe.c
crypto/evp/evp_pbe.c
+5
-0
crypto/evp/p5_crpt2.c
crypto/evp/p5_crpt2.c
+46
-35
未找到文件。
CHANGES
浏览文件 @
3d63b396
...
...
@@ -2,14 +2,12 @@
OpenSSL CHANGES
_______________
Changes between
0.9.8l and 1.0
[xx XXX xxxx]
Changes between
1.0 and 1.1
[xx XXX xxxx]
*) Add load_crls() function to apps tidying load_certs() too. Add option
to verify utility to allow additional CRLs to be included.
[Steve Henson]
*) Update OCSP request code to permit adding custom headers to the request:
some responders need this.
*) Split password based encryption into PBES2 and PBKDF2 functions. This
neatly separates the code into cipher and PBE sections and is required
for some algorithms that split PBES2 into separate pieces (such as
password based CMS).
[Steve Henson]
*) Extensive audit of libcrypto with DEBUG_UNUSED. Fix many cases where
...
...
@@ -25,6 +23,16 @@
whose return value is often ignored.
[Steve Henson]
Changes between 0.9.8l and 1.0 [xx XXX xxxx]
*) Add load_crls() function to apps tidying load_certs() too. Add option
to verify utility to allow additional CRLs to be included.
[Steve Henson]
*) Update OCSP request code to permit adding custom headers to the request:
some responders need this.
[Steve Henson]
*) The function EVP_PKEY_sign() returns <=0 on error: check return code
correctly.
[Julia Lawall <julia@diku.dk>]
...
...
crypto/asn1/asn1.h
浏览文件 @
3d63b396
...
...
@@ -1266,6 +1266,7 @@ void ERR_load_ASN1_strings(void);
#define ASN1_F_PKCS5_PBE2_SET_IV 167
#define ASN1_F_PKCS5_PBE_SET 202
#define ASN1_F_PKCS5_PBE_SET0_ALGOR 215
#define ASN1_F_PKCS5_PBKDF2_SET 219
#define ASN1_F_SMIME_READ_ASN1 212
#define ASN1_F_SMIME_TEXT 213
#define ASN1_F_X509_CINF_NEW 168
...
...
crypto/asn1/asn1_err.c
浏览文件 @
3d63b396
...
...
@@ -179,6 +179,7 @@ static ERR_STRING_DATA ASN1_str_functs[]=
{
ERR_FUNC
(
ASN1_F_PKCS5_PBE2_SET_IV
),
"PKCS5_pbe2_set_iv"
},
{
ERR_FUNC
(
ASN1_F_PKCS5_PBE_SET
),
"PKCS5_pbe_set"
},
{
ERR_FUNC
(
ASN1_F_PKCS5_PBE_SET0_ALGOR
),
"PKCS5_pbe_set0_algor"
},
{
ERR_FUNC
(
ASN1_F_PKCS5_PBKDF2_SET
),
"PKCS5_pbkdf2_set"
},
{
ERR_FUNC
(
ASN1_F_SMIME_READ_ASN1
),
"SMIME_read_ASN1"
},
{
ERR_FUNC
(
ASN1_F_SMIME_TEXT
),
"SMIME_text"
},
{
ERR_FUNC
(
ASN1_F_X509_CINF_NEW
),
"X509_CINF_NEW"
},
...
...
crypto/asn1/p5_pbev2.c
浏览文件 @
3d63b396
...
...
@@ -91,12 +91,10 @@ X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter,
unsigned
char
*
aiv
,
int
prf_nid
)
{
X509_ALGOR
*
scheme
=
NULL
,
*
kalg
=
NULL
,
*
ret
=
NULL
;
int
alg_nid
;
int
alg_nid
,
keylen
;
EVP_CIPHER_CTX
ctx
;
unsigned
char
iv
[
EVP_MAX_IV_LENGTH
];
PBKDF2PARAM
*
kdf
=
NULL
;
PBE2PARAM
*
pbe2
=
NULL
;
ASN1_OCTET_STRING
*
osalt
=
NULL
;
ASN1_OBJECT
*
obj
;
alg_nid
=
EVP_CIPHER_type
(
cipher
);
...
...
@@ -146,55 +144,19 @@ X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter,
}
EVP_CIPHER_CTX_cleanup
(
&
ctx
);
if
(
!
(
kdf
=
PBKDF2PARAM_new
()))
goto
merr
;
if
(
!
(
osalt
=
M_ASN1_OCTET_STRING_new
()))
goto
merr
;
if
(
!
saltlen
)
saltlen
=
PKCS5_SALT_LEN
;
if
(
!
(
osalt
->
data
=
OPENSSL_malloc
(
saltlen
)))
goto
merr
;
osalt
->
length
=
saltlen
;
if
(
salt
)
memcpy
(
osalt
->
data
,
salt
,
saltlen
);
else
if
(
RAND_pseudo_bytes
(
osalt
->
data
,
saltlen
)
<
0
)
goto
merr
;
if
(
iter
<=
0
)
iter
=
PKCS5_DEFAULT_ITER
;
if
(
!
ASN1_INTEGER_set
(
kdf
->
iter
,
iter
))
goto
merr
;
/* Now include salt in kdf structure */
kdf
->
salt
->
value
.
octet_string
=
osalt
;
kdf
->
salt
->
type
=
V_ASN1_OCTET_STRING
;
osalt
=
NULL
;
/* If its RC2 then we'd better setup the key length */
if
(
alg_nid
==
NID_rc2_cbc
)
{
if
(
!
(
kdf
->
keylength
=
M_ASN1_INTEGER_new
()))
goto
merr
;
if
(
!
ASN1_INTEGER_set
(
kdf
->
keylength
,
EVP_CIPHER_key_length
(
cipher
)))
goto
merr
;
}
/* prf can stay NULL if we are using hmacWithSHA1 */
if
(
prf_nid
!=
NID_hmacWithSHA1
)
{
kdf
->
prf
=
X509_ALGOR_new
();
if
(
!
kdf
->
prf
)
goto
merr
;
X509_ALGOR_set0
(
kdf
->
prf
,
OBJ_nid2obj
(
prf_nid
),
V_ASN1_NULL
,
NULL
);
}
/* Now setup the PBE2PARAM keyfunc structure */
if
(
alg_nid
==
NID_rc2_cbc
)
keylen
=
EVP_CIPHER_key_length
(
cipher
);
else
keylen
=
-
1
;
pbe2
->
keyfunc
->
algorithm
=
OBJ_nid2obj
(
NID_id_pbkdf2
);
/* Setup keyfunc */
/* Encode PBKDF2PARAM into parameter of pbe2 */
pbe2
->
keyfunc
=
PKCS5_pbkdf2_set
(
iter
,
salt
,
saltlen
,
prf_nid
,
keylen
);
if
(
!
(
pbe2
->
keyfunc
->
parameter
=
ASN1_TYPE_new
()))
goto
merr
;
if
(
!
ASN1_item_pack
(
kdf
,
ASN1_ITEM_rptr
(
PBKDF2PARAM
),
&
pbe2
->
keyfunc
->
parameter
->
value
.
sequence
))
goto
merr
;
pbe2
->
keyfunc
->
parameter
->
type
=
V_ASN1_SEQUENCE
;
PBKDF2PARAM_free
(
kdf
);
kdf
=
NULL
;
if
(
!
pbe2
->
keyfunc
)
goto
merr
;
/* Now set up top level AlgorithmIdentifier */
...
...
@@ -220,8 +182,6 @@ X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter,
err:
PBE2PARAM_free
(
pbe2
);
/* Note 'scheme' is freed as part of pbe2 */
M_ASN1_OCTET_STRING_free
(
osalt
);
PBKDF2PARAM_free
(
kdf
);
X509_ALGOR_free
(
kalg
);
X509_ALGOR_free
(
ret
);
...
...
@@ -234,3 +194,85 @@ X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter,
{
return
PKCS5_pbe2_set_iv
(
cipher
,
iter
,
salt
,
saltlen
,
NULL
,
-
1
);
}
X509_ALGOR
*
PKCS5_pbkdf2_set
(
int
iter
,
unsigned
char
*
salt
,
int
saltlen
,
int
prf_nid
,
int
keylen
)
{
X509_ALGOR
*
keyfunc
=
NULL
;
PBKDF2PARAM
*
kdf
=
NULL
;
ASN1_OCTET_STRING
*
osalt
=
NULL
;
if
(
!
(
kdf
=
PBKDF2PARAM_new
()))
goto
merr
;
if
(
!
(
osalt
=
M_ASN1_OCTET_STRING_new
()))
goto
merr
;
kdf
->
salt
->
value
.
octet_string
=
osalt
;
kdf
->
salt
->
type
=
V_ASN1_OCTET_STRING
;
if
(
!
saltlen
)
saltlen
=
PKCS5_SALT_LEN
;
if
(
!
(
osalt
->
data
=
OPENSSL_malloc
(
saltlen
)))
goto
merr
;
osalt
->
length
=
saltlen
;
if
(
salt
)
memcpy
(
osalt
->
data
,
salt
,
saltlen
);
else
if
(
RAND_pseudo_bytes
(
osalt
->
data
,
saltlen
)
<
0
)
goto
merr
;
if
(
iter
<=
0
)
iter
=
PKCS5_DEFAULT_ITER
;
if
(
!
ASN1_INTEGER_set
(
kdf
->
iter
,
iter
))
goto
merr
;
/* If have a key len set it up */
if
(
keylen
>
0
)
{
if
(
!
(
kdf
->
keylength
=
M_ASN1_INTEGER_new
()))
goto
merr
;
if
(
!
ASN1_INTEGER_set
(
kdf
->
keylength
,
keylen
))
goto
merr
;
}
/* prf can stay NULL if we are using hmacWithSHA1 */
if
(
prf_nid
>
0
&&
prf_nid
!=
NID_hmacWithSHA1
)
{
kdf
->
prf
=
X509_ALGOR_new
();
if
(
!
kdf
->
prf
)
goto
merr
;
X509_ALGOR_set0
(
kdf
->
prf
,
OBJ_nid2obj
(
prf_nid
),
V_ASN1_NULL
,
NULL
);
}
/* Finally setup the keyfunc structure */
keyfunc
=
X509_ALGOR_new
();
if
(
!
keyfunc
)
goto
merr
;
keyfunc
->
algorithm
=
OBJ_nid2obj
(
NID_id_pbkdf2
);
/* Encode PBKDF2PARAM into parameter of pbe2 */
if
(
!
(
keyfunc
->
parameter
=
ASN1_TYPE_new
()))
goto
merr
;
if
(
!
ASN1_item_pack
(
kdf
,
ASN1_ITEM_rptr
(
PBKDF2PARAM
),
&
keyfunc
->
parameter
->
value
.
sequence
))
goto
merr
;
keyfunc
->
parameter
->
type
=
V_ASN1_SEQUENCE
;
PBKDF2PARAM_free
(
kdf
);
return
keyfunc
;
merr:
ASN1err
(
ASN1_F_PKCS5_PBKDF2_SET
,
ERR_R_MALLOC_FAILURE
);
PBKDF2PARAM_free
(
kdf
);
X509_ALGOR_free
(
keyfunc
);
return
NULL
;
}
crypto/evp/evp.h
浏览文件 @
3d63b396
...
...
@@ -1236,6 +1236,7 @@ void ERR_load_EVP_strings(void);
#define EVP_F_INT_CTX_NEW 157
#define EVP_F_PKCS5_PBE_KEYIVGEN 117
#define EVP_F_PKCS5_V2_PBE_KEYIVGEN 118
#define EVP_F_PKCS5_V2_PBKDF2_KEYIVGEN 164
#define EVP_F_PKCS8_SET_BROKEN 112
#define EVP_F_PKEY_SET_TYPE 158
#define EVP_F_RC2_MAGIC_TO_METH 109
...
...
crypto/evp/evp_err.c
浏览文件 @
3d63b396
...
...
@@ -129,6 +129,7 @@ static ERR_STRING_DATA EVP_str_functs[]=
{
ERR_FUNC
(
EVP_F_INT_CTX_NEW
),
"INT_CTX_NEW"
},
{
ERR_FUNC
(
EVP_F_PKCS5_PBE_KEYIVGEN
),
"PKCS5_PBE_keyivgen"
},
{
ERR_FUNC
(
EVP_F_PKCS5_V2_PBE_KEYIVGEN
),
"PKCS5_v2_PBE_keyivgen"
},
{
ERR_FUNC
(
EVP_F_PKCS5_V2_PBKDF2_KEYIVGEN
),
"PKCS5_V2_PBKDF2_KEYIVGEN"
},
{
ERR_FUNC
(
EVP_F_PKCS8_SET_BROKEN
),
"PKCS8_set_broken"
},
{
ERR_FUNC
(
EVP_F_PKEY_SET_TYPE
),
"PKEY_SET_TYPE"
},
{
ERR_FUNC
(
EVP_F_RC2_MAGIC_TO_METH
),
"RC2_MAGIC_TO_METH"
},
...
...
crypto/evp/evp_locl.h
浏览文件 @
3d63b396
...
...
@@ -343,3 +343,7 @@ struct evp_pkey_method_st
}
/* EVP_PKEY_METHOD */
;
void
evp_pkey_set_cb_translate
(
BN_GENCB
*
cb
,
EVP_PKEY_CTX
*
ctx
);
int
PKCS5_v2_PBKDF2_keyivgen
(
EVP_CIPHER_CTX
*
ctx
,
const
char
*
pass
,
int
passlen
,
ASN1_TYPE
*
param
,
const
EVP_CIPHER
*
c
,
const
EVP_MD
*
md
,
int
en_de
);
crypto/evp/evp_pbe.c
浏览文件 @
3d63b396
...
...
@@ -61,6 +61,7 @@
#include <openssl/evp.h>
#include <openssl/pkcs12.h>
#include <openssl/x509.h>
#include "evp_locl.h"
/* Password based encryption (PBE) functions */
...
...
@@ -87,6 +88,10 @@ static const EVP_PBE_CTL builtin_pbe[] =
{
EVP_PBE_TYPE_OUTER
,
NID_pbeWithSHA1AndRC2_CBC
,
NID_rc2_64_cbc
,
NID_sha1
,
PKCS5_PBE_keyivgen
},
#ifndef OPENSSL_NO_HMAC
{
EVP_PBE_TYPE_OUTER
,
NID_id_pbkdf2
,
-
1
,
-
1
,
PKCS5_v2_PBKDF2_keyivgen
},
#endif
{
EVP_PBE_TYPE_OUTER
,
NID_pbe_WithSHA1And128BitRC4
,
NID_rc4
,
NID_sha1
,
PKCS12_PBE_keyivgen
},
{
EVP_PBE_TYPE_OUTER
,
NID_pbe_WithSHA1And40BitRC4
,
...
...
crypto/evp/p5_crpt2.c
浏览文件 @
3d63b396
...
...
@@ -62,6 +62,7 @@
#include <openssl/x509.h>
#include <openssl/evp.h>
#include <openssl/hmac.h>
#include "evp_locl.h"
/* set this to print out info about the keygen algorithm */
/* #define DEBUG_PKCS5V2 */
...
...
@@ -172,27 +173,24 @@ int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
ASN1_TYPE
*
param
,
const
EVP_CIPHER
*
c
,
const
EVP_MD
*
md
,
int
en_de
)
{
unsigned
char
*
salt
,
key
[
EVP_MAX_KEY_LENGTH
];
const
unsigned
char
*
pbuf
;
int
saltlen
,
iter
,
plen
;
unsigned
int
keylen
;
int
plen
;
PBE2PARAM
*
pbe2
=
NULL
;
const
EVP_CIPHER
*
cipher
;
PBKDF2PARAM
*
kdf
=
NULL
;
const
EVP_MD
*
prfmd
;
int
prf_nid
,
hmac_md_nid
;
int
rv
=
0
;
if
(
param
==
NULL
||
param
->
type
!=
V_ASN1_SEQUENCE
||
param
->
value
.
sequence
==
NULL
)
{
EVPerr
(
EVP_F_PKCS5_V2_PBE_KEYIVGEN
,
EVP_R_DECODE_ERROR
);
return
0
;
goto
err
;
}
pbuf
=
param
->
value
.
sequence
->
data
;
plen
=
param
->
value
.
sequence
->
length
;
if
(
!
(
pbe2
=
d2i_PBE2PARAM
(
NULL
,
&
pbuf
,
plen
)))
{
EVPerr
(
EVP_F_PKCS5_V2_PBE_KEYIVGEN
,
EVP_R_DECODE_ERROR
);
return
0
;
goto
err
;
}
/* See if we recognise the key derivation function */
...
...
@@ -216,41 +214,62 @@ int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
/* Fixup cipher based on AlgorithmIdentifier */
if
(
!
EVP_CipherInit_ex
(
ctx
,
cipher
,
NULL
,
NULL
,
NULL
,
en_de
))
{
EVPerr
(
EVP_F_PKCS5_V2_PBE_KEYIVGEN
,
ERR_R_EVP_LIB
);
goto
err
;
}
if
(
EVP_CIPHER_asn1_to_param
(
ctx
,
pbe2
->
encryption
->
parameter
)
<
0
)
{
EVPerr
(
EVP_F_PKCS5_V2_PBE_KEYIVGEN
,
EVP_R_CIPHER_PARAMETER_ERROR
);
goto
err
;
}
rv
=
PKCS5_v2_PBKDF2_keyivgen
(
ctx
,
pass
,
passlen
,
pbe2
->
keyfunc
->
parameter
,
c
,
md
,
en_de
);
err:
PBE2PARAM_free
(
pbe2
);
return
rv
;
}
int
PKCS5_v2_PBKDF2_keyivgen
(
EVP_CIPHER_CTX
*
ctx
,
const
char
*
pass
,
int
passlen
,
ASN1_TYPE
*
param
,
const
EVP_CIPHER
*
c
,
const
EVP_MD
*
md
,
int
en_de
)
{
unsigned
char
*
salt
,
key
[
EVP_MAX_KEY_LENGTH
];
const
unsigned
char
*
pbuf
;
int
saltlen
,
iter
,
plen
;
int
rv
=
0
;
unsigned
int
keylen
;
int
prf_nid
,
hmac_md_nid
;
PBKDF2PARAM
*
kdf
=
NULL
;
const
EVP_MD
*
prfmd
;
if
(
EVP_CIPHER_CTX_cipher
(
ctx
)
==
NULL
)
{
EVPerr
(
EVP_F_PKCS5_V2_PBKDF2_KEYIVGEN
,
EVP_R_NO_CIPHER_SET
);
goto
err
;
}
keylen
=
EVP_CIPHER_CTX_key_length
(
ctx
);
OPENSSL_assert
(
keylen
<=
sizeof
key
);
/*
Now decode key derivation function
*/
/*
Decode parameter
*/
if
(
!
pbe2
->
keyfunc
->
parameter
||
(
pbe2
->
keyfunc
->
parameter
->
type
!=
V_ASN1_SEQUENCE
))
if
(
!
param
||
(
param
->
type
!=
V_ASN1_SEQUENCE
))
{
EVPerr
(
EVP_F_PKCS5_V2_PB
E
_KEYIVGEN
,
EVP_R_DECODE_ERROR
);
EVPerr
(
EVP_F_PKCS5_V2_PB
KDF2
_KEYIVGEN
,
EVP_R_DECODE_ERROR
);
goto
err
;
}
pbuf
=
pbe2
->
keyfunc
->
parameter
->
value
.
sequence
->
data
;
plen
=
pbe2
->
keyfunc
->
parameter
->
value
.
sequence
->
length
;
pbuf
=
param
->
value
.
sequence
->
data
;
plen
=
param
->
value
.
sequence
->
length
;
if
(
!
(
kdf
=
d2i_PBKDF2PARAM
(
NULL
,
&
pbuf
,
plen
))
)
{
EVPerr
(
EVP_F_PKCS5_V2_PB
E
_KEYIVGEN
,
EVP_R_DECODE_ERROR
);
EVPerr
(
EVP_F_PKCS5_V2_PB
KDF2
_KEYIVGEN
,
EVP_R_DECODE_ERROR
);
goto
err
;
}
PBE2PARAM_free
(
pbe2
);
pbe2
=
NULL
;
keylen
=
EVP_CIPHER_CTX_key_length
(
ctx
);
/* Now check the parameters of the kdf */
if
(
kdf
->
keylength
&&
(
ASN1_INTEGER_get
(
kdf
->
keylength
)
!=
(
int
)
keylen
)){
EVPerr
(
EVP_F_PKCS5_V2_PB
E
_KEYIVGEN
,
EVPerr
(
EVP_F_PKCS5_V2_PB
KDF2
_KEYIVGEN
,
EVP_R_UNSUPPORTED_KEYLENGTH
);
goto
err
;
}
...
...
@@ -262,19 +281,19 @@ int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
if
(
!
EVP_PBE_find
(
EVP_PBE_TYPE_PRF
,
prf_nid
,
NULL
,
&
hmac_md_nid
,
0
))
{
EVPerr
(
EVP_F_PKCS5_V2_PB
E
_KEYIVGEN
,
EVP_R_UNSUPPORTED_PRF
);
EVPerr
(
EVP_F_PKCS5_V2_PB
KDF2
_KEYIVGEN
,
EVP_R_UNSUPPORTED_PRF
);
goto
err
;
}
prfmd
=
EVP_get_digestbynid
(
hmac_md_nid
);
if
(
prfmd
==
NULL
)
{
EVPerr
(
EVP_F_PKCS5_V2_PB
E
_KEYIVGEN
,
EVP_R_UNSUPPORTED_PRF
);
EVPerr
(
EVP_F_PKCS5_V2_PB
KDF2
_KEYIVGEN
,
EVP_R_UNSUPPORTED_PRF
);
goto
err
;
}
if
(
kdf
->
salt
->
type
!=
V_ASN1_OCTET_STRING
)
{
EVPerr
(
EVP_F_PKCS5_V2_PB
E
_KEYIVGEN
,
EVPerr
(
EVP_F_PKCS5_V2_PB
KDF2
_KEYIVGEN
,
EVP_R_UNSUPPORTED_SALT_TYPE
);
goto
err
;
}
...
...
@@ -286,19 +305,11 @@ int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
if
(
!
PKCS5_PBKDF2_HMAC
(
pass
,
passlen
,
salt
,
saltlen
,
iter
,
prfmd
,
keylen
,
key
))
goto
err
;
if
(
!
EVP_CipherInit_ex
(
ctx
,
NULL
,
NULL
,
key
,
NULL
,
en_de
))
{
EVPerr
(
EVP_F_PKCS5_V2_PBE_KEYIVGEN
,
ERR_R_EVP_LIB
);
goto
err
;
}
OPENSSL_cleanse
(
key
,
keylen
);
PBKDF2PARAM_free
(
kdf
);
return
1
;
rv
=
EVP_CipherInit_ex
(
ctx
,
NULL
,
NULL
,
key
,
NULL
,
en_de
);
err:
PBE2PARAM_free
(
pbe2
);
OPENSSL_cleanse
(
key
,
keylen
);
PBKDF2PARAM_free
(
kdf
);
return
0
;
return
rv
;
}
#ifdef DEBUG_PKCS5V2
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录