4 commits

Author	SHA1	Message	Date
Paul Bakker	a36d23e290	Fixed documentation issues found by clang	2013-12-30 17:57:27 +01:00
Paul Bakker	7749a22974	Moved PKCS#12 cipher layer based PBE detection to use OID database	2013-06-29 18:32:16 +02:00
Paul Bakker	38b50d73a1	Moved PKCS#12 PBE functions to cipher / md layer where possible ... The 3-key and 2-key Triple DES PBE functions have been replaced with a single pkcs12_pbe() function that handles both situations (and more). In addition this allows for some PASSWORD_MISMATCH checking (cherry picked from commit 14a222cef2699bd3da884662f7e56e097a12b1a0)	2013-06-25 15:06:53 +02:00
Paul Bakker	f1f21fe825	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	2013-06-25 15:06:51 +02:00