diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2013-04-11 19:39:32 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2013-05-08 15:02:39 +0200 |
| commit | 047fca1169f210a2a9c308d7ea1f28401d6e29f8 (patch) | |
| tree | 07fe9b2cd109c751d2993b2db056bd3689e8b477 /src | |
| parent | 0d0929fa0c0977dc362c84d05cc5ef68edc37f58 (diff) | |
| download | strongswan-047fca1169f210a2a9c308d7ea1f28401d6e29f8.tar.bz2 strongswan-047fca1169f210a2a9c308d7ea1f28401d6e29f8.tar.xz | |
Support the PKCS#5/PKCS#12 encryption scheme used by OpenSSL for private keys
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstrongswan/crypto/pkcs5.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/libstrongswan/crypto/pkcs5.c b/src/libstrongswan/crypto/pkcs5.c index 7a7339915..ed2c41a0d 100644 --- a/src/libstrongswan/crypto/pkcs5.c +++ b/src/libstrongswan/crypto/pkcs5.c @@ -606,6 +606,12 @@ pkcs5_t *pkcs5_from_algorithmIdentifier(chunk_t blob, int level0) this->encr = ENCR_DES; this->data.pbes1.hash = HASH_SHA1; break; + case OID_PBE_SHA1_3DES_CBC: + this->scheme = PKCS5_SCHEME_PKCS12; + this->keylen = 24; + this->encr = ENCR_3DES; + this->data.pbes1.hash = HASH_SHA1; + break; case OID_PBE_SHA1_RC2_CBC_40: this->scheme = PKCS5_SCHEME_PKCS12; this->keylen = 5; |