strongswan.org
Wiki/Project Management
Downloads
Gitweb
projects
/
strongswan.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0d0929f
)
Support the PKCS#5/PKCS#12 encryption scheme used by OpenSSL for private keys
author
Tobias Brunner
<tobias@strongswan.org>
Thu, 11 Apr 2013 17:39:32 +0000
(19:39 +0200)
committer
Tobias Brunner
<tobias@strongswan.org>
Wed, 8 May 2013 13:02:39 +0000
(15:02 +0200)
src/libstrongswan/crypto/pkcs5.c
patch
|
blob
|
history
diff --git
a/src/libstrongswan/crypto/pkcs5.c
b/src/libstrongswan/crypto/pkcs5.c
index
7a73399
..
ed2c41a
100644
(file)
--- 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;