5 commits

Author	SHA1	Message	Date
Paul Bakker	bd5524471a	Removed memory leak in PKCS#12 code	2013-07-03 17:22:31 +02:00
Paul Bakker	f8d018a274	Made asn1_get_alg() and asn1_get_alg_null() as generic functions ... A generic function for retrieving the AlgorithmIdentifier structure with its parameters and adapted X509, PKCS#5 and PKCS#12 to use them.	2013-06-29 18:35:40 +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 14a222cef2)	2013-06-25 15:06:53 +02:00
Paul Bakker	531e294313	Fixed location of brackets in pkcs12.c ... (cherry picked from commit 67812d396c)	2013-06-25 15:06:52 +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 cf6e95d9a8) Conflicts: scripts/generate_errors.pl	2013-06-25 15:06:51 +02:00