aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2013-04-12 12:10:22 +0200
committerTobias Brunner <tobias@strongswan.org>2013-05-08 15:02:39 +0200
commitd8be7d38bf9a0b4cf62e7713aa5b354144938620 (patch)
treea35d90e4461a77ca122d9b25b525faeeea98633d /src
parentfeef637368c6c0d36c7c8829db5af0b0bd8fcc38 (diff)
downloadstrongswan-d8be7d38bf9a0b4cf62e7713aa5b354144938620.tar.bz2
strongswan-d8be7d38bf9a0b4cf62e7713aa5b354144938620.tar.xz
Also support 128-bit RC2
Diffstat (limited to 'src')
-rw-r--r--src/libstrongswan/crypto/pkcs5.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstrongswan/crypto/pkcs5.c b/src/libstrongswan/crypto/pkcs5.c
index ed2c41a0d..679d270d2 100644
--- a/src/libstrongswan/crypto/pkcs5.c
+++ b/src/libstrongswan/crypto/pkcs5.c
@@ -613,8 +613,9 @@ pkcs5_t *pkcs5_from_algorithmIdentifier(chunk_t blob, int level0)
this->data.pbes1.hash = HASH_SHA1;
break;
case OID_PBE_SHA1_RC2_CBC_40:
+ case OID_PBE_SHA1_RC2_CBC_128:
this->scheme = PKCS5_SCHEME_PKCS12;
- this->keylen = 5;
+ this->keylen = (oid == OID_PBE_SHA1_RC2_CBC_40) ? 5 : 16;
this->encr = ENCR_RC2_CBC;
this->data.pbes1.hash = HASH_SHA1;
break;