diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-05-20 13:23:06 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-05-21 12:48:02 +0100 |
| commit | e98aa30d555cb5a656d320a0f86ab5b3b1dce2db (patch) | |
| tree | 5ea26c5e2258ee325abd0757ea253d82dedaa91c /crypto/evp/evp_pbe.c | |
| parent | 96b96d6c456befe49d5845a029e2bb0a4addc58d (diff) | |
| download | openssl-e98aa30d555cb5a656d320a0f86ab5b3b1dce2db.tar.gz | |
Add scrypt PBE algorithm code.
This adds support for the ASN.1 structures in draft-josefsson-scrypt-kdf-03
Private keys encrypted by scrypt can now be decrypted transparently as long
as they don't exceed the memory limits.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/evp/evp_pbe.c')
| -rw-r--r-- | crypto/evp/evp_pbe.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/evp/evp_pbe.c b/crypto/evp/evp_pbe.c index e4ad16b292..13d96587a3 100644 --- a/crypto/evp/evp_pbe.c +++ b/crypto/evp/evp_pbe.c @@ -118,7 +118,8 @@ static const EVP_PBE_CTL builtin_pbe[] = { {EVP_PBE_TYPE_PRF, NID_hmacWithSHA384, -1, NID_sha384, 0}, {EVP_PBE_TYPE_PRF, NID_hmacWithSHA512, -1, NID_sha512, 0}, {EVP_PBE_TYPE_PRF, NID_id_HMACGostR3411_94, -1, NID_id_GostR3411_94, 0}, - {EVP_PBE_TYPE_KDF, NID_id_pbkdf2, -1, -1, PKCS5_v2_PBKDF2_keyivgen} + {EVP_PBE_TYPE_KDF, NID_id_pbkdf2, -1, -1, PKCS5_v2_PBKDF2_keyivgen}, + {EVP_PBE_TYPE_KDF, NID_id_scrypt, -1, -1, PKCS5_v2_scrypt_keyivgen} }; #ifdef TEST |