From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 11 Apr 2013 17:39:32 +0000 (+0200)
Subject: Support the PKCS#5/PKCS#12 encryption scheme used by OpenSSL for private keys
X-Git-Tag: 5.1.0dr1~149^2~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=047fca1169f210a2a9c308d7ea1f28401d6e29f8;p=thirdparty%2Fstrongswan.git

Support the PKCS#5/PKCS#12 encryption scheme used by OpenSSL for private keys
---

diff --git a/src/libstrongswan/crypto/pkcs5.c b/src/libstrongswan/crypto/pkcs5.c
index 7a7339915f..ed2c41a0de 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;