aboutsummaryrefslogtreecommitdiffstats
path: root/src/libstrongswan/asn1
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2013-04-11 13:27:02 +0200
committerTobias Brunner <tobias@strongswan.org>2013-05-08 15:02:38 +0200
commit594d847f791d33408ad266d8231228543447113a (patch)
tree6e53fce119b00089df69341c207e665ec76b37d4 /src/libstrongswan/asn1
parentcb38e2f30ad771e8985b6c45203a56fea00608ce (diff)
downloadstrongswan-594d847f791d33408ad266d8231228543447113a.tar.bz2
strongswan-594d847f791d33408ad266d8231228543447113a.tar.xz
PKCS#5 wrapper can decrypt PKCS#12-like schemes
Diffstat (limited to 'src/libstrongswan/asn1')
-rw-r--r--src/libstrongswan/asn1/oid.txt10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/libstrongswan/asn1/oid.txt b/src/libstrongswan/asn1/oid.txt
index 49ef1cdf2..8cbd07e4b 100644
--- a/src/libstrongswan/asn1/oid.txt
+++ b/src/libstrongswan/asn1/oid.txt
@@ -121,6 +121,14 @@
0x08 "unstructuredAddress" OID_UNSTRUCTURED_ADDRESS
0x0E "extensionRequest" OID_EXTENSION_REQUEST
0x0F "S/MIME Capabilities"
+ 0x0c "PKCS-12"
+ 0x01 "pbeIds"
+ 0x01 "pbeWithSHAAnd128BitRC4" OID_PBE_SHA1_RC4_128
+ 0x02 "pbeWithSHAAnd40BitRC4" OID_PBE_SHA1_RC4_40
+ 0x03 "pbeWithSHAAnd3-KeyTripleDES-CBC" OID_PBE_SHA1_3DES_CBC
+ 0x04 "pbeWithSHAAnd2-KeyTripleDES-CBC" OID_PBE_SHA1_3DES_2KEY_CBC
+ 0x05 "pbeWithSHAAnd128BitRC2-CBC" OID_PBE_SHA1_RC2_CBC_128
+ 0x06 "pbeWithSHAAnd40BitRC2-CBC" OID_PBE_SHA1_RC2_CBC_40
0x02 "digestAlgorithm"
0x02 "md2" OID_MD2
0x05 "md5" OID_MD5
@@ -240,7 +248,7 @@
0x05 "caRepository"
0x08 "ipsec"
0x02 "certificate"
- 0x02 "iKEIntermediate" OID_IKE_INTERMEDIATE
+ 0x02 "iKEIntermediate" OID_IKE_INTERMEDIATE
0x0E "oiw"
0x03 "secsig"
0x02 "algorithms"