| commit | cf6e95d9a81c7b22271beb58a09b5c756148e62a | [log] [tgz] |
|---|---|---|
| author | Paul Bakker <p.j.bakker@polarssl.org> | Wed Jun 12 13:18:15 2013 +0200 |
| committer | Paul Bakker <p.j.bakker@polarssl.org> | Wed Jun 12 13:18:15 2013 +0200 |
| tree | db6104b3f3a768d019cf9b3bc7009c5a49f1142e | |
| parent | 65a1909dc6ff7b93f0a231a5a49d98d968c9bcdc [diff] [blame] |
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)
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index a663e52..801da88 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt
@@ -31,6 +31,7 @@ pbkdf2.c pem.c pkcs11.c + pkcs12.c rsa.c sha1.c sha2.c