Skip to content

Commit

Permalink
Fix for EVP_PBE_alg_add().
Browse files Browse the repository at this point in the history
In EVP_PBE_alg_add don't use the underlying NID for the cipher
as it may have a non-standard key size.

PR#3206
  • Loading branch information
snhenson committed Jun 27, 2014
1 parent 406d4af commit 59deb33
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion crypto/evp/evp_pbe.c
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ int EVP_PBE_alg_add(int nid, const EVP_CIPHER *cipher, const EVP_MD *md,
{
int cipher_nid, md_nid;
if (cipher)
cipher_nid = EVP_CIPHER_type(cipher);
cipher_nid = EVP_CIPHER_nid(cipher);
else
cipher_nid = -1;
if (md)
Expand Down

0 comments on commit 59deb33

Please sign in to comment.