diff options
author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-08-25 15:40:28 +0200 |
---|---|---|
committer | GitLab <gitlab@gitlab.com> | 2016-08-26 08:53:35 +0000 |
commit | b643e4fafa694695c67dacdda8cad5b7e588d5a7 (patch) | |
tree | f111077b967d71a3bb9730a58df7c5537c5605a0 /lib/pkix.asn | |
parent | 58f8b90025424bc899c5dc390afbdbe8306fe899 (diff) | |
download | gnutls-b643e4fafa694695c67dacdda8cad5b7e588d5a7.tar.gz |
pkcs8: added support for decryption with PBES1-DES-CBC-MD5
While this is a legacy (and insecure) cipher combination it is the
default output of openssl up until the 1.0.2 version. We introduce
this option to allow decrypting private keys from these versions of
openssl.
Diffstat (limited to 'lib/pkix.asn')
-rw-r--r-- | lib/pkix.asn | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/pkix.asn b/lib/pkix.asn index 99cd54cba2..6b6b427a71 100644 --- a/lib/pkix.asn +++ b/lib/pkix.asn @@ -447,6 +447,10 @@ pkcs-5-aes128-CBC-params ::= OCTET STRING (SIZE(16)) pkcs-5-aes192-CBC-params ::= OCTET STRING (SIZE(16)) pkcs-5-aes256-CBC-params ::= OCTET STRING (SIZE(16)) +pkcs-5-PBE-params ::= SEQUENCE { + salt OCTET STRING, + iterationCount INTEGER } + pkcs-5-PBES2-params ::= SEQUENCE { keyDerivationFunc AlgorithmIdentifier, encryptionScheme AlgorithmIdentifier } |