projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f13a71c
)
Code tidy.
author
Dr. Stephen Henson
<steve@openssl.org>
Thu, 18 May 2006 18:06:03 +0000
(18:06 +0000)
committer
Dr. Stephen Henson
<steve@openssl.org>
Thu, 18 May 2006 18:06:03 +0000
(18:06 +0000)
crypto/evp/p5_crpt2.c
patch
|
blob
|
history
diff --git
a/crypto/evp/p5_crpt2.c
b/crypto/evp/p5_crpt2.c
index 94189ff9f75a65fd821f1e7e2949d2e4accadfc0..1c09879e899d34b644889d3fdad4661b26fa33eb 100644
(file)
--- a/
crypto/evp/p5_crpt2.c
+++ b/
crypto/evp/p5_crpt2.c
@@
-200,8
+200,7
@@
int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
/* lets see if we recognise the encryption algorithm.
*/
- cipher = EVP_get_cipherbyname(
- OBJ_nid2sn(OBJ_obj2nid(pbe2->encryption->algorithm)));
+ cipher = EVP_get_cipherbyobj(pbe2->encryption->algorithm);
if(!cipher) {
EVPerr(EVP_F_PKCS5_V2_PBE_KEYIVGEN,