lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-29 11:41:15 +03:00
Code Activity

Parsing of PKCS#8 encrypted private key files added and PKCS#12 basis

Browse Source 
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
This commit is contained in:
Paul Bakker
2013-06-24 19:17:19 +02:00
parent e2f5040876
commit f1f21fe825
14 changed files with 784 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/polarssl/error.h
View File

@ -76,6 +76,7 @@
* High-level module nr (3 bits - 0x1...-0x8...)
* Name ID Nr of Errors
* PEM 1 9
* PKCS#12 1 3 (Started from top)
* X509 2 21
* DHM 3 6
* RSA 4 9