]> granicus.if.org Git - openssl/commit
projects / openssl / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 96b96d6) | patch
Add scrypt PBE algorithm code.
authorDr. Stephen Henson <steve@openssl.org>
Wed, 20 May 2015 12:23:06 +0000 (13:23 +0100)
committerDr. Stephen Henson <steve@openssl.org>
Thu, 21 May 2015 11:48:02 +0000 (12:48 +0100)
commite98aa30d555cb5a656d320a0f86ab5b3b1dce2db
tree5ea26c5e2258ee325abd0757ea253d82dedaa91ctree | snapshot
parent96b96d6c456befe49d5845a029e2bb0a4addc58dcommit | diff
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>
crypto/asn1/Makefile diff | blob | history
crypto/asn1/asn1_err.c diff | blob | history
crypto/asn1/p5_scrypt.c [new file with mode: 0644] blob
crypto/evp/evp_err.c diff | blob | history
crypto/evp/evp_pbe.c diff | blob | history
include/openssl/asn1.h diff | blob | history
include/openssl/evp.h diff | blob | history
include/openssl/x509.h diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.