summaryrefslogtreecommitdiff
path: root/src/libstrongswan/asn1
diff options
context:
space:
mode:
authorYves-Alexis Perez <corsac@debian.org>2013-08-25 15:37:26 +0200
committerYves-Alexis Perez <corsac@debian.org>2013-08-25 15:37:26 +0200
commit6b99c8d9cff7b3e8ae8f3204b99e7ea40f791349 (patch)
tree009fc492961e13860d2a4bc2de8caf2bbe2975e7 /src/libstrongswan/asn1
parentc83921a2b566aa9d55d8ccc7258f04fca6292ee6 (diff)
downloadvyos-strongswan-6b99c8d9cff7b3e8ae8f3204b99e7ea40f791349.tar.gz
vyos-strongswan-6b99c8d9cff7b3e8ae8f3204b99e7ea40f791349.zip
Imported Upstream version 5.1.0
Diffstat (limited to 'src/libstrongswan/asn1')
-rw-r--r--src/libstrongswan/asn1/asn1.c21
-rw-r--r--src/libstrongswan/asn1/asn1.h9
-rw-r--r--src/libstrongswan/asn1/oid.c789
-rw-r--r--src/libstrongswan/asn1/oid.h274
-rw-r--r--src/libstrongswan/asn1/oid.pl2
-rw-r--r--src/libstrongswan/asn1/oid.txt23
6 files changed, 598 insertions, 520 deletions
diff --git a/src/libstrongswan/asn1/asn1.c b/src/libstrongswan/asn1/asn1.c
index f438cb20e..d860ad9a2 100644
--- a/src/libstrongswan/asn1/asn1.c
+++ b/src/libstrongswan/asn1/asn1.c
@@ -549,6 +549,22 @@ bool asn1_parse_simple_object(chunk_t *object, asn1_t type, u_int level, const c
return TRUE;
}
+/*
+ * Described in header
+ */
+u_int64_t asn1_parse_integer_uint64(chunk_t blob)
+{
+ u_int64_t val = 0;
+ int i;
+
+ for (i = 0; i < blob.len; i++)
+ { /* if it is longer than 8 bytes, we just use the 8 LSBs */
+ val <<= 8;
+ val |= (u_int64_t)blob.ptr[i];
+ }
+ return val;
+}
+
/**
* ASN.1 definition of an algorithmIdentifier
*/
@@ -626,6 +642,11 @@ bool is_asn1(chunk_t blob)
len = asn1_length(&blob);
+ if (len == ASN1_INVALID_LENGTH)
+ {
+ return FALSE;
+ }
+
/* exact match */
if (len == blob.len)
{
diff --git a/src/libstrongswan/asn1/asn1.h b/src/libstrongswan/asn1/asn1.h
index 15ffff62e..a1d625380 100644
--- a/src/libstrongswan/asn1/asn1.h
+++ b/src/libstrongswan/asn1/asn1.h
@@ -171,6 +171,15 @@ bool asn1_parse_simple_object(chunk_t *object, asn1_t type, u_int level0,
const char* name);
/**
+ * Converts an ASN.1 INTEGER object to an u_int64_t. If the INTEGER is longer
+ * than 8 bytes only the 8 LSBs are returned.
+ *
+ * @param blob body of an ASN.1 coded integer object
+ * @return converted integer
+ */
+u_int64_t asn1_parse_integer_uint64(chunk_t blob);
+
+/**
* Print the value of an ASN.1 simple object
*
* @param object ASN.1 object to be printed
diff --git a/src/libstrongswan/asn1/oid.c b/src/libstrongswan/asn1/oid.c
index 686233fa3..a0e882b2c 100644
--- a/src/libstrongswan/asn1/oid.c
+++ b/src/libstrongswan/asn1/oid.c
@@ -10,389 +10,408 @@
#include "oid.h"
const oid_t oid_names[] = {
- {0x02, 7, 1, 0, "ITU-T Administration" }, /* 0 */
- { 0x82, 0, 1, 1, "" }, /* 1 */
- { 0x06, 0, 1, 2, "Germany ITU-T member" }, /* 2 */
- { 0x01, 0, 1, 3, "Deutsche Telekom AG" }, /* 3 */
- { 0x0A, 0, 1, 4, "" }, /* 4 */
- { 0x07, 0, 1, 5, "" }, /* 5 */
- { 0x14, 0, 0, 6, "ND" }, /* 6 */
- {0x09, 18, 1, 0, "data" }, /* 7 */
- { 0x92, 0, 1, 1, "" }, /* 8 */
- { 0x26, 0, 1, 2, "" }, /* 9 */
- { 0x89, 0, 1, 3, "" }, /* 10 */
- { 0x93, 0, 1, 4, "" }, /* 11 */
- { 0xF2, 0, 1, 5, "" }, /* 12 */
- { 0x2C, 0, 1, 6, "" }, /* 13 */
- { 0x64, 0, 1, 7, "pilot" }, /* 14 */
- { 0x01, 0, 1, 8, "pilotAttributeType" }, /* 15 */
- { 0x01, 17, 0, 9, "UID" }, /* 16 */
- { 0x19, 0, 0, 9, "DC" }, /* 17 */
- {0x55, 65, 1, 0, "X.500" }, /* 18 */
- { 0x04, 37, 1, 1, "X.509" }, /* 19 */
- { 0x03, 21, 0, 2, "CN" }, /* 20 */
- { 0x04, 22, 0, 2, "S" }, /* 21 */
- { 0x05, 23, 0, 2, "SN" }, /* 22 */
- { 0x06, 24, 0, 2, "C" }, /* 23 */
- { 0x07, 25, 0, 2, "L" }, /* 24 */
- { 0x08, 26, 0, 2, "ST" }, /* 25 */
- { 0x0A, 27, 0, 2, "O" }, /* 26 */
- { 0x0B, 28, 0, 2, "OU" }, /* 27 */
- { 0x0C, 29, 0, 2, "T" }, /* 28 */
- { 0x0D, 30, 0, 2, "D" }, /* 29 */
- { 0x24, 31, 0, 2, "userCertificate" }, /* 30 */
- { 0x29, 32, 0, 2, "N" }, /* 31 */
- { 0x2A, 33, 0, 2, "G" }, /* 32 */
- { 0x2B, 34, 0, 2, "I" }, /* 33 */
- { 0x2D, 35, 0, 2, "ID" }, /* 34 */
- { 0x2E, 36, 0, 2, "dnQualifier" }, /* 35 */
- { 0x48, 0, 0, 2, "role" }, /* 36 */
- { 0x1D, 0, 1, 1, "id-ce" }, /* 37 */
- { 0x09, 39, 0, 2, "subjectDirectoryAttrs" }, /* 38 */
- { 0x0E, 40, 0, 2, "subjectKeyIdentifier" }, /* 39 */
- { 0x0F, 41, 0, 2, "keyUsage" }, /* 40 */
- { 0x10, 42, 0, 2, "privateKeyUsagePeriod" }, /* 41 */
- { 0x11, 43, 0, 2, "subjectAltName" }, /* 42 */
- { 0x12, 44, 0, 2, "issuerAltName" }, /* 43 */
- { 0x13, 45, 0, 2, "basicConstraints" }, /* 44 */
- { 0x14, 46, 0, 2, "crlNumber" }, /* 45 */
- { 0x15, 47, 0, 2, "reasonCode" }, /* 46 */
- { 0x17, 48, 0, 2, "holdInstructionCode" }, /* 47 */
- { 0x18, 49, 0, 2, "invalidityDate" }, /* 48 */
- { 0x1B, 50, 0, 2, "deltaCrlIndicator" }, /* 49 */
- { 0x1C, 51, 0, 2, "issuingDistributionPoint" }, /* 50 */
- { 0x1D, 52, 0, 2, "certificateIssuer" }, /* 51 */
- { 0x1E, 53, 0, 2, "nameConstraints" }, /* 52 */
- { 0x1F, 54, 0, 2, "crlDistributionPoints" }, /* 53 */
- { 0x20, 56, 1, 2, "certificatePolicies" }, /* 54 */
- { 0x00, 0, 0, 3, "anyPolicy" }, /* 55 */
- { 0x21, 57, 0, 2, "policyMappings" }, /* 56 */
- { 0x23, 58, 0, 2, "authorityKeyIdentifier" }, /* 57 */
- { 0x24, 59, 0, 2, "policyConstraints" }, /* 58 */
- { 0x25, 61, 1, 2, "extendedKeyUsage" }, /* 59 */
- { 0x00, 0, 0, 3, "anyExtendedKeyUsage" }, /* 60 */
- { 0x2E, 62, 0, 2, "freshestCRL" }, /* 61 */
- { 0x36, 63, 0, 2, "inhibitAnyPolicy" }, /* 62 */
- { 0x37, 64, 0, 2, "targetInformation" }, /* 63 */
- { 0x38, 0, 0, 2, "noRevAvail" }, /* 64 */
- {0x2A, 169, 1, 0, "" }, /* 65 */
- { 0x83, 78, 1, 1, "" }, /* 66 */
- { 0x08, 0, 1, 2, "jp" }, /* 67 */
- { 0x8C, 0, 1, 3, "" }, /* 68 */
- { 0x9A, 0, 1, 4, "" }, /* 69 */
- { 0x4B, 0, 1, 5, "" }, /* 70 */
- { 0x3D, 0, 1, 6, "" }, /* 71 */
- { 0x01, 0, 1, 7, "security" }, /* 72 */
- { 0x01, 0, 1, 8, "algorithm" }, /* 73 */
- { 0x01, 0, 1, 9, "symm-encryption-alg" }, /* 74 */
- { 0x02, 76, 0, 10, "camellia128-cbc" }, /* 75 */
- { 0x03, 77, 0, 10, "camellia192-cbc" }, /* 76 */
- { 0x04, 0, 0, 10, "camellia256-cbc" }, /* 77 */
- { 0x86, 0, 1, 1, "" }, /* 78 */
- { 0x48, 0, 1, 2, "us" }, /* 79 */
- { 0x86, 128, 1, 3, "" }, /* 80 */
- { 0xF6, 86, 1, 4, "" }, /* 81 */
- { 0x7D, 0, 1, 5, "NortelNetworks" }, /* 82 */
- { 0x07, 0, 1, 6, "Entrust" }, /* 83 */
- { 0x41, 0, 1, 7, "nsn-ce" }, /* 84 */
- { 0x00, 0, 0, 8, "entrustVersInfo" }, /* 85 */
- { 0xF7, 0, 1, 4, "" }, /* 86 */
- { 0x0D, 0, 1, 5, "RSADSI" }, /* 87 */
- { 0x01, 123, 1, 6, "PKCS" }, /* 88 */
- { 0x01, 100, 1, 7, "PKCS-1" }, /* 89 */
- { 0x01, 91, 0, 8, "rsaEncryption" }, /* 90 */
- { 0x02, 92, 0, 8, "md2WithRSAEncryption" }, /* 91 */
- { 0x04, 93, 0, 8, "md5WithRSAEncryption" }, /* 92 */
- { 0x05, 94, 0, 8, "sha-1WithRSAEncryption" }, /* 93 */
- { 0x07, 95, 0, 8, "id-RSAES-OAEP" }, /* 94 */
- { 0x09, 96, 0, 8, "id-pSpecified" }, /* 95 */
- { 0x0B, 97, 0, 8, "sha256WithRSAEncryption" }, /* 96 */
- { 0x0C, 98, 0, 8, "sha384WithRSAEncryption" }, /* 97 */
- { 0x0D, 99, 0, 8, "sha512WithRSAEncryption" }, /* 98 */
- { 0x0E, 0, 0, 8, "sha224WithRSAEncryption" }, /* 99 */
- { 0x05, 105, 1, 7, "PKCS-5" }, /* 100 */
- { 0x03, 102, 0, 8, "pbeWithMD5AndDES-CBC" }, /* 101 */
- { 0x0A, 103, 0, 8, "pbeWithSHA1AndDES-CBC" }, /* 102 */
- { 0x0C, 104, 0, 8, "id-PBKDF2" }, /* 103 */
- { 0x0D, 0, 0, 8, "id-PBES2" }, /* 104 */
- { 0x07, 112, 1, 7, "PKCS-7" }, /* 105 */
- { 0x01, 107, 0, 8, "data" }, /* 106 */
- { 0x02, 108, 0, 8, "signedData" }, /* 107 */
- { 0x03, 109, 0, 8, "envelopedData" }, /* 108 */
- { 0x04, 110, 0, 8, "signedAndEnvelopedData" }, /* 109 */
- { 0x05, 111, 0, 8, "digestedData" }, /* 110 */
- { 0x06, 0, 0, 8, "encryptedData" }, /* 111 */
- { 0x09, 0, 1, 7, "PKCS-9" }, /* 112 */
- { 0x01, 114, 0, 8, "E" }, /* 113 */
- { 0x02, 115, 0, 8, "unstructuredName" }, /* 114 */
- { 0x03, 116, 0, 8, "contentType" }, /* 115 */
- { 0x04, 117, 0, 8, "messageDigest" }, /* 116 */
- { 0x05, 118, 0, 8, "signingTime" }, /* 117 */
- { 0x06, 119, 0, 8, "counterSignature" }, /* 118 */
- { 0x07, 120, 0, 8, "challengePassword" }, /* 119 */
- { 0x08, 121, 0, 8, "unstructuredAddress" }, /* 120 */
- { 0x0E, 122, 0, 8, "extensionRequest" }, /* 121 */
- { 0x0F, 0, 0, 8, "S/MIME Capabilities" }, /* 122 */
- { 0x02, 126, 1, 6, "digestAlgorithm" }, /* 123 */
- { 0x02, 125, 0, 7, "md2" }, /* 124 */
- { 0x05, 0, 0, 7, "md5" }, /* 125 */
- { 0x03, 0, 1, 6, "encryptionAlgorithm" }, /* 126 */
- { 0x07, 0, 0, 7, "3des-ede-cbc" }, /* 127 */
- { 0xCE, 0, 1, 3, "" }, /* 128 */
- { 0x3D, 0, 1, 4, "ansi-X9-62" }, /* 129 */
- { 0x02, 132, 1, 5, "id-publicKeyType" }, /* 130 */
- { 0x01, 0, 0, 6, "id-ecPublicKey" }, /* 131 */
- { 0x03, 162, 1, 5, "ellipticCurve" }, /* 132 */
- { 0x00, 154, 1, 6, "c-TwoCurve" }, /* 133 */
- { 0x01, 135, 0, 7, "c2pnb163v1" }, /* 134 */
- { 0x02, 136, 0, 7, "c2pnb163v2" }, /* 135 */
- { 0x03, 137, 0, 7, "c2pnb163v3" }, /* 136 */
- { 0x04, 138, 0, 7, "c2pnb176w1" }, /* 137 */
- { 0x05, 139, 0, 7, "c2tnb191v1" }, /* 138 */
- { 0x06, 140, 0, 7, "c2tnb191v2" }, /* 139 */
- { 0x07, 141, 0, 7, "c2tnb191v3" }, /* 140 */
- { 0x08, 142, 0, 7, "c2onb191v4" }, /* 141 */
- { 0x09, 143, 0, 7, "c2onb191v5" }, /* 142 */
- { 0x0A, 144, 0, 7, "c2pnb208w1" }, /* 143 */
- { 0x0B, 145, 0, 7, "c2tnb239v1" }, /* 144 */
- { 0x0C, 146, 0, 7, "c2tnb239v2" }, /* 145 */
- { 0x0D, 147, 0, 7, "c2tnb239v3" }, /* 146 */
- { 0x0E, 148, 0, 7, "c2onb239v4" }, /* 147 */
- { 0x0F, 149, 0, 7, "c2onb239v5" }, /* 148 */
- { 0x10, 150, 0, 7, "c2pnb272w1" }, /* 149 */
- { 0x11, 151, 0, 7, "c2pnb304w1" }, /* 150 */
- { 0x12, 152, 0, 7, "c2tnb359v1" }, /* 151 */
- { 0x13, 153, 0, 7, "c2pnb368w1" }, /* 152 */
- { 0x14, 0, 0, 7, "c2tnb431r1" }, /* 153 */
- { 0x01, 0, 1, 6, "primeCurve" }, /* 154 */
- { 0x01, 156, 0, 7, "prime192v1" }, /* 155 */
- { 0x02, 157, 0, 7, "prime192v2" }, /* 156 */
- { 0x03, 158, 0, 7, "prime192v3" }, /* 157 */
- { 0x04, 159, 0, 7, "prime239v1" }, /* 158 */
- { 0x05, 160, 0, 7, "prime239v2" }, /* 159 */
- { 0x06, 161, 0, 7, "prime239v3" }, /* 160 */
- { 0x07, 0, 0, 7, "prime256v1" }, /* 161 */
- { 0x04, 0, 1, 5, "id-ecSigType" }, /* 162 */
- { 0x01, 164, 0, 6, "ecdsa-with-SHA1" }, /* 163 */
- { 0x03, 0, 1, 6, "ecdsa-with-Specified" }, /* 164 */
- { 0x01, 166, 0, 7, "ecdsa-with-SHA224" }, /* 165 */
- { 0x02, 167, 0, 7, "ecdsa-with-SHA256" }, /* 166 */
- { 0x03, 168, 0, 7, "ecdsa-with-SHA384" }, /* 167 */
- { 0x04, 0, 0, 7, "ecdsa-with-SHA512" }, /* 168 */
- {0x2B, 329, 1, 0, "" }, /* 169 */
- { 0x06, 243, 1, 1, "dod" }, /* 170 */
- { 0x01, 0, 1, 2, "internet" }, /* 171 */
- { 0x04, 194, 1, 3, "private" }, /* 172 */
- { 0x01, 0, 1, 4, "enterprise" }, /* 173 */
- { 0x82, 187, 1, 5, "" }, /* 174 */
- { 0x37, 184, 1, 6, "Microsoft" }, /* 175 */
- { 0x0A, 180, 1, 7, "" }, /* 176 */
- { 0x03, 0, 1, 8, "" }, /* 177 */
- { 0x03, 179, 0, 9, "msSGC" }, /* 178 */
- { 0x04, 0, 0, 9, "msEncryptingFileSystem" }, /* 179 */
- { 0x14, 0, 1, 7, "msEnrollmentInfrastructure"}, /* 180 */
- { 0x02, 0, 1, 8, "msCertificateTypeExtension"}, /* 181 */
- { 0x02, 183, 0, 9, "msSmartcardLogon" }, /* 182 */
- { 0x03, 0, 0, 9, "msUPN" }, /* 183 */
- { 0xA0, 0, 1, 6, "" }, /* 184 */
- { 0x2A, 0, 1, 7, "ITA" }, /* 185 */
- { 0x01, 0, 0, 8, "strongSwan" }, /* 186 */
- { 0x89, 0, 1, 5, "" }, /* 187 */
- { 0x31, 0, 1, 6, "" }, /* 188 */
- { 0x01, 0, 1, 7, "" }, /* 189 */
- { 0x01, 0, 1, 8, "" }, /* 190 */
- { 0x02, 0, 1, 9, "" }, /* 191 */
- { 0x02, 0, 1, 10, "" }, /* 192 */
- { 0x4B, 0, 0, 11, "TCGID" }, /* 193 */
- { 0x05, 0, 1, 3, "security" }, /* 194 */
- { 0x05, 0, 1, 4, "mechanisms" }, /* 195 */
- { 0x07, 240, 1, 5, "id-pkix" }, /* 196 */
- { 0x01, 201, 1, 6, "id-pe" }, /* 197 */
- { 0x01, 199, 0, 7, "authorityInfoAccess" }, /* 198 */
- { 0x03, 200, 0, 7, "qcStatements" }, /* 199 */
- { 0x07, 0, 0, 7, "ipAddrBlocks" }, /* 200 */
- { 0x02, 204, 1, 6, "id-qt" }, /* 201 */
- { 0x01, 203, 0, 7, "cps" }, /* 202 */
- { 0x02, 0, 0, 7, "unotice" }, /* 203 */
- { 0x03, 214, 1, 6, "id-kp" }, /* 204 */
- { 0x01, 206, 0, 7, "serverAuth" }, /* 205 */
- { 0x02, 207, 0, 7, "clientAuth" }, /* 206 */
- { 0x03, 208, 0, 7, "codeSigning" }, /* 207 */
- { 0x04, 209, 0, 7, "emailProtection" }, /* 208 */
- { 0x05, 210, 0, 7, "ipsecEndSystem" }, /* 209 */
- { 0x06, 211, 0, 7, "ipsecTunnel" }, /* 210 */
- { 0x07, 212, 0, 7, "ipsecUser" }, /* 211 */
- { 0x08, 213, 0, 7, "timeStamping" }, /* 212 */
- { 0x09, 0, 0, 7, "ocspSigning" }, /* 213 */
- { 0x08, 222, 1, 6, "id-otherNames" }, /* 214 */
- { 0x01, 216, 0, 7, "personalData" }, /* 215 */
- { 0x02, 217, 0, 7, "userGroup" }, /* 216 */
- { 0x03, 218, 0, 7, "id-on-permanentIdentifier" }, /* 217 */
- { 0x04, 219, 0, 7, "id-on-hardwareModuleName" }, /* 218 */
- { 0x05, 220, 0, 7, "xmppAddr" }, /* 219 */
- { 0x06, 221, 0, 7, "id-on-SIM" }, /* 220 */
- { 0x07, 0, 0, 7, "id-on-dnsSRV" }, /* 221 */
- { 0x0A, 227, 1, 6, "id-aca" }, /* 222 */
- { 0x01, 224, 0, 7, "authenticationInfo" }, /* 223 */
- { 0x02, 225, 0, 7, "accessIdentity" }, /* 224 */
- { 0x03, 226, 0, 7, "chargingIdentity" }, /* 225 */
- { 0x04, 0, 0, 7, "group" }, /* 226 */
- { 0x0B, 228, 0, 6, "subjectInfoAccess" }, /* 227 */
- { 0x30, 0, 1, 6, "id-ad" }, /* 228 */
- { 0x01, 237, 1, 7, "ocsp" }, /* 229 */
- { 0x01, 231, 0, 8, "basic" }, /* 230 */
- { 0x02, 232, 0, 8, "nonce" }, /* 231 */
- { 0x03, 233, 0, 8, "crl" }, /* 232 */
- { 0x04, 234, 0, 8, "response" }, /* 233 */
- { 0x05, 235, 0, 8, "noCheck" }, /* 234 */
- { 0x06, 236, 0, 8, "archiveCutoff" }, /* 235 */
- { 0x07, 0, 0, 8, "serviceLocator" }, /* 236 */
- { 0x02, 238, 0, 7, "caIssuers" }, /* 237 */
- { 0x03, 239, 0, 7, "timeStamping" }, /* 238 */
- { 0x05, 0, 0, 7, "caRepository" }, /* 239 */
- { 0x08, 0, 1, 5, "ipsec" }, /* 240 */
- { 0x02, 0, 1, 6, "certificate" }, /* 241 */
- { 0x02, 0, 0, 7, "iKEIntermediate" }, /* 242 */
- { 0x0E, 249, 1, 1, "oiw" }, /* 243 */
- { 0x03, 0, 1, 2, "secsig" }, /* 244 */
- { 0x02, 0, 1, 3, "algorithms" }, /* 245 */
- { 0x07, 247, 0, 4, "des-cbc" }, /* 246 */
- { 0x1A, 248, 0, 4, "sha-1" }, /* 247 */
- { 0x1D, 0, 0, 4, "sha-1WithRSASignature" }, /* 248 */
- { 0x24, 295, 1, 1, "TeleTrusT" }, /* 249 */
- { 0x03, 0, 1, 2, "algorithm" }, /* 250 */
- { 0x03, 0, 1, 3, "signatureAlgorithm" }, /* 251 */
- { 0x01, 256, 1, 4, "rsaSignature" }, /* 252 */
- { 0x02, 254, 0, 5, "rsaSigWithripemd160" }, /* 253 */
- { 0x03, 255, 0, 5, "rsaSigWithripemd128" }, /* 254 */
- { 0x04, 0, 0, 5, "rsaSigWithripemd256" }, /* 255 */
- { 0x02, 0, 1, 4, "ecSign" }, /* 256 */
- { 0x01, 258, 0, 5, "ecSignWithsha1" }, /* 257 */
- { 0x02, 259, 0, 5, "ecSignWithripemd160" }, /* 258 */
- { 0x03, 260, 0, 5, "ecSignWithmd2" }, /* 259 */
- { 0x04, 261, 0, 5, "ecSignWithmd5" }, /* 260 */
- { 0x05, 278, 1, 5, "ttt-ecg" }, /* 261 */
- { 0x01, 266, 1, 6, "fieldType" }, /* 262 */
- { 0x01, 0, 1, 7, "characteristictwoField" }, /* 263 */
- { 0x01, 0, 1, 8, "basisType" }, /* 264 */
- { 0x01, 0, 0, 9, "ipBasis" }, /* 265 */
- { 0x02, 268, 1, 6, "keyType" }, /* 266 */
- { 0x01, 0, 0, 7, "ecgPublicKey" }, /* 267 */
- { 0x03, 269, 0, 6, "curve" }, /* 268 */
- { 0x04, 276, 1, 6, "signatures" }, /* 269 */
- { 0x01, 271, 0, 7, "ecgdsa-with-RIPEMD160" }, /* 270 */
- { 0x02, 272, 0, 7, "ecgdsa-with-SHA1" }, /* 271 */
- { 0x03, 273, 0, 7, "ecgdsa-with-SHA224" }, /* 272 */
- { 0x04, 274, 0, 7, "ecgdsa-with-SHA256" }, /* 273 */
- { 0x05, 275, 0, 7, "ecgdsa-with-SHA384" }, /* 274 */
- { 0x06, 0, 0, 7, "ecgdsa-with-SHA512" }, /* 275 */
- { 0x05, 0, 1, 6, "module" }, /* 276 */
- { 0x01, 0, 0, 7, "1" }, /* 277 */
- { 0x08, 0, 1, 5, "ecStdCurvesAndGeneration" }, /* 278 */
- { 0x01, 0, 1, 6, "ellipticCurve" }, /* 279 */
- { 0x01, 0, 1, 7, "versionOne" }, /* 280 */
- { 0x01, 282, 0, 8, "brainpoolP160r1" }, /* 281 */
- { 0x02, 283, 0, 8, "brainpoolP160t1" }, /* 282 */
- { 0x03, 284, 0, 8, "brainpoolP192r1" }, /* 283 */
- { 0x04, 285, 0, 8, "brainpoolP192t1" }, /* 284 */
- { 0x05, 286, 0, 8, "brainpoolP224r1" }, /* 285 */
- { 0x06, 287, 0, 8, "brainpoolP224t1" }, /* 286 */
- { 0x07, 288, 0, 8, "brainpoolP256r1" }, /* 287 */
- { 0x08, 289, 0, 8, "brainpoolP256t1" }, /* 288 */
- { 0x09, 290, 0, 8, "brainpoolP320r1" }, /* 289 */
- { 0x0A, 291, 0, 8, "brainpoolP320t1" }, /* 290 */
- { 0x0B, 292, 0, 8, "brainpoolP384r1" }, /* 291 */
- { 0x0C, 293, 0, 8, "brainpoolP384t1" }, /* 292 */
- { 0x0D, 294, 0, 8, "brainpoolP512r1" }, /* 293 */
- { 0x0E, 0, 0, 8, "brainpoolP512t1" }, /* 294 */
- { 0x81, 0, 1, 1, "" }, /* 295 */
- { 0x04, 0, 1, 2, "Certicom" }, /* 296 */
- { 0x00, 0, 1, 3, "curve" }, /* 297 */
- { 0x01, 299, 0, 4, "sect163k1" }, /* 298 */
- { 0x02, 300, 0, 4, "sect163r1" }, /* 299 */
- { 0x03, 301, 0, 4, "sect239k1" }, /* 300 */
- { 0x04, 302, 0, 4, "sect113r1" }, /* 301 */
- { 0x05, 303, 0, 4, "sect113r2" }, /* 302 */
- { 0x06, 304, 0, 4, "secp112r1" }, /* 303 */
- { 0x07, 305, 0, 4, "secp112r2" }, /* 304 */
- { 0x08, 306, 0, 4, "secp160r1" }, /* 305 */
- { 0x09, 307, 0, 4, "secp160k1" }, /* 306 */
- { 0x0A, 308, 0, 4, "secp256k1" }, /* 307 */
- { 0x0F, 309, 0, 4, "sect163r2" }, /* 308 */
- { 0x10, 310, 0, 4, "sect283k1" }, /* 309 */
- { 0x11, 311, 0, 4, "sect283r1" }, /* 310 */
- { 0x16, 312, 0, 4, "sect131r1" }, /* 311 */
- { 0x17, 313, 0, 4, "sect131r2" }, /* 312 */
- { 0x18, 314, 0, 4, "sect193r1" }, /* 313 */
- { 0x19, 315, 0, 4, "sect193r2" }, /* 314 */
- { 0x1A, 316, 0, 4, "sect233k1" }, /* 315 */
- { 0x1B, 317, 0, 4, "sect233r1" }, /* 316 */
- { 0x1C, 318, 0, 4, "secp128r1" }, /* 317 */
- { 0x1D, 319, 0, 4, "secp128r2" }, /* 318 */
- { 0x1E, 320, 0, 4, "secp160r2" }, /* 319 */
- { 0x1F, 321, 0, 4, "secp192k1" }, /* 320 */
- { 0x20, 322, 0, 4, "secp224k1" }, /* 321 */
- { 0x21, 323, 0, 4, "secp224r1" }, /* 322 */
- { 0x22, 324, 0, 4, "secp384r1" }, /* 323 */
- { 0x23, 325, 0, 4, "secp521r1" }, /* 324 */
- { 0x24, 326, 0, 4, "sect409k1" }, /* 325 */
- { 0x25, 327, 0, 4, "sect409r1" }, /* 326 */
- { 0x26, 328, 0, 4, "sect571k1" }, /* 327 */
- { 0x27, 0, 0, 4, "sect571r1" }, /* 328 */
- {0x60, 377, 1, 0, "" }, /* 329 */
- { 0x86, 0, 1, 1, "" }, /* 330 */
- { 0x48, 0, 1, 2, "" }, /* 331 */
- { 0x01, 0, 1, 3, "organization" }, /* 332 */
- { 0x65, 353, 1, 4, "gov" }, /* 333 */
- { 0x03, 0, 1, 5, "csor" }, /* 334 */
- { 0x04, 0, 1, 6, "nistalgorithm" }, /* 335 */
- { 0x01, 346, 1, 7, "aes" }, /* 336 */
- { 0x02, 338, 0, 8, "id-aes128-CBC" }, /* 337 */
- { 0x06, 339, 0, 8, "id-aes128-GCM" }, /* 338 */
- { 0x07, 340, 0, 8, "id-aes128-CCM" }, /* 339 */
- { 0x16, 341, 0, 8, "id-aes192-CBC" }, /* 340 */
- { 0x1A, 342, 0, 8, "id-aes192-GCM" }, /* 341 */
- { 0x1B, 343, 0, 8, "id-aes192-CCM" }, /* 342 */
- { 0x2A, 344, 0, 8, "id-aes256-CBC" }, /* 343 */
- { 0x2E, 345, 0, 8, "id-aes256-GCM" }, /* 344 */
- { 0x2F, 0, 0, 8, "id-aes256-CCM" }, /* 345 */
- { 0x02, 0, 1, 7, "hashalgs" }, /* 346 */
- { 0x01, 348, 0, 8, "id-SHA-256" }, /* 347 */
- { 0x02, 349, 0, 8, "id-SHA-384" }, /* 348 */
- { 0x03, 350, 0, 8, "id-SHA-512" }, /* 349 */
- { 0x04, 351, 0, 8, "id-SHA-224" }, /* 350 */
- { 0x05, 352, 0, 8, "id-SHA-512-224" }, /* 351 */
- { 0x06, 0, 0, 8, "id-SHA-512-256" }, /* 352 */
- { 0x86, 0, 1, 4, "" }, /* 353 */
- { 0xf8, 0, 1, 5, "" }, /* 354 */
- { 0x42, 367, 1, 6, "netscape" }, /* 355 */
- { 0x01, 362, 1, 7, "" }, /* 356 */
- { 0x01, 358, 0, 8, "nsCertType" }, /* 357 */
- { 0x03, 359, 0, 8, "nsRevocationUrl" }, /* 358 */
- { 0x04, 360, 0, 8, "nsCaRevocationUrl" }, /* 359 */
- { 0x08, 361, 0, 8, "nsCaPolicyUrl" }, /* 360 */
- { 0x0d, 0, 0, 8, "nsComment" }, /* 361 */
- { 0x03, 365, 1, 7, "directory" }, /* 362 */
- { 0x01, 0, 1, 8, "" }, /* 363 */
- { 0x03, 0, 0, 9, "employeeNumber" }, /* 364 */
- { 0x04, 0, 1, 7, "policy" }, /* 365 */
- { 0x01, 0, 0, 8, "nsSGC" }, /* 366 */
- { 0x45, 0, 1, 6, "verisign" }, /* 367 */
- { 0x01, 0, 1, 7, "pki" }, /* 368 */
- { 0x09, 0, 1, 8, "attributes" }, /* 369 */
- { 0x02, 371, 0, 9, "messageType" }, /* 370 */
- { 0x03, 372, 0, 9, "pkiStatus" }, /* 371 */
- { 0x04, 373, 0, 9, "failInfo" }, /* 372 */
- { 0x05, 374, 0, 9, "senderNonce" }, /* 373 */
- { 0x06, 375, 0, 9, "recipientNonce" }, /* 374 */
- { 0x07, 376, 0, 9, "transID" }, /* 375 */
- { 0x08, 0, 0, 9, "extensionReq" }, /* 376 */
- {0x67, 0, 1, 0, "" }, /* 377 */
- { 0x81, 0, 1, 1, "" }, /* 378 */
- { 0x05, 0, 1, 2, "" }, /* 379 */
- { 0x02, 0, 1, 3, "tcg-attribute" }, /* 380 */
- { 0x01, 382, 0, 4, "tcg-at-tpmManufacturer" }, /* 381 */
- { 0x02, 383, 0, 4, "tcg-at-tpmModel" }, /* 382 */
- { 0x03, 384, 0, 4, "tcg-at-tpmVersion" }, /* 383 */
- { 0x0F, 0, 0, 4, "tcg-at-tpmIdLabel" } /* 384 */
+ {0x02, 7, 1, 0, "ITU-T Administration" }, /* 0 */
+ { 0x82, 0, 1, 1, "" }, /* 1 */
+ { 0x06, 0, 1, 2, "Germany ITU-T member" }, /* 2 */
+ { 0x01, 0, 1, 3, "Deutsche Telekom AG" }, /* 3 */
+ { 0x0A, 0, 1, 4, "" }, /* 4 */
+ { 0x07, 0, 1, 5, "" }, /* 5 */
+ { 0x14, 0, 0, 6, "ND" }, /* 6 */
+ {0x09, 18, 1, 0, "data" }, /* 7 */
+ { 0x92, 0, 1, 1, "" }, /* 8 */
+ { 0x26, 0, 1, 2, "" }, /* 9 */
+ { 0x89, 0, 1, 3, "" }, /* 10 */
+ { 0x93, 0, 1, 4, "" }, /* 11 */
+ { 0xF2, 0, 1, 5, "" }, /* 12 */
+ { 0x2C, 0, 1, 6, "" }, /* 13 */
+ { 0x64, 0, 1, 7, "pilot" }, /* 14 */
+ { 0x01, 0, 1, 8, "pilotAttributeType" }, /* 15 */
+ { 0x01, 17, 0, 9, "UID" }, /* 16 */
+ { 0x19, 0, 0, 9, "DC" }, /* 17 */
+ {0x55, 65, 1, 0, "X.500" }, /* 18 */
+ { 0x04, 37, 1, 1, "X.509" }, /* 19 */
+ { 0x03, 21, 0, 2, "CN" }, /* 20 */
+ { 0x04, 22, 0, 2, "S" }, /* 21 */
+ { 0x05, 23, 0, 2, "SN" }, /* 22 */
+ { 0x06, 24, 0, 2, "C" }, /* 23 */
+ { 0x07, 25, 0, 2, "L" }, /* 24 */
+ { 0x08, 26, 0, 2, "ST" }, /* 25 */
+ { 0x0A, 27, 0, 2, "O" }, /* 26 */
+ { 0x0B, 28, 0, 2, "OU" }, /* 27 */
+ { 0x0C, 29, 0, 2, "T" }, /* 28 */
+ { 0x0D, 30, 0, 2, "D" }, /* 29 */
+ { 0x24, 31, 0, 2, "userCertificate" }, /* 30 */
+ { 0x29, 32, 0, 2, "N" }, /* 31 */
+ { 0x2A, 33, 0, 2, "G" }, /* 32 */
+ { 0x2B, 34, 0, 2, "I" }, /* 33 */
+ { 0x2D, 35, 0, 2, "ID" }, /* 34 */
+ { 0x2E, 36, 0, 2, "dnQualifier" }, /* 35 */
+ { 0x48, 0, 0, 2, "role" }, /* 36 */
+ { 0x1D, 0, 1, 1, "id-ce" }, /* 37 */
+ { 0x09, 39, 0, 2, "subjectDirectoryAttrs" }, /* 38 */
+ { 0x0E, 40, 0, 2, "subjectKeyIdentifier" }, /* 39 */
+ { 0x0F, 41, 0, 2, "keyUsage" }, /* 40 */
+ { 0x10, 42, 0, 2, "privateKeyUsagePeriod" }, /* 41 */
+ { 0x11, 43, 0, 2, "subjectAltName" }, /* 42 */
+ { 0x12, 44, 0, 2, "issuerAltName" }, /* 43 */
+ { 0x13, 45, 0, 2, "basicConstraints" }, /* 44 */
+ { 0x14, 46, 0, 2, "crlNumber" }, /* 45 */
+ { 0x15, 47, 0, 2, "reasonCode" }, /* 46 */
+ { 0x17, 48, 0, 2, "holdInstructionCode" }, /* 47 */
+ { 0x18, 49, 0, 2, "invalidityDate" }, /* 48 */
+ { 0x1B, 50, 0, 2, "deltaCrlIndicator" }, /* 49 */
+ { 0x1C, 51, 0, 2, "issuingDistributionPoint" }, /* 50 */
+ { 0x1D, 52, 0, 2, "certificateIssuer" }, /* 51 */
+ { 0x1E, 53, 0, 2, "nameConstraints" }, /* 52 */
+ { 0x1F, 54, 0, 2, "crlDistributionPoints" }, /* 53 */
+ { 0x20, 56, 1, 2, "certificatePolicies" }, /* 54 */
+ { 0x00, 0, 0, 3, "anyPolicy" }, /* 55 */
+ { 0x21, 57, 0, 2, "policyMappings" }, /* 56 */
+ { 0x23, 58, 0, 2, "authorityKeyIdentifier" }, /* 57 */
+ { 0x24, 59, 0, 2, "policyConstraints" }, /* 58 */
+ { 0x25, 61, 1, 2, "extendedKeyUsage" }, /* 59 */
+ { 0x00, 0, 0, 3, "anyExtendedKeyUsage" }, /* 60 */
+ { 0x2E, 62, 0, 2, "freshestCRL" }, /* 61 */
+ { 0x36, 63, 0, 2, "inhibitAnyPolicy" }, /* 62 */
+ { 0x37, 64, 0, 2, "targetInformation" }, /* 63 */
+ { 0x38, 0, 0, 2, "noRevAvail" }, /* 64 */
+ {0x2A, 188, 1, 0, "" }, /* 65 */
+ { 0x83, 78, 1, 1, "" }, /* 66 */
+ { 0x08, 0, 1, 2, "jp" }, /* 67 */
+ { 0x8C, 0, 1, 3, "" }, /* 68 */
+ { 0x9A, 0, 1, 4, "" }, /* 69 */
+ { 0x4B, 0, 1, 5, "" }, /* 70 */
+ { 0x3D, 0, 1, 6, "" }, /* 71 */
+ { 0x01, 0, 1, 7, "security" }, /* 72 */
+ { 0x01, 0, 1, 8, "algorithm" }, /* 73 */
+ { 0x01, 0, 1, 9, "symm-encryption-alg" }, /* 74 */
+ { 0x02, 76, 0, 10, "camellia128-cbc" }, /* 75 */
+ { 0x03, 77, 0, 10, "camellia192-cbc" }, /* 76 */
+ { 0x04, 0, 0, 10, "camellia256-cbc" }, /* 77 */
+ { 0x86, 0, 1, 1, "" }, /* 78 */
+ { 0x48, 0, 1, 2, "us" }, /* 79 */
+ { 0x86, 147, 1, 3, "" }, /* 80 */
+ { 0xF6, 86, 1, 4, "" }, /* 81 */
+ { 0x7D, 0, 1, 5, "NortelNetworks" }, /* 82 */
+ { 0x07, 0, 1, 6, "Entrust" }, /* 83 */
+ { 0x41, 0, 1, 7, "nsn-ce" }, /* 84 */
+ { 0x00, 0, 0, 8, "entrustVersInfo" }, /* 85 */
+ { 0xF7, 0, 1, 4, "" }, /* 86 */
+ { 0x0D, 0, 1, 5, "RSADSI" }, /* 87 */
+ { 0x01, 142, 1, 6, "PKCS" }, /* 88 */
+ { 0x01, 100, 1, 7, "PKCS-1" }, /* 89 */
+ { 0x01, 91, 0, 8, "rsaEncryption" }, /* 90 */
+ { 0x02, 92, 0, 8, "md2WithRSAEncryption" }, /* 91 */
+ { 0x04, 93, 0, 8, "md5WithRSAEncryption" }, /* 92 */
+ { 0x05, 94, 0, 8, "sha-1WithRSAEncryption" }, /* 93 */
+ { 0x07, 95, 0, 8, "id-RSAES-OAEP" }, /* 94 */
+ { 0x09, 96, 0, 8, "id-pSpecified" }, /* 95 */
+ { 0x0B, 97, 0, 8, "sha256WithRSAEncryption" }, /* 96 */
+ { 0x0C, 98, 0, 8, "sha384WithRSAEncryption" }, /* 97 */
+ { 0x0D, 99, 0, 8, "sha512WithRSAEncryption" }, /* 98 */
+ { 0x0E, 0, 0, 8, "sha224WithRSAEncryption" }, /* 99 */
+ { 0x05, 105, 1, 7, "PKCS-5" }, /* 100 */
+ { 0x03, 102, 0, 8, "pbeWithMD5AndDES-CBC" }, /* 101 */
+ { 0x0A, 103, 0, 8, "pbeWithSHA1AndDES-CBC" }, /* 102 */
+ { 0x0C, 104, 0, 8, "id-PBKDF2" }, /* 103 */
+ { 0x0D, 0, 0, 8, "id-PBES2" }, /* 104 */
+ { 0x07, 112, 1, 7, "PKCS-7" }, /* 105 */
+ { 0x01, 107, 0, 8, "data" }, /* 106 */
+ { 0x02, 108, 0, 8, "signedData" }, /* 107 */
+ { 0x03, 109, 0, 8, "envelopedData" }, /* 108 */
+ { 0x04, 110, 0, 8, "signedAndEnvelopedData" }, /* 109 */
+ { 0x05, 111, 0, 8, "digestedData" }, /* 110 */
+ { 0x06, 0, 0, 8, "encryptedData" }, /* 111 */
+ { 0x09, 126, 1, 7, "PKCS-9" }, /* 112 */
+ { 0x01, 114, 0, 8, "E" }, /* 113 */
+ { 0x02, 115, 0, 8, "unstructuredName" }, /* 114 */
+ { 0x03, 116, 0, 8, "contentType" }, /* 115 */
+ { 0x04, 117, 0, 8, "messageDigest" }, /* 116 */
+ { 0x05, 118, 0, 8, "signingTime" }, /* 117 */
+ { 0x06, 119, 0, 8, "counterSignature" }, /* 118 */
+ { 0x07, 120, 0, 8, "challengePassword" }, /* 119 */
+ { 0x08, 121, 0, 8, "unstructuredAddress" }, /* 120 */
+ { 0x0E, 122, 0, 8, "extensionRequest" }, /* 121 */
+ { 0x0F, 123, 0, 8, "S/MIME Capabilities" }, /* 122 */
+ { 0x16, 0, 1, 8, "certTypes" }, /* 123 */
+ { 0x01, 125, 0, 9, "X.509" }, /* 124 */
+ { 0x02, 0, 0, 9, "SDSI" }, /* 125 */
+ { 0x0c, 0, 1, 7, "PKCS-12" }, /* 126 */
+ { 0x01, 134, 1, 8, "pbeIds" }, /* 127 */
+ { 0x01, 129, 0, 9, "pbeWithSHAAnd128BitRC4" }, /* 128 */
+ { 0x02, 130, 0, 9, "pbeWithSHAAnd40BitRC4" }, /* 129 */
+ { 0x03, 131, 0, 9, "pbeWithSHAAnd3-KeyTripleDES-CBC"}, /* 130 */
+ { 0x04, 132, 0, 9, "pbeWithSHAAnd2-KeyTripleDES-CBC"}, /* 131 */
+ { 0x05, 133, 0, 9, "pbeWithSHAAnd128BitRC2-CBC" }, /* 132 */
+ { 0x06, 0, 0, 9, "pbeWithSHAAnd40BitRC2-CBC" }, /* 133 */
+ { 0x0a, 0, 1, 8, "PKCS-12v1" }, /* 134 */
+ { 0x01, 0, 1, 9, "bagIds" }, /* 135 */
+ { 0x01, 137, 0, 10, "keyBag" }, /* 136 */
+ { 0x02, 138, 0, 10, "pkcs8ShroudedKeyBag" }, /* 137 */
+ { 0x03, 139, 0, 10, "certBag" }, /* 138 */
+ { 0x04, 140, 0, 10, "crlBag" }, /* 139 */
+ { 0x05, 141, 0, 10, "secretBag" }, /* 140 */
+ { 0x06, 0, 0, 10, "safeContentsBag" }, /* 141 */
+ { 0x02, 145, 1, 6, "digestAlgorithm" }, /* 142 */
+ { 0x02, 144, 0, 7, "md2" }, /* 143 */
+ { 0x05, 0, 0, 7, "md5" }, /* 144 */
+ { 0x03, 0, 1, 6, "encryptionAlgorithm" }, /* 145 */
+ { 0x07, 0, 0, 7, "3des-ede-cbc" }, /* 146 */
+ { 0xCE, 0, 1, 3, "" }, /* 147 */
+ { 0x3D, 0, 1, 4, "ansi-X9-62" }, /* 148 */
+ { 0x02, 151, 1, 5, "id-publicKeyType" }, /* 149 */
+ { 0x01, 0, 0, 6, "id-ecPublicKey" }, /* 150 */
+ { 0x03, 181, 1, 5, "ellipticCurve" }, /* 151 */
+ { 0x00, 173, 1, 6, "c-TwoCurve" }, /* 152 */
+ { 0x01, 154, 0, 7, "c2pnb163v1" }, /* 153 */
+ { 0x02, 155, 0, 7, "c2pnb163v2" }, /* 154 */
+ { 0x03, 156, 0, 7, "c2pnb163v3" }, /* 155 */
+ { 0x04, 157, 0, 7, "c2pnb176w1" }, /* 156 */
+ { 0x05, 158, 0, 7, "c2tnb191v1" }, /* 157 */
+ { 0x06, 159, 0, 7, "c2tnb191v2" }, /* 158 */
+ { 0x07, 160, 0, 7, "c2tnb191v3" }, /* 159 */
+ { 0x08, 161, 0, 7, "c2onb191v4" }, /* 160 */
+ { 0x09, 162, 0, 7, "c2onb191v5" }, /* 161 */
+ { 0x0A, 163, 0, 7, "c2pnb208w1" }, /* 162 */
+ { 0x0B, 164, 0, 7, "c2tnb239v1" }, /* 163 */
+ { 0x0C, 165, 0, 7, "c2tnb239v2" }, /* 164 */
+ { 0x0D, 166, 0, 7, "c2tnb239v3" }, /* 165 */
+ { 0x0E, 167, 0, 7, "c2onb239v4" }, /* 166 */
+ { 0x0F, 168, 0, 7, "c2onb239v5" }, /* 167 */
+ { 0x10, 169, 0, 7, "c2pnb272w1" }, /* 168 */
+ { 0x11, 170, 0, 7, "c2pnb304w1" }, /* 169 */
+ { 0x12, 171, 0, 7, "c2tnb359v1" }, /* 170 */
+ { 0x13, 172, 0, 7, "c2pnb368w1" }, /* 171 */
+ { 0x14, 0, 0, 7, "c2tnb431r1" }, /* 172 */
+ { 0x01, 0, 1, 6, "primeCurve" }, /* 173 */
+ { 0x01, 175, 0, 7, "prime192v1" }, /* 174 */
+ { 0x02, 176, 0, 7, "prime192v2" }, /* 175 */
+ { 0x03, 177, 0, 7, "prime192v3" }, /* 176 */
+ { 0x04, 178, 0, 7, "prime239v1" }, /* 177 */
+ { 0x05, 179, 0, 7, "prime239v2" }, /* 178 */
+ { 0x06, 180, 0, 7, "prime239v3" }, /* 179 */
+ { 0x07, 0, 0, 7, "prime256v1" }, /* 180 */
+ { 0x04, 0, 1, 5, "id-ecSigType" }, /* 181 */
+ { 0x01, 183, 0, 6, "ecdsa-with-SHA1" }, /* 182 */
+ { 0x03, 0, 1, 6, "ecdsa-with-Specified" }, /* 183 */
+ { 0x01, 185, 0, 7, "ecdsa-with-SHA224" }, /* 184 */
+ { 0x02, 186, 0, 7, "ecdsa-with-SHA256" }, /* 185 */
+ { 0x03, 187, 0, 7, "ecdsa-with-SHA384" }, /* 186 */
+ { 0x04, 0, 0, 7, "ecdsa-with-SHA512" }, /* 187 */
+ {0x2B, 348, 1, 0, "" }, /* 188 */
+ { 0x06, 262, 1, 1, "dod" }, /* 189 */
+ { 0x01, 0, 1, 2, "internet" }, /* 190 */
+ { 0x04, 213, 1, 3, "private" }, /* 191 */
+ { 0x01, 0, 1, 4, "enterprise" }, /* 192 */
+ { 0x82, 206, 1, 5, "" }, /* 193 */
+ { 0x37, 203, 1, 6, "Microsoft" }, /* 194 */
+ { 0x0A, 199, 1, 7, "" }, /* 195 */
+ { 0x03, 0, 1, 8, "" }, /* 196 */
+ { 0x03, 198, 0, 9, "msSGC" }, /* 197 */
+ { 0x04, 0, 0, 9, "msEncryptingFileSystem" }, /* 198 */
+ { 0x14, 0, 1, 7, "msEnrollmentInfrastructure" }, /* 199 */
+ { 0x02, 0, 1, 8, "msCertificateTypeExtension" }, /* 200 */
+ { 0x02, 202, 0, 9, "msSmartcardLogon" }, /* 201 */
+ { 0x03, 0, 0, 9, "msUPN" }, /* 202 */
+ { 0xA0, 0, 1, 6, "" }, /* 203 */
+ { 0x2A, 0, 1, 7, "ITA" }, /* 204 */
+ { 0x01, 0, 0, 8, "strongSwan" }, /* 205 */
+ { 0x89, 0, 1, 5, "" }, /* 206 */
+ { 0x31, 0, 1, 6, "" }, /* 207 */
+ { 0x01, 0, 1, 7, "" }, /* 208 */
+ { 0x01, 0, 1, 8, "" }, /* 209 */
+ { 0x02, 0, 1, 9, "" }, /* 210 */
+ { 0x02, 0, 1, 10, "" }, /* 211 */
+ { 0x4B, 0, 0, 11, "TCGID" }, /* 212 */
+ { 0x05, 0, 1, 3, "security" }, /* 213 */
+ { 0x05, 0, 1, 4, "mechanisms" }, /* 214 */
+ { 0x07, 259, 1, 5, "id-pkix" }, /* 215 */
+ { 0x01, 220, 1, 6, "id-pe" }, /* 216 */
+ { 0x01, 218, 0, 7, "authorityInfoAccess" }, /* 217 */
+ { 0x03, 219, 0, 7, "qcStatements" }, /* 218 */
+ { 0x07, 0, 0, 7, "ipAddrBlocks" }, /* 219 */
+ { 0x02, 223, 1, 6, "id-qt" }, /* 220 */
+ { 0x01, 222, 0, 7, "cps" }, /* 221 */
+ { 0x02, 0, 0, 7, "unotice" }, /* 222 */
+ { 0x03, 233, 1, 6, "id-kp" }, /* 223 */
+ { 0x01, 225, 0, 7, "serverAuth" }, /* 224 */
+ { 0x02, 226, 0, 7, "clientAuth" }, /* 225 */
+ { 0x03, 227, 0, 7, "codeSigning" }, /* 226 */
+ { 0x04, 228, 0, 7, "emailProtection" }, /* 227 */
+ { 0x05, 229, 0, 7, "ipsecEndSystem" }, /* 228 */
+ { 0x06, 230, 0, 7, "ipsecTunnel" }, /* 229 */
+ { 0x07, 231, 0, 7, "ipsecUser" }, /* 230 */
+ { 0x08, 232, 0, 7, "timeStamping" }, /* 231 */
+ { 0x09, 0, 0, 7, "ocspSigning" }, /* 232 */
+ { 0x08, 241, 1, 6, "id-otherNames" }, /* 233 */
+ { 0x01, 235, 0, 7, "personalData" }, /* 234 */
+ { 0x02, 236, 0, 7, "userGroup" }, /* 235 */
+ { 0x03, 237, 0, 7, "id-on-permanentIdentifier" }, /* 236 */
+ { 0x04, 238, 0, 7, "id-on-hardwareModuleName" }, /* 237 */
+ { 0x05, 239, 0, 7, "xmppAddr" }, /* 238 */
+ { 0x06, 240, 0, 7, "id-on-SIM" }, /* 239 */
+ { 0x07, 0, 0, 7, "id-on-dnsSRV" }, /* 240 */
+ { 0x0A, 246, 1, 6, "id-aca" }, /* 241 */
+ { 0x01, 243, 0, 7, "authenticationInfo" }, /* 242 */
+ { 0x02, 244, 0, 7, "accessIdentity" }, /* 243 */
+ { 0x03, 245, 0, 7, "chargingIdentity" }, /* 244 */
+ { 0x04, 0, 0, 7, "group" }, /* 245 */
+ { 0x0B, 247, 0, 6, "subjectInfoAccess" }, /* 246 */
+ { 0x30, 0, 1, 6, "id-ad" }, /* 247 */
+ { 0x01, 256, 1, 7, "ocsp" }, /* 248 */
+ { 0x01, 250, 0, 8, "basic" }, /* 249 */
+ { 0x02, 251, 0, 8, "nonce" }, /* 250 */
+ { 0x03, 252, 0, 8, "crl" }, /* 251 */
+ { 0x04, 253, 0, 8, "response" }, /* 252 */
+ { 0x05, 254, 0, 8, "noCheck" }, /* 253 */
+ { 0x06, 255, 0, 8, "archiveCutoff" }, /* 254 */
+ { 0x07, 0, 0, 8, "serviceLocator" }, /* 255 */
+ { 0x02, 257, 0, 7, "caIssuers" }, /* 256 */
+ { 0x03, 258, 0, 7, "timeStamping" }, /* 257 */
+ { 0x05, 0, 0, 7, "caRepository" }, /* 258 */
+ { 0x08, 0, 1, 5, "ipsec" }, /* 259 */
+ { 0x02, 0, 1, 6, "certificate" }, /* 260 */
+ { 0x02, 0, 0, 7, "iKEIntermediate" }, /* 261 */
+ { 0x0E, 268, 1, 1, "oiw" }, /* 262 */
+ { 0x03, 0, 1, 2, "secsig" }, /* 263 */
+ { 0x02, 0, 1, 3, "algorithms" }, /* 264 */
+ { 0x07, 266, 0, 4, "des-cbc" }, /* 265 */
+ { 0x1A, 267, 0, 4, "sha-1" }, /* 266 */
+ { 0x1D, 0, 0, 4, "sha-1WithRSASignature" }, /* 267 */
+ { 0x24, 314, 1, 1, "TeleTrusT" }, /* 268 */
+ { 0x03, 0, 1, 2, "algorithm" }, /* 269 */
+ { 0x03, 0, 1, 3, "signatureAlgorithm" }, /* 270 */
+ { 0x01, 275, 1, 4, "rsaSignature" }, /* 271 */
+ { 0x02, 273, 0, 5, "rsaSigWithripemd160" }, /* 272 */
+ { 0x03, 274, 0, 5, "rsaSigWithripemd128" }, /* 273 */
+ { 0x04, 0, 0, 5, "rsaSigWithripemd256" }, /* 274 */
+ { 0x02, 0, 1, 4, "ecSign" }, /* 275 */
+ { 0x01, 277, 0, 5, "ecSignWithsha1" }, /* 276 */
+ { 0x02, 278, 0, 5, "ecSignWithripemd160" }, /* 277 */
+ { 0x03, 279, 0, 5, "ecSignWithmd2" }, /* 278 */
+ { 0x04, 280, 0, 5, "ecSignWithmd5" }, /* 279 */
+ { 0x05, 297, 1, 5, "ttt-ecg" }, /* 280 */
+ { 0x01, 285, 1, 6, "fieldType" }, /* 281 */
+ { 0x01, 0, 1, 7, "characteristictwoField" }, /* 282 */
+ { 0x01, 0, 1, 8, "basisType" }, /* 283 */
+ { 0x01, 0, 0, 9, "ipBasis" }, /* 284 */
+ { 0x02, 287, 1, 6, "keyType" }, /* 285 */
+ { 0x01, 0, 0, 7, "ecgPublicKey" }, /* 286 */
+ { 0x03, 288, 0, 6, "curve" }, /* 287 */
+ { 0x04, 295, 1, 6, "signatures" }, /* 288 */
+ { 0x01, 290, 0, 7, "ecgdsa-with-RIPEMD160" }, /* 289 */
+ { 0x02, 291, 0, 7, "ecgdsa-with-SHA1" }, /* 290 */
+ { 0x03, 292, 0, 7, "ecgdsa-with-SHA224" }, /* 291 */
+ { 0x04, 293, 0, 7, "ecgdsa-with-SHA256" }, /* 292 */
+ { 0x05, 294, 0, 7, "ecgdsa-with-SHA384" }, /* 293 */
+ { 0x06, 0, 0, 7, "ecgdsa-with-SHA512" }, /* 294 */
+ { 0x05, 0, 1, 6, "module" }, /* 295 */
+ { 0x01, 0, 0, 7, "1" }, /* 296 */
+ { 0x08, 0, 1, 5, "ecStdCurvesAndGeneration" }, /* 297 */
+ { 0x01, 0, 1, 6, "ellipticCurve" }, /* 298 */
+ { 0x01, 0, 1, 7, "versionOne" }, /* 299 */
+ { 0x01, 301, 0, 8, "brainpoolP160r1" }, /* 300 */
+ { 0x02, 302, 0, 8, "brainpoolP160t1" }, /* 301 */
+ { 0x03, 303, 0, 8, "brainpoolP192r1" }, /* 302 */
+ { 0x04, 304, 0, 8, "brainpoolP192t1" }, /* 303 */
+ { 0x05, 305, 0, 8, "brainpoolP224r1" }, /* 304 */
+ { 0x06, 306, 0, 8, "brainpoolP224t1" }, /* 305 */
+ { 0x07, 307, 0, 8, "brainpoolP256r1" }, /* 306 */
+ { 0x08, 308, 0, 8, "brainpoolP256t1" }, /* 307 */
+ { 0x09, 309, 0, 8, "brainpoolP320r1" }, /* 308 */
+ { 0x0A, 310, 0, 8, "brainpoolP320t1" }, /* 309 */
+ { 0x0B, 311, 0, 8, "brainpoolP384r1" }, /* 310 */
+ { 0x0C, 312, 0, 8, "brainpoolP384t1" }, /* 311 */
+ { 0x0D, 313, 0, 8, "brainpoolP512r1" }, /* 312 */
+ { 0x0E, 0, 0, 8, "brainpoolP512t1" }, /* 313 */
+ { 0x81, 0, 1, 1, "" }, /* 314 */
+ { 0x04, 0, 1, 2, "Certicom" }, /* 315 */
+ { 0x00, 0, 1, 3, "curve" }, /* 316 */
+ { 0x01, 318, 0, 4, "sect163k1" }, /* 317 */
+ { 0x02, 319, 0, 4, "sect163r1" }, /* 318 */
+ { 0x03, 320, 0, 4, "sect239k1" }, /* 319 */
+ { 0x04, 321, 0, 4, "sect113r1" }, /* 320 */
+ { 0x05, 322, 0, 4, "sect113r2" }, /* 321 */
+ { 0x06, 323, 0, 4, "secp112r1" }, /* 322 */
+ { 0x07, 324, 0, 4, "secp112r2" }, /* 323 */
+ { 0x08, 325, 0, 4, "secp160r1" }, /* 324 */
+ { 0x09, 326, 0, 4, "secp160k1" }, /* 325 */
+ { 0x0A, 327, 0, 4, "secp256k1" }, /* 326 */
+ { 0x0F, 328, 0, 4, "sect163r2" }, /* 327 */
+ { 0x10, 329, 0, 4, "sect283k1" }, /* 328 */
+ { 0x11, 330, 0, 4, "sect283r1" }, /* 329 */
+ { 0x16, 331, 0, 4, "sect131r1" }, /* 330 */
+ { 0x17, 332, 0, 4, "sect131r2" }, /* 331 */
+ { 0x18, 333, 0, 4, "sect193r1" }, /* 332 */
+ { 0x19, 334, 0, 4, "sect193r2" }, /* 333 */
+ { 0x1A, 335, 0, 4, "sect233k1" }, /* 334 */
+ { 0x1B, 336, 0, 4, "sect233r1" }, /* 335 */
+ { 0x1C, 337, 0, 4, "secp128r1" }, /* 336 */
+ { 0x1D, 338, 0, 4, "secp128r2" }, /* 337 */
+ { 0x1E, 339, 0, 4, "secp160r2" }, /* 338 */
+ { 0x1F, 340, 0, 4, "secp192k1" }, /* 339 */
+ { 0x20, 341, 0, 4, "secp224k1" }, /* 340 */
+ { 0x21, 342, 0, 4, "secp224r1" }, /* 341 */
+ { 0x22, 343, 0, 4, "secp384r1" }, /* 342 */
+ { 0x23, 344, 0, 4, "secp521r1" }, /* 343 */
+ { 0x24, 345, 0, 4, "sect409k1" }, /* 344 */
+ { 0x25, 346, 0, 4, "sect409r1" }, /* 345 */
+ { 0x26, 347, 0, 4, "sect571k1" }, /* 346 */
+ { 0x27, 0, 0, 4, "sect571r1" }, /* 347 */
+ {0x60, 396, 1, 0, "" }, /* 348 */
+ { 0x86, 0, 1, 1, "" }, /* 349 */
+ { 0x48, 0, 1, 2, "" }, /* 350 */
+ { 0x01, 0, 1, 3, "organization" }, /* 351 */
+ { 0x65, 372, 1, 4, "gov" }, /* 352 */
+ { 0x03, 0, 1, 5, "csor" }, /* 353 */
+ { 0x04, 0, 1, 6, "nistalgorithm" }, /* 354 */
+ { 0x01, 365, 1, 7, "aes" }, /* 355 */
+ { 0x02, 357, 0, 8, "id-aes128-CBC" }, /* 356 */
+ { 0x06, 358, 0, 8, "id-aes128-GCM" }, /* 357 */
+ { 0x07, 359, 0, 8, "id-aes128-CCM" }, /* 358 */
+ { 0x16, 360, 0, 8, "id-aes192-CBC" }, /* 359 */
+ { 0x1A, 361, 0, 8, "id-aes192-GCM" }, /* 360 */
+ { 0x1B, 362, 0, 8, "id-aes192-CCM" }, /* 361 */
+ { 0x2A, 363, 0, 8, "id-aes256-CBC" }, /* 362 */
+ { 0x2E, 364, 0, 8, "id-aes256-GCM" }, /* 363 */
+ { 0x2F, 0, 0, 8, "id-aes256-CCM" }, /* 364 */
+ { 0x02, 0, 1, 7, "hashalgs" }, /* 365 */
+ { 0x01, 367, 0, 8, "id-SHA-256" }, /* 366 */
+ { 0x02, 368, 0, 8, "id-SHA-384" }, /* 367 */
+ { 0x03, 369, 0, 8, "id-SHA-512" }, /* 368 */
+ { 0x04, 370, 0, 8, "id-SHA-224" }, /* 369 */
+ { 0x05, 371, 0, 8, "id-SHA-512-224" }, /* 370 */
+ { 0x06, 0, 0, 8, "id-SHA-512-256" }, /* 371 */
+ { 0x86, 0, 1, 4, "" }, /* 372 */
+ { 0xf8, 0, 1, 5, "" }, /* 373 */
+ { 0x42, 386, 1, 6, "netscape" }, /* 374 */
+ { 0x01, 381, 1, 7, "" }, /* 375 */
+ { 0x01, 377, 0, 8, "nsCertType" }, /* 376 */
+ { 0x03, 378, 0, 8, "nsRevocationUrl" }, /* 377 */
+ { 0x04, 379, 0, 8, "nsCaRevocationUrl" }, /* 378 */
+ { 0x08, 380, 0, 8, "nsCaPolicyUrl" }, /* 379 */
+ { 0x0d, 0, 0, 8, "nsComment" }, /* 380 */
+ { 0x03, 384, 1, 7, "directory" }, /* 381 */
+ { 0x01, 0, 1, 8, "" }, /* 382 */
+ { 0x03, 0, 0, 9, "employeeNumber" }, /* 383 */
+ { 0x04, 0, 1, 7, "policy" }, /* 384 */
+ { 0x01, 0, 0, 8, "nsSGC" }, /* 385 */
+ { 0x45, 0, 1, 6, "verisign" }, /* 386 */
+ { 0x01, 0, 1, 7, "pki" }, /* 387 */
+ { 0x09, 0, 1, 8, "attributes" }, /* 388 */
+ { 0x02, 390, 0, 9, "messageType" }, /* 389 */
+ { 0x03, 391, 0, 9, "pkiStatus" }, /* 390 */
+ { 0x04, 392, 0, 9, "failInfo" }, /* 391 */
+ { 0x05, 393, 0, 9, "senderNonce" }, /* 392 */
+ { 0x06, 394, 0, 9, "recipientNonce" }, /* 393 */
+ { 0x07, 395, 0, 9, "transID" }, /* 394 */
+ { 0x08, 0, 0, 9, "extensionReq" }, /* 395 */
+ {0x67, 0, 1, 0, "" }, /* 396 */
+ { 0x81, 0, 1, 1, "" }, /* 397 */
+ { 0x05, 0, 1, 2, "" }, /* 398 */
+ { 0x02, 0, 1, 3, "tcg-attribute" }, /* 399 */
+ { 0x01, 401, 0, 4, "tcg-at-tpmManufacturer" }, /* 400 */
+ { 0x02, 402, 0, 4, "tcg-at-tpmModel" }, /* 401 */
+ { 0x03, 403, 0, 4, "tcg-at-tpmVersion" }, /* 402 */
+ { 0x0F, 0, 0, 4, "tcg-at-tpmIdLabel" } /* 403 */
};
diff --git a/src/libstrongswan/asn1/oid.h b/src/libstrongswan/asn1/oid.h
index 085e09ceb..236c86737 100644
--- a/src/libstrongswan/asn1/oid.h
+++ b/src/libstrongswan/asn1/oid.h
@@ -48,6 +48,7 @@ extern const oid_t oid_names[];
#define OID_CRL_NUMBER 45
#define OID_CRL_REASON_CODE 46
#define OID_DELTA_CRL_INDICATOR 49
+#define OID_ISSUING_DIST_POINT 50
#define OID_NAME_CONSTRAINTS 52
#define OID_CRL_DISTRIBUTION_POINTS 53
#define OID_CERTIFICATE_POLICIES 54
@@ -90,137 +91,148 @@ extern const oid_t oid_names[];
#define OID_CHALLENGE_PASSWORD 119
#define OID_UNSTRUCTURED_ADDRESS 120
#define OID_EXTENSION_REQUEST 121
-#define OID_MD2 124
-#define OID_MD5 125
-#define OID_3DES_EDE_CBC 127
-#define OID_EC_PUBLICKEY 131
-#define OID_C2PNB163V1 134
-#define OID_C2PNB163V2 135
-#define OID_C2PNB163V3 136
-#define OID_C2PNB176W1 137
-#define OID_C2PNB191V1 138
-#define OID_C2PNB191V2 139
-#define OID_C2PNB191V3 140
-#define OID_C2PNB191V4 141
-#define OID_C2PNB191V5 142
-#define OID_C2PNB208W1 143
-#define OID_C2PNB239V1 144
-#define OID_C2PNB239V2 145
-#define OID_C2PNB239V3 146
-#define OID_C2PNB239V4 147
-#define OID_C2PNB239V5 148
-#define OID_C2PNB272W1 149
-#define OID_C2PNB304W1 150
-#define OID_C2PNB359V1 151
-#define OID_C2PNB368W1 152
-#define OID_C2PNB431R1 153
-#define OID_PRIME192V1 155
-#define OID_PRIME192V2 156
-#define OID_PRIME192V3 157
-#define OID_PRIME239V1 158
-#define OID_PRIME239V2 159
-#define OID_PRIME239V3 160
-#define OID_PRIME256V1 161
-#define OID_ECDSA_WITH_SHA1 163
-#define OID_ECDSA_WITH_SHA224 165
-#define OID_ECDSA_WITH_SHA256 166
-#define OID_ECDSA_WITH_SHA384 167
-#define OID_ECDSA_WITH_SHA512 168
-#define OID_USER_PRINCIPAL_NAME 183
-#define OID_STRONGSWAN 186
-#define OID_TCGID 193
-#define OID_AUTHORITY_INFO_ACCESS 198
-#define OID_IP_ADDR_BLOCKS 200
-#define OID_POLICY_QUALIFIER_CPS 202
-#define OID_POLICY_QUALIFIER_UNOTICE 203
-#define OID_SERVER_AUTH 205
-#define OID_CLIENT_AUTH 206
-#define OID_OCSP_SIGNING 213
-#define OID_XMPP_ADDR 219
-#define OID_AUTHENTICATION_INFO 223
-#define OID_ACCESS_IDENTITY 224
-#define OID_CHARGING_IDENTITY 225
-#define OID_GROUP 226
-#define OID_OCSP 229
-#define OID_BASIC 230
-#define OID_NONCE 231
-#define OID_CRL 232
-#define OID_RESPONSE 233
-#define OID_NO_CHECK 234
-#define OID_ARCHIVE_CUTOFF 235
-#define OID_SERVICE_LOCATOR 236
-#define OID_CA_ISSUERS 237
-#define OID_IKE_INTERMEDIATE 242
-#define OID_DES_CBC 246
-#define OID_SHA1 247
-#define OID_SHA1_WITH_RSA_OIW 248
-#define OID_ECGDSA_PUBKEY 267
-#define OID_ECGDSA_SIG_WITH_RIPEMD160 270
-#define OID_ECGDSA_SIG_WITH_SHA1 271
-#define OID_ECGDSA_SIG_WITH_SHA224 272
-#define OID_ECGDSA_SIG_WITH_SHA256 273
-#define OID_ECGDSA_SIG_WITH_SHA384 274
-#define OID_ECGDSA_SIG_WITH_SHA512 275
-#define OID_SECT163K1 298
-#define OID_SECT163R1 299
-#define OID_SECT239K1 300
-#define OID_SECT113R1 301
-#define OID_SECT113R2 302
-#define OID_SECT112R1 303
-#define OID_SECT112R2 304
-#define OID_SECT160R1 305
-#define OID_SECT160K1 306
-#define OID_SECT256K1 307
-#define OID_SECT163R2 308
-#define OID_SECT283K1 309
-#define OID_SECT283R1 310
-#define OID_SECT131R1 311
-#define OID_SECT131R2 312
-#define OID_SECT193R1 313
-#define OID_SECT193R2 314
-#define OID_SECT233K1 315
-#define OID_SECT233R1 316
-#define OID_SECT128R1 317
-#define OID_SECT128R2 318
-#define OID_SECT160R2 319
-#define OID_SECT192K1 320
-#define OID_SECT224K1 321
-#define OID_SECT224R1 322
-#define OID_SECT384R1 323
-#define OID_SECT521R1 324
-#define OID_SECT409K1 325
-#define OID_SECT409R1 326
-#define OID_SECT571K1 327
-#define OID_SECT571R1 328
-#define OID_AES128_CBC 337
-#define OID_AES128_GCM 338
-#define OID_AES128_CCM 339
-#define OID_AES192_CBC 340
-#define OID_AES192_GCM 341
-#define OID_AES192_CCM 342
-#define OID_AES256_CBC 343
-#define OID_AES256_GCM 344
-#define OID_AES256_CCM 345
-#define OID_SHA256 347
-#define OID_SHA384 348
-#define OID_SHA512 349
-#define OID_SHA224 350
-#define OID_NS_REVOCATION_URL 358
-#define OID_NS_CA_REVOCATION_URL 359
-#define OID_NS_CA_POLICY_URL 360
-#define OID_NS_COMMENT 361
-#define OID_EMPLOYEE_NUMBER 364
-#define OID_PKI_MESSAGE_TYPE 370
-#define OID_PKI_STATUS 371
-#define OID_PKI_FAIL_INFO 372
-#define OID_PKI_SENDER_NONCE 373
-#define OID_PKI_RECIPIENT_NONCE 374
-#define OID_PKI_TRANS_ID 375
-#define OID_TPM_MANUFACTURER 381
-#define OID_TPM_MODEL 382
-#define OID_TPM_VERSION 383
-#define OID_TPM_ID_LABEL 384
+#define OID_X509_CERTIFICATE 124
+#define OID_PBE_SHA1_RC4_128 128
+#define OID_PBE_SHA1_RC4_40 129
+#define OID_PBE_SHA1_3DES_CBC 130
+#define OID_PBE_SHA1_3DES_2KEY_CBC 131
+#define OID_PBE_SHA1_RC2_CBC_128 132
+#define OID_PBE_SHA1_RC2_CBC_40 133
+#define OID_P12_KEY_BAG 136
+#define OID_P12_PKCS8_KEY_BAG 137
+#define OID_P12_CERT_BAG 138
+#define OID_P12_CRL_BAG 139
+#define OID_MD2 143
+#define OID_MD5 144
+#define OID_3DES_EDE_CBC 146
+#define OID_EC_PUBLICKEY 150
+#define OID_C2PNB163V1 153
+#define OID_C2PNB163V2 154
+#define OID_C2PNB163V3 155
+#define OID_C2PNB176W1 156
+#define OID_C2PNB191V1 157
+#define OID_C2PNB191V2 158
+#define OID_C2PNB191V3 159
+#define OID_C2PNB191V4 160
+#define OID_C2PNB191V5 161
+#define OID_C2PNB208W1 162
+#define OID_C2PNB239V1 163
+#define OID_C2PNB239V2 164
+#define OID_C2PNB239V3 165
+#define OID_C2PNB239V4 166
+#define OID_C2PNB239V5 167
+#define OID_C2PNB272W1 168
+#define OID_C2PNB304W1 169
+#define OID_C2PNB359V1 170
+#define OID_C2PNB368W1 171
+#define OID_C2PNB431R1 172
+#define OID_PRIME192V1 174
+#define OID_PRIME192V2 175
+#define OID_PRIME192V3 176
+#define OID_PRIME239V1 177
+#define OID_PRIME239V2 178
+#define OID_PRIME239V3 179
+#define OID_PRIME256V1 180
+#define OID_ECDSA_WITH_SHA1 182
+#define OID_ECDSA_WITH_SHA224 184
+#define OID_ECDSA_WITH_SHA256 185
+#define OID_ECDSA_WITH_SHA384 186
+#define OID_ECDSA_WITH_SHA512 187
+#define OID_USER_PRINCIPAL_NAME 202
+#define OID_STRONGSWAN 205
+#define OID_TCGID 212
+#define OID_AUTHORITY_INFO_ACCESS 217
+#define OID_IP_ADDR_BLOCKS 219
+#define OID_POLICY_QUALIFIER_CPS 221
+#define OID_POLICY_QUALIFIER_UNOTICE 222
+#define OID_SERVER_AUTH 224
+#define OID_CLIENT_AUTH 225
+#define OID_OCSP_SIGNING 232
+#define OID_XMPP_ADDR 238
+#define OID_AUTHENTICATION_INFO 242
+#define OID_ACCESS_IDENTITY 243
+#define OID_CHARGING_IDENTITY 244
+#define OID_GROUP 245
+#define OID_OCSP 248
+#define OID_BASIC 249
+#define OID_NONCE 250
+#define OID_CRL 251
+#define OID_RESPONSE 252
+#define OID_NO_CHECK 253
+#define OID_ARCHIVE_CUTOFF 254
+#define OID_SERVICE_LOCATOR 255
+#define OID_CA_ISSUERS 256
+#define OID_IKE_INTERMEDIATE 261
+#define OID_DES_CBC 265
+#define OID_SHA1 266
+#define OID_SHA1_WITH_RSA_OIW 267
+#define OID_ECGDSA_PUBKEY 286
+#define OID_ECGDSA_SIG_WITH_RIPEMD160 289
+#define OID_ECGDSA_SIG_WITH_SHA1 290
+#define OID_ECGDSA_SIG_WITH_SHA224 291
+#define OID_ECGDSA_SIG_WITH_SHA256 292
+#define OID_ECGDSA_SIG_WITH_SHA384 293
+#define OID_ECGDSA_SIG_WITH_SHA512 294
+#define OID_SECT163K1 317
+#define OID_SECT163R1 318
+#define OID_SECT239K1 319
+#define OID_SECT113R1 320
+#define OID_SECT113R2 321
+#define OID_SECT112R1 322
+#define OID_SECT112R2 323
+#define OID_SECT160R1 324
+#define OID_SECT160K1 325
+#define OID_SECT256K1 326
+#define OID_SECT163R2 327
+#define OID_SECT283K1 328
+#define OID_SECT283R1 329
+#define OID_SECT131R1 330
+#define OID_SECT131R2 331
+#define OID_SECT193R1 332
+#define OID_SECT193R2 333
+#define OID_SECT233K1 334
+#define OID_SECT233R1 335
+#define OID_SECT128R1 336
+#define OID_SECT128R2 337
+#define OID_SECT160R2 338
+#define OID_SECT192K1 339
+#define OID_SECT224K1 340
+#define OID_SECT224R1 341
+#define OID_SECT384R1 342
+#define OID_SECT521R1 343
+#define OID_SECT409K1 344
+#define OID_SECT409R1 345
+#define OID_SECT571K1 346
+#define OID_SECT571R1 347
+#define OID_AES128_CBC 356
+#define OID_AES128_GCM 357
+#define OID_AES128_CCM 358
+#define OID_AES192_CBC 359
+#define OID_AES192_GCM 360
+#define OID_AES192_CCM 361
+#define OID_AES256_CBC 362
+#define OID_AES256_GCM 363
+#define OID_AES256_CCM 364
+#define OID_SHA256 366
+#define OID_SHA384 367
+#define OID_SHA512 368
+#define OID_SHA224 369
+#define OID_NS_REVOCATION_URL 377
+#define OID_NS_CA_REVOCATION_URL 378
+#define OID_NS_CA_POLICY_URL 379
+#define OID_NS_COMMENT 380
+#define OID_EMPLOYEE_NUMBER 383
+#define OID_PKI_MESSAGE_TYPE 389
+#define OID_PKI_STATUS 390
+#define OID_PKI_FAIL_INFO 391
+#define OID_PKI_SENDER_NONCE 392
+#define OID_PKI_RECIPIENT_NONCE 393
+#define OID_PKI_TRANS_ID 394
+#define OID_TPM_MANUFACTURER 400
+#define OID_TPM_MODEL 401
+#define OID_TPM_VERSION 402
+#define OID_TPM_ID_LABEL 403
-#define OID_MAX 385
+#define OID_MAX 404
#endif /* OID_H_ */
diff --git a/src/libstrongswan/asn1/oid.pl b/src/libstrongswan/asn1/oid.pl
index ed26febc9..82100e8aa 100644
--- a/src/libstrongswan/asn1/oid.pl
+++ b/src/libstrongswan/asn1/oid.pl
@@ -19,8 +19,6 @@ $copyright="Copyright (C) 2003-2008 Andreas Steffen, Hochschule fuer Technik Rap
$automatic="This file has been automatically generated by the script oid.pl";
$warning="Do not edit manually!";
-print "oid.pl generating oid.h and oid.c\n";
-
# Generate oid.h
open(OID_H, ">oid.h")
diff --git a/src/libstrongswan/asn1/oid.txt b/src/libstrongswan/asn1/oid.txt
index 49ef1cdf2..740dc5073 100644
--- a/src/libstrongswan/asn1/oid.txt
+++ b/src/libstrongswan/asn1/oid.txt
@@ -48,7 +48,7 @@
0x17 "holdInstructionCode"
0x18 "invalidityDate"
0x1B "deltaCrlIndicator" OID_DELTA_CRL_INDICATOR
- 0x1C "issuingDistributionPoint"
+ 0x1C "issuingDistributionPoint" OID_ISSUING_DIST_POINT
0x1D "certificateIssuer"
0x1E "nameConstraints" OID_NAME_CONSTRAINTS
0x1F "crlDistributionPoints" OID_CRL_DISTRIBUTION_POINTS
@@ -121,6 +121,25 @@
0x08 "unstructuredAddress" OID_UNSTRUCTURED_ADDRESS
0x0E "extensionRequest" OID_EXTENSION_REQUEST
0x0F "S/MIME Capabilities"
+ 0x16 "certTypes"
+ 0x01 "X.509" OID_X509_CERTIFICATE
+ 0x02 "SDSI"
+ 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
+ 0x0a "PKCS-12v1"
+ 0x01 "bagIds"
+ 0x01 "keyBag" OID_P12_KEY_BAG
+ 0x02 "pkcs8ShroudedKeyBag" OID_P12_PKCS8_KEY_BAG
+ 0x03 "certBag" OID_P12_CERT_BAG
+ 0x04 "crlBag" OID_P12_CRL_BAG
+ 0x05 "secretBag"
+ 0x06 "safeContentsBag"
0x02 "digestAlgorithm"
0x02 "md2" OID_MD2
0x05 "md5" OID_MD5
@@ -240,7 +259,7 @@
0x05 "caRepository"
0x08 "ipsec"
0x02 "certificate"
- 0x02 "iKEIntermediate" OID_IKE_INTERMEDIATE
+ 0x02 "iKEIntermediate" OID_IKE_INTERMEDIATE
0x0E "oiw"
0x03 "secsig"
0x02 "algorithms"