2 Commits

Author	SHA1	Message	Date
Paul Bakker	28144decef	PKCS#5 v2 PBES2 support and use in PKCS#8 encrypted certificates ... The error code POLARSSL_ERR_X509_PASSWORD_MISMATCH is now properly returned in case of an encryption failure in the padding. The POLARSSL_ERR_X509_PASSWORD_REQUIRED error code is only returned for PEM formatted private keys as for DER formatted ones it is impossible to distinguish if a DER blob is PKCS#8 encrypted or not. (cherry picked from commit 1fd4321ba2) Conflicts: include/polarssl/error.h scripts/generate_errors.pl	2013-06-25 15:06:52 +02:00
Paul Bakker	b0c19a4b3d	PKCS#5 module added. Moved PBKDF2 functionality inside and deprecated ... old PBKDF2 module. (cherry picked from commit 19bd297dc8) Conflicts: include/polarssl/error.h scripts/generate_errors.pl	2013-06-25 15:06:52 +02:00