| commit | f1f21fe825a15bce133db2a6445b5ba4e3bb9195 | [log] [tgz] |
|---|---|---|
| author | Paul Bakker <p.j.bakker@polarssl.org> | Mon Jun 24 19:17:19 2013 +0200 |
| committer | Paul Bakker <p.j.bakker@polarssl.org> | Tue Jun 25 15:06:51 2013 +0200 |
| tree | ea39e349da8826e37a9496052d0e9c6d9fc1a7f7 | |
| parent | e2f504087615b492f456e362d0d1c0b56c1eb6f1 [diff] |
Parsing of PKCS#8 encrypted private key files added and PKCS#12 basis PKCS#8 encrypted key file support has been added to x509parse_key() with support for some PCKS#12 PBE functions (pbeWithSHAAnd128BitRC4, pbeWithSHAAnd3-KeyTripleDES-CBC and pbeWithSHAAnd2-KeyTripleDES-CBC) (cherry picked from commit cf6e95d9a81c7b22271beb58a09b5c756148e62a) Conflicts: scripts/generate_errors.pl