Updated to new upstream release. interfaces Patch is not from upstream.

1 files changed, 309 insertions, 257 deletions

diff --git a/src/libstrongswan/asn1/oid.c b/src/libstrongswan/asn1/oid.c
index 391d65e89..8f91a2e2b 100644
--- a/src/libstrongswan/asn1/oid.c
+++ b/src/libstrongswan/asn1/oid.c
@@ -28,7 +28,7 @@ const oid_t oid_names[] = {
  {                0x01,       0, 1,  8, "pilotAttributeType"        }, /*  15 */
  {                  0x01,    17, 0,  9, "UID"                       }, /*  16 */
  {                  0x19,     0, 0,  9, "DC"                        }, /*  17 */
- {0x55,                      52, 1,  0, "X.500"                     }, /*  18 */
+ {0x55,                      64, 1,  0, "X.500"                     }, /*  18 */
  {  0x04,                    36, 1,  1, "X.509"                     }, /*  19 */
  {    0x03,                  21, 0,  2, "CN"                        }, /*  20 */
  {    0x04,                  22, 0,  2, "S"                         }, /*  21 */
@@ -56,260 +56,312 @@ const oid_t oid_names[] = {
  {    0x13,                  44, 0,  2, "basicConstraints"          }, /*  43 */
  {    0x14,                  45, 0,  2, "crlNumber"                 }, /*  44 */
  {    0x15,                  46, 0,  2, "reasonCode"                }, /*  45 */
- {    0x1F,                  47, 0,  2, "crlDistributionPoints"     }, /*  46 */
- {    0x20,                  48, 0,  2, "certificatePolicies"       }, /*  47 */
- {    0x23,                  49, 0,  2, "authorityKeyIdentifier"    }, /*  48 */
- {    0x25,                  50, 0,  2, "extendedKeyUsage"          }, /*  49 */
- {    0x37,                  51, 0,  2, "targetInformation"         }, /*  50 */
- {    0x38,                   0, 0,  2, "noRevAvail"                }, /*  51 */
- {0x2A,                     149, 1,  0, ""                          }, /*  52 */
- {  0x83,                    65, 1,  1, ""                          }, /*  53 */
- {    0x08,                   0, 1,  2, "jp"                        }, /*  54 */
- {      0x8C,                 0, 1,  3, ""                          }, /*  55 */
- {        0x9A,               0, 1,  4, ""                          }, /*  56 */
- {          0x4B,             0, 1,  5, ""                          }, /*  57 */
- {            0x3D,           0, 1,  6, ""                          }, /*  58 */
- {              0x01,         0, 1,  7, "security"                  }, /*  59 */
- {                0x01,       0, 1,  8, "algorithm"                 }, /*  60 */
- {                  0x01,     0, 1,  9, "symm-encryption-alg"       }, /*  61 */
- {                    0x02,  63, 0, 10, "camellia128-cbc"           }, /*  62 */
- {                    0x03,  64, 0, 10, "camellia192-cbc"           }, /*  63 */
- {                    0x04,   0, 0, 10, "camellia256-cbc"           }, /*  64 */
- {  0x86,                     0, 1,  1, ""                          }, /*  65 */
- {    0x48,                   0, 1,  2, "us"                        }, /*  66 */
- {      0x86,               108, 1,  3, ""                          }, /*  67 */
- {        0xF6,              73, 1,  4, ""                          }, /*  68 */
- {          0x7D,             0, 1,  5, "NortelNetworks"            }, /*  69 */
- {            0x07,           0, 1,  6, "Entrust"                   }, /*  70 */
- {              0x41,         0, 1,  7, "nsn-ce"                    }, /*  71 */
- {                0x00,       0, 0,  8, "entrustVersInfo"           }, /*  72 */
- {        0xF7,               0, 1,  4, ""                          }, /*  73 */
- {          0x0D,             0, 1,  5, "RSADSI"                    }, /*  74 */
- {            0x01,         103, 1,  6, "PKCS"                      }, /*  75 */
- {              0x01,        85, 1,  7, "PKCS-1"                    }, /*  76 */
- {                0x01,      78, 0,  8, "rsaEncryption"             }, /*  77 */
- {                0x02,      79, 0,  8, "md2WithRSAEncryption"      }, /*  78 */
- {                0x04,      80, 0,  8, "md5WithRSAEncryption"      }, /*  79 */
- {                0x05,      81, 0,  8, "sha-1WithRSAEncryption"    }, /*  80 */
- {                0x0B,      82, 0,  8, "sha256WithRSAEncryption"   }, /*  81 */
- {                0x0C,      83, 0,  8, "sha384WithRSAEncryption"   }, /*  82 */
- {                0x0D,      84, 0,  8, "sha512WithRSAEncryption"   }, /*  83 */
- {                0x0E,       0, 0,  8, "sha224WithRSAEncryption"   }, /*  84 */
- {              0x07,        92, 1,  7, "PKCS-7"                    }, /*  85 */
- {                0x01,      87, 0,  8, "data"                      }, /*  86 */
- {                0x02,      88, 0,  8, "signedData"                }, /*  87 */
- {                0x03,      89, 0,  8, "envelopedData"             }, /*  88 */
- {                0x04,      90, 0,  8, "signedAndEnvelopedData"    }, /*  89 */
- {                0x05,      91, 0,  8, "digestedData"              }, /*  90 */
- {                0x06,       0, 0,  8, "encryptedData"             }, /*  91 */
- {              0x09,         0, 1,  7, "PKCS-9"                    }, /*  92 */
- {                0x01,      94, 0,  8, "E"                         }, /*  93 */
- {                0x02,      95, 0,  8, "unstructuredName"          }, /*  94 */
- {                0x03,      96, 0,  8, "contentType"               }, /*  95 */
- {                0x04,      97, 0,  8, "messageDigest"             }, /*  96 */
- {                0x05,      98, 0,  8, "signingTime"               }, /*  97 */
- {                0x06,      99, 0,  8, "counterSignature"          }, /*  98 */
- {                0x07,     100, 0,  8, "challengePassword"         }, /*  99 */
- {                0x08,     101, 0,  8, "unstructuredAddress"       }, /* 100 */
- {                0x0E,     102, 0,  8, "extensionRequest"          }, /* 101 */
- {                0x0F,       0, 0,  8, "S/MIME Capabilities"       }, /* 102 */
- {            0x02,         106, 1,  6, "digestAlgorithm"           }, /* 103 */
- {              0x02,       105, 0,  7, "md2"                       }, /* 104 */
- {              0x05,         0, 0,  7, "md5"                       }, /* 105 */
- {            0x03,           0, 1,  6, "encryptionAlgorithm"       }, /* 106 */
- {              0x07,         0, 0,  7, "3des-ede-cbc"              }, /* 107 */
- {      0xCE,                 0, 1,  3, ""                          }, /* 108 */
- {        0x3D,               0, 1,  4, "ansi-X9-62"                }, /* 109 */
- {          0x02,           112, 1,  5, "id-publicKeyType"          }, /* 110 */
- {            0x01,           0, 0,  6, "id-ecPublicKey"            }, /* 111 */
- {          0x03,           142, 1,  5, "ellipticCurve"             }, /* 112 */
- {            0x00,         134, 1,  6, "c-TwoCurve"                }, /* 113 */
- {              0x01,       115, 0,  7, "c2pnb163v1"                }, /* 114 */
- {              0x02,       116, 0,  7, "c2pnb163v2"                }, /* 115 */
- {              0x03,       117, 0,  7, "c2pnb163v3"                }, /* 116 */
- {              0x04,       118, 0,  7, "c2pnb176w1"                }, /* 117 */
- {              0x05,       119, 0,  7, "c2tnb191v1"                }, /* 118 */
- {              0x06,       120, 0,  7, "c2tnb191v2"                }, /* 119 */
- {              0x07,       121, 0,  7, "c2tnb191v3"                }, /* 120 */
- {              0x08,       122, 0,  7, "c2onb191v4"                }, /* 121 */
- {              0x09,       123, 0,  7, "c2onb191v5"                }, /* 122 */
- {              0x0A,       124, 0,  7, "c2pnb208w1"                }, /* 123 */
- {              0x0B,       125, 0,  7, "c2tnb239v1"                }, /* 124 */
- {              0x0C,       126, 0,  7, "c2tnb239v2"                }, /* 125 */
- {              0x0D,       127, 0,  7, "c2tnb239v3"                }, /* 126 */
- {              0x0E,       128, 0,  7, "c2onb239v4"                }, /* 127 */
- {              0x0F,       129, 0,  7, "c2onb239v5"                }, /* 128 */
- {              0x10,       130, 0,  7, "c2pnb272w1"                }, /* 129 */
- {              0x11,       131, 0,  7, "c2pnb304w1"                }, /* 130 */
- {              0x12,       132, 0,  7, "c2tnb359v1"                }, /* 131 */
- {              0x13,       133, 0,  7, "c2pnb368w1"                }, /* 132 */
- {              0x14,         0, 0,  7, "c2tnb431r1"                }, /* 133 */
- {            0x01,           0, 1,  6, "primeCurve"                }, /* 134 */
- {              0x01,       136, 0,  7, "prime192v1"                }, /* 135 */
- {              0x02,       137, 0,  7, "prime192v2"                }, /* 136 */
- {              0x03,       138, 0,  7, "prime192v3"                }, /* 137 */
- {              0x04,       139, 0,  7, "prime239v1"                }, /* 138 */
- {              0x05,       140, 0,  7, "prime239v2"                }, /* 139 */
- {              0x06,       141, 0,  7, "prime239v3"                }, /* 140 */
- {              0x07,         0, 0,  7, "prime256v1"                }, /* 141 */
- {          0x04,             0, 1,  5, "id-ecSigType"              }, /* 142 */
- {            0x01,         144, 0,  6, "ecdsa-with-SHA1"           }, /* 143 */
- {            0x03,           0, 1,  6, "ecdsa-with-Specified"      }, /* 144 */
- {              0x01,       146, 0,  7, "ecdsa-with-SHA224"         }, /* 145 */
- {              0x02,       147, 0,  7, "ecdsa-with-SHA256"         }, /* 146 */
- {              0x03,       148, 0,  7, "ecdsa-with-SHA384"         }, /* 147 */
- {              0x04,         0, 0,  7, "ecdsa-with-SHA512"         }, /* 148 */
- {0x2B,                     249, 1,  0, ""                          }, /* 149 */
- {  0x06,                   202, 1,  1, "dod"                       }, /* 150 */
- {    0x01,                   0, 1,  2, "internet"                  }, /* 151 */
- {      0x04,               170, 1,  3, "private"                   }, /* 152 */
- {        0x01,               0, 1,  4, "enterprise"                }, /* 153 */
- {          0x82,           163, 1,  5, ""                          }, /* 154 */
- {            0x37,           0, 1,  6, "Microsoft"                 }, /* 155 */
- {              0x0A,       160, 1,  7, ""                          }, /* 156 */
- {                0x03,       0, 1,  8, ""                          }, /* 157 */
- {                  0x03,   159, 0,  9, "msSGC"                     }, /* 158 */
- {                  0x04,     0, 0,  9, "msEncryptingFileSystem"    }, /* 159 */
- {              0x14,         0, 1,  7, "msEnrollmentInfrastructure"}, /* 160 */
- {                0x02,       0, 1,  8, "msCertificateTypeExtension"}, /* 161 */
- {                  0x02,     0, 0,  9, "msSmartcardLogon"          }, /* 162 */
- {          0x89,             0, 1,  5, ""                          }, /* 163 */
- {            0x31,           0, 1,  6, ""                          }, /* 164 */
- {              0x01,         0, 1,  7, ""                          }, /* 165 */
- {                0x01,       0, 1,  8, ""                          }, /* 166 */
- {                  0x02,     0, 1,  9, ""                          }, /* 167 */
- {                    0x02, 169, 0, 10, ""                          }, /* 168 */
- {                    0x4B,   0, 0, 10, "TCGID"                     }, /* 169 */
- {      0x05,                 0, 1,  3, "security"                  }, /* 170 */
- {        0x05,               0, 1,  4, "mechanisms"                }, /* 171 */
- {          0x07,             0, 1,  5, "id-pkix"                   }, /* 172 */
- {            0x01,         175, 1,  6, "id-pe"                     }, /* 173 */
- {              0x01,         0, 0,  7, "authorityInfoAccess"       }, /* 174 */
- {            0x03,         185, 1,  6, "id-kp"                     }, /* 175 */
- {              0x01,       177, 0,  7, "serverAuth"                }, /* 176 */
- {              0x02,       178, 0,  7, "clientAuth"                }, /* 177 */
- {              0x03,       179, 0,  7, "codeSigning"               }, /* 178 */
- {              0x04,       180, 0,  7, "emailProtection"           }, /* 179 */
- {              0x05,       181, 0,  7, "ipsecEndSystem"            }, /* 180 */
- {              0x06,       182, 0,  7, "ipsecTunnel"               }, /* 181 */
- {              0x07,       183, 0,  7, "ipsecUser"                 }, /* 182 */
- {              0x08,       184, 0,  7, "timeStamping"              }, /* 183 */
- {              0x09,         0, 0,  7, "ocspSigning"               }, /* 184 */
- {            0x08,         187, 1,  6, "id-otherNames"             }, /* 185 */
- {              0x05,         0, 0,  7, "xmppAddr"                  }, /* 186 */
- {            0x0A,         192, 1,  6, "id-aca"                    }, /* 187 */
- {              0x01,       189, 0,  7, "authenticationInfo"        }, /* 188 */
- {              0x02,       190, 0,  7, "accessIdentity"            }, /* 189 */
- {              0x03,       191, 0,  7, "chargingIdentity"          }, /* 190 */
- {              0x04,         0, 0,  7, "group"                     }, /* 191 */
- {            0x30,           0, 1,  6, "id-ad"                     }, /* 192 */
- {              0x01,       201, 1,  7, "ocsp"                      }, /* 193 */
- {                0x01,     195, 0,  8, "basic"                     }, /* 194 */
- {                0x02,     196, 0,  8, "nonce"                     }, /* 195 */
- {                0x03,     197, 0,  8, "crl"                       }, /* 196 */
- {                0x04,     198, 0,  8, "response"                  }, /* 197 */
- {                0x05,     199, 0,  8, "noCheck"                   }, /* 198 */
- {                0x06,     200, 0,  8, "archiveCutoff"             }, /* 199 */
- {                0x07,       0, 0,  8, "serviceLocator"            }, /* 200 */
- {              0x02,         0, 0,  7, "caIssuers"                 }, /* 201 */
- {  0x0E,                   208, 1,  1, "oiw"                       }, /* 202 */
- {    0x03,                   0, 1,  2, "secsig"                    }, /* 203 */
- {      0x02,                 0, 1,  3, "algorithms"                }, /* 204 */
- {        0x07,             206, 0,  4, "des-cbc"                   }, /* 205 */
- {        0x1A,             207, 0,  4, "sha-1"                     }, /* 206 */
- {        0x1D,               0, 0,  4, "sha-1WithRSASignature"     }, /* 207 */
- {  0x24,                   215, 1,  1, "TeleTrusT"                 }, /* 208 */
- {    0x03,                   0, 1,  2, "algorithm"                 }, /* 209 */
- {      0x03,                 0, 1,  3, "signatureAlgorithm"        }, /* 210 */
- {        0x01,               0, 1,  4, "rsaSignature"              }, /* 211 */
- {          0x02,           213, 0,  5, "rsaSigWithripemd160"       }, /* 212 */
- {          0x03,           214, 0,  5, "rsaSigWithripemd128"       }, /* 213 */
- {          0x04,             0, 0,  5, "rsaSigWithripemd256"       }, /* 214 */
- {  0x81,                     0, 1,  1, ""                          }, /* 215 */
- {    0x04,                   0, 1,  2, "Certicom"                  }, /* 216 */
- {      0x00,                 0, 1,  3, "curve"                     }, /* 217 */
- {        0x01,             219, 0,  4, "sect163k1"                 }, /* 218 */
- {        0x02,             220, 0,  4, "sect163r1"                 }, /* 219 */
- {        0x03,             221, 0,  4, "sect239k1"                 }, /* 220 */
- {        0x04,             222, 0,  4, "sect113r1"                 }, /* 221 */
- {        0x05,             223, 0,  4, "sect113r2"                 }, /* 222 */
- {        0x06,             224, 0,  4, "secp112r1"                 }, /* 223 */
- {        0x07,             225, 0,  4, "secp112r2"                 }, /* 224 */
- {        0x08,             226, 0,  4, "secp160r1"                 }, /* 225 */
- {        0x09,             227, 0,  4, "secp160k1"                 }, /* 226 */
- {        0x0A,             228, 0,  4, "secp256k1"                 }, /* 227 */
- {        0x0F,             229, 0,  4, "sect163r2"                 }, /* 228 */
- {        0x10,             230, 0,  4, "sect283k1"                 }, /* 229 */
- {        0x11,             231, 0,  4, "sect283r1"                 }, /* 230 */
- {        0x16,             232, 0,  4, "sect131r1"                 }, /* 231 */
- {        0x17,             233, 0,  4, "sect131r2"                 }, /* 232 */
- {        0x18,             234, 0,  4, "sect193r1"                 }, /* 233 */
- {        0x19,             235, 0,  4, "sect193r2"                 }, /* 234 */
- {        0x1A,             236, 0,  4, "sect233k1"                 }, /* 235 */
- {        0x1B,             237, 0,  4, "sect233r1"                 }, /* 236 */
- {        0x1C,             238, 0,  4, "secp128r1"                 }, /* 237 */
- {        0x1D,             239, 0,  4, "secp128r2"                 }, /* 238 */
- {        0x1E,             240, 0,  4, "secp160r2"                 }, /* 239 */
- {        0x1F,             241, 0,  4, "secp192k1"                 }, /* 240 */
- {        0x20,             242, 0,  4, "secp224k1"                 }, /* 241 */
- {        0x21,             243, 0,  4, "secp224r1"                 }, /* 242 */
- {        0x22,             244, 0,  4, "secp384r1"                 }, /* 243 */
- {        0x23,             245, 0,  4, "secp521r1"                 }, /* 244 */
- {        0x24,             246, 0,  4, "sect409k1"                 }, /* 245 */
- {        0x25,             247, 0,  4, "sect409r1"                 }, /* 246 */
- {        0x26,             248, 0,  4, "sect571k1"                 }, /* 247 */
- {        0x27,               0, 0,  4, "sect571r1"                 }, /* 248 */
- {0x60,                       0, 1,  0, ""                          }, /* 249 */
- {  0x86,                     0, 1,  1, ""                          }, /* 250 */
- {    0x48,                   0, 1,  2, ""                          }, /* 251 */
- {      0x01,               295, 1,  3, "organization"              }, /* 252 */
- {        0x65,             271, 1,  4, "gov"                       }, /* 253 */
- {          0x03,             0, 1,  5, "csor"                      }, /* 254 */
- {            0x04,           0, 1,  6, "nistalgorithm"             }, /* 255 */
- {              0x01,       266, 1,  7, "aes"                       }, /* 256 */
- {                0x02,     258, 0,  8, "id-aes128-CBC"             }, /* 257 */
- {                0x06,     259, 0,  8, "id-aes128-GCM"             }, /* 258 */
- {                0x07,     260, 0,  8, "id-aes128-CCM"             }, /* 259 */
- {                0x16,     261, 0,  8, "id-aes192-CBC"             }, /* 260 */
- {                0x1A,     262, 0,  8, "id-aes192-GCM"             }, /* 261 */
- {                0x1B,     263, 0,  8, "id-aes192-CCM"             }, /* 262 */
- {                0x2A,     264, 0,  8, "id-aes256-CBC"             }, /* 263 */
- {                0x2E,     265, 0,  8, "id-aes256-GCM"             }, /* 264 */
- {                0x2F,       0, 0,  8, "id-aes256-CCM"             }, /* 265 */
- {              0x02,         0, 1,  7, "hashalgs"                  }, /* 266 */
- {                0x01,     268, 0,  8, "id-SHA-256"                }, /* 267 */
- {                0x02,     269, 0,  8, "id-SHA-384"                }, /* 268 */
- {                0x03,     270, 0,  8, "id-SHA-512"                }, /* 269 */
- {                0x04,       0, 0,  8, "id-SHA-224"                }, /* 270 */
- {        0x86,               0, 1,  4, ""                          }, /* 271 */
- {          0xf8,             0, 1,  5, ""                          }, /* 272 */
- {            0x42,         285, 1,  6, "netscape"                  }, /* 273 */
- {              0x01,       280, 1,  7, ""                          }, /* 274 */
- {                0x01,     276, 0,  8, "nsCertType"                }, /* 275 */
- {                0x03,     277, 0,  8, "nsRevocationUrl"           }, /* 276 */
- {                0x04,     278, 0,  8, "nsCaRevocationUrl"         }, /* 277 */
- {                0x08,     279, 0,  8, "nsCaPolicyUrl"             }, /* 278 */
- {                0x0d,       0, 0,  8, "nsComment"                 }, /* 279 */
- {              0x03,       283, 1,  7, "directory"                 }, /* 280 */
- {                0x01,       0, 1,  8, ""                          }, /* 281 */
- {                  0x03,     0, 0,  9, "employeeNumber"            }, /* 282 */
- {              0x04,         0, 1,  7, "policy"                    }, /* 283 */
- {                0x01,       0, 0,  8, "nsSGC"                     }, /* 284 */
- {            0x45,           0, 1,  6, "verisign"                  }, /* 285 */
- {              0x01,         0, 1,  7, "pki"                       }, /* 286 */
- {                0x09,       0, 1,  8, "attributes"                }, /* 287 */
- {                  0x02,   289, 0,  9, "messageType"               }, /* 288 */
- {                  0x03,   290, 0,  9, "pkiStatus"                 }, /* 289 */
- {                  0x04,   291, 0,  9, "failInfo"                  }, /* 290 */
- {                  0x05,   292, 0,  9, "senderNonce"               }, /* 291 */
- {                  0x06,   293, 0,  9, "recipientNonce"            }, /* 292 */
- {                  0x07,   294, 0,  9, "transID"                   }, /* 293 */
- {                  0x08,     0, 0,  9, "extensionReq"              }, /* 294 */
- {      0x86,                 0, 1,  3, "old-netscape"              }, /* 295 */
- {        0xF7,               0, 1,  4, ""                          }, /* 296 */
- {          0x0D,             0, 1,  5, ""                          }, /* 297 */
- {            0x01,           0, 1,  6, ""                          }, /* 298 */
- {              0x09,         0, 1,  7, ""                          }, /* 299 */
- {                0x01,     301, 0,  8, "emailAddress"              }, /* 300 */
- {                0x02,       0, 0,  8, "unstructuredName"          }  /* 301 */
+ {    0x17,                  47, 0,  2, "holdInstructionCode"       }, /*  46 */
+ {    0x18,                  48, 0,  2, "invalidityDate"            }, /*  47 */
+ {    0x1B,                  49, 0,  2, "deltaCrlIndicator"         }, /*  48 */
+ {    0x1C,                  50, 0,  2, "issuingDistributionPoint"  }, /*  49 */
+ {    0x1D,                  51, 0,  2, "certificateIssuer"         }, /*  50 */
+ {    0x1E,                  52, 0,  2, "nameConstraints"           }, /*  51 */
+ {    0x1F,                  53, 0,  2, "crlDistributionPoints"     }, /*  52 */
+ {    0x20,                  55, 1,  2, "certificatePolicies"       }, /*  53 */
+ {      0x00,                 0, 0,  3, "anyPolicy"                 }, /*  54 */
+ {    0x21,                  56, 0,  2, "policyMappings"            }, /*  55 */
+ {    0x23,                  57, 0,  2, "authorityKeyIdentifier"    }, /*  56 */
+ {    0x24,                  58, 0,  2, "policyConstraints"         }, /*  57 */
+ {    0x25,                  60, 1,  2, "extendedKeyUsage"          }, /*  58 */
+ {      0x00,                 0, 0,  3, "anyExtendedKeyUsage"       }, /*  59 */
+ {    0x2E,                  61, 0,  2, "freshestCRL"               }, /*  60 */
+ {    0x36,                  62, 0,  2, "inhibitAnyPolicy"          }, /*  61 */
+ {    0x37,                  63, 0,  2, "targetInformation"         }, /*  62 */
+ {    0x38,                   0, 0,  2, "noRevAvail"                }, /*  63 */
+ {0x2A,                     161, 1,  0, ""                          }, /*  64 */
+ {  0x83,                    77, 1,  1, ""                          }, /*  65 */
+ {    0x08,                   0, 1,  2, "jp"                        }, /*  66 */
+ {      0x8C,                 0, 1,  3, ""                          }, /*  67 */
+ {        0x9A,               0, 1,  4, ""                          }, /*  68 */
+ {          0x4B,             0, 1,  5, ""                          }, /*  69 */
+ {            0x3D,           0, 1,  6, ""                          }, /*  70 */
+ {              0x01,         0, 1,  7, "security"                  }, /*  71 */
+ {                0x01,       0, 1,  8, "algorithm"                 }, /*  72 */
+ {                  0x01,     0, 1,  9, "symm-encryption-alg"       }, /*  73 */
+ {                    0x02,  75, 0, 10, "camellia128-cbc"           }, /*  74 */
+ {                    0x03,  76, 0, 10, "camellia192-cbc"           }, /*  75 */
+ {                    0x04,   0, 0, 10, "camellia256-cbc"           }, /*  76 */
+ {  0x86,                     0, 1,  1, ""                          }, /*  77 */
+ {    0x48,                   0, 1,  2, "us"                        }, /*  78 */
+ {      0x86,               120, 1,  3, ""                          }, /*  79 */
+ {        0xF6,              85, 1,  4, ""                          }, /*  80 */
+ {          0x7D,             0, 1,  5, "NortelNetworks"            }, /*  81 */
+ {            0x07,           0, 1,  6, "Entrust"                   }, /*  82 */
+ {              0x41,         0, 1,  7, "nsn-ce"                    }, /*  83 */
+ {                0x00,       0, 0,  8, "entrustVersInfo"           }, /*  84 */
+ {        0xF7,               0, 1,  4, ""                          }, /*  85 */
+ {          0x0D,             0, 1,  5, "RSADSI"                    }, /*  86 */
+ {            0x01,         115, 1,  6, "PKCS"                      }, /*  87 */
+ {              0x01,        97, 1,  7, "PKCS-1"                    }, /*  88 */
+ {                0x01,      90, 0,  8, "rsaEncryption"             }, /*  89 */
+ {                0x02,      91, 0,  8, "md2WithRSAEncryption"      }, /*  90 */
+ {                0x04,      92, 0,  8, "md5WithRSAEncryption"      }, /*  91 */
+ {                0x05,      93, 0,  8, "sha-1WithRSAEncryption"    }, /*  92 */
+ {                0x0B,      94, 0,  8, "sha256WithRSAEncryption"   }, /*  93 */
+ {                0x0C,      95, 0,  8, "sha384WithRSAEncryption"   }, /*  94 */
+ {                0x0D,      96, 0,  8, "sha512WithRSAEncryption"   }, /*  95 */
+ {                0x0E,       0, 0,  8, "sha224WithRSAEncryption"   }, /*  96 */
+ {              0x07,       104, 1,  7, "PKCS-7"                    }, /*  97 */
+ {                0x01,      99, 0,  8, "data"                      }, /*  98 */
+ {                0x02,     100, 0,  8, "signedData"                }, /*  99 */
+ {                0x03,     101, 0,  8, "envelopedData"             }, /* 100 */
+ {                0x04,     102, 0,  8, "signedAndEnvelopedData"    }, /* 101 */
+ {                0x05,     103, 0,  8, "digestedData"              }, /* 102 */
+ {                0x06,       0, 0,  8, "encryptedData"             }, /* 103 */
+ {              0x09,         0, 1,  7, "PKCS-9"                    }, /* 104 */
+ {                0x01,     106, 0,  8, "E"                         }, /* 105 */
+ {                0x02,     107, 0,  8, "unstructuredName"          }, /* 106 */
+ {                0x03,     108, 0,  8, "contentType"               }, /* 107 */
+ {                0x04,     109, 0,  8, "messageDigest"             }, /* 108 */
+ {                0x05,     110, 0,  8, "signingTime"               }, /* 109 */
+ {                0x06,     111, 0,  8, "counterSignature"          }, /* 110 */
+ {                0x07,     112, 0,  8, "challengePassword"         }, /* 111 */
+ {                0x08,     113, 0,  8, "unstructuredAddress"       }, /* 112 */
+ {                0x0E,     114, 0,  8, "extensionRequest"          }, /* 113 */
+ {                0x0F,       0, 0,  8, "S/MIME Capabilities"       }, /* 114 */
+ {            0x02,         118, 1,  6, "digestAlgorithm"           }, /* 115 */
+ {              0x02,       117, 0,  7, "md2"                       }, /* 116 */
+ {              0x05,         0, 0,  7, "md5"                       }, /* 117 */
+ {            0x03,           0, 1,  6, "encryptionAlgorithm"       }, /* 118 */
+ {              0x07,         0, 0,  7, "3des-ede-cbc"              }, /* 119 */
+ {      0xCE,                 0, 1,  3, ""                          }, /* 120 */
+ {        0x3D,               0, 1,  4, "ansi-X9-62"                }, /* 121 */
+ {          0x02,           124, 1,  5, "id-publicKeyType"          }, /* 122 */
+ {            0x01,           0, 0,  6, "id-ecPublicKey"            }, /* 123 */
+ {          0x03,           154, 1,  5, "ellipticCurve"             }, /* 124 */
+ {            0x00,         146, 1,  6, "c-TwoCurve"                }, /* 125 */
+ {              0x01,       127, 0,  7, "c2pnb163v1"                }, /* 126 */
+ {              0x02,       128, 0,  7, "c2pnb163v2"                }, /* 127 */
+ {              0x03,       129, 0,  7, "c2pnb163v3"                }, /* 128 */
+ {              0x04,       130, 0,  7, "c2pnb176w1"                }, /* 129 */
+ {              0x05,       131, 0,  7, "c2tnb191v1"                }, /* 130 */
+ {              0x06,       132, 0,  7, "c2tnb191v2"                }, /* 131 */
+ {              0x07,       133, 0,  7, "c2tnb191v3"                }, /* 132 */
+ {              0x08,       134, 0,  7, "c2onb191v4"                }, /* 133 */
+ {              0x09,       135, 0,  7, "c2onb191v5"                }, /* 134 */
+ {              0x0A,       136, 0,  7, "c2pnb208w1"                }, /* 135 */
+ {              0x0B,       137, 0,  7, "c2tnb239v1"                }, /* 136 */
+ {              0x0C,       138, 0,  7, "c2tnb239v2"                }, /* 137 */
+ {              0x0D,       139, 0,  7, "c2tnb239v3"                }, /* 138 */
+ {              0x0E,       140, 0,  7, "c2onb239v4"                }, /* 139 */
+ {              0x0F,       141, 0,  7, "c2onb239v5"                }, /* 140 */
+ {              0x10,       142, 0,  7, "c2pnb272w1"                }, /* 141 */
+ {              0x11,       143, 0,  7, "c2pnb304w1"                }, /* 142 */
+ {              0x12,       144, 0,  7, "c2tnb359v1"                }, /* 143 */
+ {              0x13,       145, 0,  7, "c2pnb368w1"                }, /* 144 */
+ {              0x14,         0, 0,  7, "c2tnb431r1"                }, /* 145 */
+ {            0x01,           0, 1,  6, "primeCurve"                }, /* 146 */
+ {              0x01,       148, 0,  7, "prime192v1"                }, /* 147 */
+ {              0x02,       149, 0,  7, "prime192v2"                }, /* 148 */
+ {              0x03,       150, 0,  7, "prime192v3"                }, /* 149 */
+ {              0x04,       151, 0,  7, "prime239v1"                }, /* 150 */
+ {              0x05,       152, 0,  7, "prime239v2"                }, /* 151 */
+ {              0x06,       153, 0,  7, "prime239v3"                }, /* 152 */
+ {              0x07,         0, 0,  7, "prime256v1"                }, /* 153 */
+ {          0x04,             0, 1,  5, "id-ecSigType"              }, /* 154 */
+ {            0x01,         156, 0,  6, "ecdsa-with-SHA1"           }, /* 155 */
+ {            0x03,           0, 1,  6, "ecdsa-with-Specified"      }, /* 156 */
+ {              0x01,       158, 0,  7, "ecdsa-with-SHA224"         }, /* 157 */
+ {              0x02,       159, 0,  7, "ecdsa-with-SHA256"         }, /* 158 */
+ {              0x03,       160, 0,  7, "ecdsa-with-SHA384"         }, /* 159 */
+ {              0x04,         0, 0,  7, "ecdsa-with-SHA512"         }, /* 160 */
+ {0x2B,                     307, 1,  0, ""                          }, /* 161 */
+ {  0x06,                   221, 1,  1, "dod"                       }, /* 162 */
+ {    0x01,                   0, 1,  2, "internet"                  }, /* 163 */
+ {      0x04,               182, 1,  3, "private"                   }, /* 164 */
+ {        0x01,               0, 1,  4, "enterprise"                }, /* 165 */
+ {          0x82,           175, 1,  5, ""                          }, /* 166 */
+ {            0x37,           0, 1,  6, "Microsoft"                 }, /* 167 */
+ {              0x0A,       172, 1,  7, ""                          }, /* 168 */
+ {                0x03,       0, 1,  8, ""                          }, /* 169 */
+ {                  0x03,   171, 0,  9, "msSGC"                     }, /* 170 */
+ {                  0x04,     0, 0,  9, "msEncryptingFileSystem"    }, /* 171 */
+ {              0x14,         0, 1,  7, "msEnrollmentInfrastructure"}, /* 172 */
+ {                0x02,       0, 1,  8, "msCertificateTypeExtension"}, /* 173 */
+ {                  0x02,     0, 0,  9, "msSmartcardLogon"          }, /* 174 */
+ {          0x89,             0, 1,  5, ""                          }, /* 175 */
+ {            0x31,           0, 1,  6, ""                          }, /* 176 */
+ {              0x01,         0, 1,  7, ""                          }, /* 177 */
+ {                0x01,       0, 1,  8, ""                          }, /* 178 */
+ {                  0x02,     0, 1,  9, ""                          }, /* 179 */
+ {                    0x02, 181, 0, 10, ""                          }, /* 180 */
+ {                    0x4B,   0, 0, 10, "TCGID"                     }, /* 181 */
+ {      0x05,                 0, 1,  3, "security"                  }, /* 182 */
+ {        0x05,               0, 1,  4, "mechanisms"                }, /* 183 */
+ {          0x07,             0, 1,  5, "id-pkix"                   }, /* 184 */
+ {            0x01,         188, 1,  6, "id-pe"                     }, /* 185 */
+ {              0x01,       187, 0,  7, "authorityInfoAccess"       }, /* 186 */
+ {              0x07,         0, 0,  7, "ipAddrBlocks"              }, /* 187 */
+ {            0x02,         191, 1,  6, "id-qt"                     }, /* 188 */
+ {              0x01,       190, 0,  7, "cps"                       }, /* 189 */
+ {              0x02,         0, 0,  7, "unotice"                   }, /* 190 */
+ {            0x03,         201, 1,  6, "id-kp"                     }, /* 191 */
+ {              0x01,       193, 0,  7, "serverAuth"                }, /* 192 */
+ {              0x02,       194, 0,  7, "clientAuth"                }, /* 193 */
+ {              0x03,       195, 0,  7, "codeSigning"               }, /* 194 */
+ {              0x04,       196, 0,  7, "emailProtection"           }, /* 195 */
+ {              0x05,       197, 0,  7, "ipsecEndSystem"            }, /* 196 */
+ {              0x06,       198, 0,  7, "ipsecTunnel"               }, /* 197 */
+ {              0x07,       199, 0,  7, "ipsecUser"                 }, /* 198 */
+ {              0x08,       200, 0,  7, "timeStamping"              }, /* 199 */
+ {              0x09,         0, 0,  7, "ocspSigning"               }, /* 200 */
+ {            0x08,         203, 1,  6, "id-otherNames"             }, /* 201 */
+ {              0x05,         0, 0,  7, "xmppAddr"                  }, /* 202 */
+ {            0x0A,         208, 1,  6, "id-aca"                    }, /* 203 */
+ {              0x01,       205, 0,  7, "authenticationInfo"        }, /* 204 */
+ {              0x02,       206, 0,  7, "accessIdentity"            }, /* 205 */
+ {              0x03,       207, 0,  7, "chargingIdentity"          }, /* 206 */
+ {              0x04,         0, 0,  7, "group"                     }, /* 207 */
+ {            0x0B,         209, 0,  6, "subjectInfoAccess"         }, /* 208 */
+ {            0x30,           0, 1,  6, "id-ad"                     }, /* 209 */
+ {              0x01,       218, 1,  7, "ocsp"                      }, /* 210 */
+ {                0x01,     212, 0,  8, "basic"                     }, /* 211 */
+ {                0x02,     213, 0,  8, "nonce"                     }, /* 212 */
+ {                0x03,     214, 0,  8, "crl"                       }, /* 213 */
+ {                0x04,     215, 0,  8, "response"                  }, /* 214 */
+ {                0x05,     216, 0,  8, "noCheck"                   }, /* 215 */
+ {                0x06,     217, 0,  8, "archiveCutoff"             }, /* 216 */
+ {                0x07,       0, 0,  8, "serviceLocator"            }, /* 217 */
+ {              0x02,       219, 0,  7, "caIssuers"                 }, /* 218 */
+ {              0x03,       220, 0,  7, "timeStamping"              }, /* 219 */
+ {              0x05,         0, 0,  7, "caRepository"              }, /* 220 */
+ {  0x0E,                   227, 1,  1, "oiw"                       }, /* 221 */
+ {    0x03,                   0, 1,  2, "secsig"                    }, /* 222 */
+ {      0x02,                 0, 1,  3, "algorithms"                }, /* 223 */
+ {        0x07,             225, 0,  4, "des-cbc"                   }, /* 224 */
+ {        0x1A,             226, 0,  4, "sha-1"                     }, /* 225 */
+ {        0x1D,               0, 0,  4, "sha-1WithRSASignature"     }, /* 226 */
+ {  0x24,                   273, 1,  1, "TeleTrusT"                 }, /* 227 */
+ {    0x03,                   0, 1,  2, "algorithm"                 }, /* 228 */
+ {      0x03,                 0, 1,  3, "signatureAlgorithm"        }, /* 229 */
+ {        0x01,             234, 1,  4, "rsaSignature"              }, /* 230 */
+ {          0x02,           232, 0,  5, "rsaSigWithripemd160"       }, /* 231 */
+ {          0x03,           233, 0,  5, "rsaSigWithripemd128"       }, /* 232 */
+ {          0x04,             0, 0,  5, "rsaSigWithripemd256"       }, /* 233 */
+ {        0x02,               0, 1,  4, "ecSign"                    }, /* 234 */
+ {          0x01,           236, 0,  5, "ecSignWithsha1"            }, /* 235 */
+ {          0x02,           237, 0,  5, "ecSignWithripemd160"       }, /* 236 */
+ {          0x03,           238, 0,  5, "ecSignWithmd2"             }, /* 237 */
+ {          0x04,           239, 0,  5, "ecSignWithmd5"             }, /* 238 */
+ {          0x05,           256, 1,  5, "ttt-ecg"                   }, /* 239 */
+ {            0x01,         244, 1,  6, "fieldType"                 }, /* 240 */
+ {              0x01,         0, 1,  7, "characteristictwoField"    }, /* 241 */
+ {                0x01,       0, 1,  8, "basisType"                 }, /* 242 */
+ {                  0x01,     0, 0,  9, "ipBasis"                   }, /* 243 */
+ {            0x02,         246, 1,  6, "keyType"                   }, /* 244 */
+ {              0x01,         0, 0,  7, "ecgPublicKey"              }, /* 245 */
+ {            0x03,         247, 0,  6, "curve"                     }, /* 246 */
+ {            0x04,         254, 1,  6, "signatures"                }, /* 247 */
+ {              0x01,       249, 0,  7, "ecgdsa-with-RIPEMD160"     }, /* 248 */
+ {              0x02,       250, 0,  7, "ecgdsa-with-SHA1"          }, /* 249 */
+ {              0x03,       251, 0,  7, "ecgdsa-with-SHA224"        }, /* 250 */
+ {              0x04,       252, 0,  7, "ecgdsa-with-SHA256"        }, /* 251 */
+ {              0x05,       253, 0,  7, "ecgdsa-with-SHA384"        }, /* 252 */
+ {              0x06,         0, 0,  7, "ecgdsa-with-SHA512"        }, /* 253 */
+ {            0x05,           0, 1,  6, "module"                    }, /* 254 */
+ {              0x01,         0, 0,  7, "1"                         }, /* 255 */
+ {          0x08,             0, 1,  5, "ecStdCurvesAndGeneration"  }, /* 256 */
+ {            0x01,           0, 1,  6, "ellipticCurve"             }, /* 257 */
+ {              0x01,         0, 1,  7, "versionOne"                }, /* 258 */
+ {                0x01,     260, 0,  8, "brainpoolP160r1"           }, /* 259 */
+ {                0x02,     261, 0,  8, "brainpoolP160t1"           }, /* 260 */
+ {                0x03,     262, 0,  8, "brainpoolP192r1"           }, /* 261 */
+ {                0x04,     263, 0,  8, "brainpoolP192t1"           }, /* 262 */
+ {                0x05,     264, 0,  8, "brainpoolP224r1"           }, /* 263 */
+ {                0x06,     265, 0,  8, "brainpoolP224t1"           }, /* 264 */
+ {                0x07,     266, 0,  8, "brainpoolP256r1"           }, /* 265 */
+ {                0x08,     267, 0,  8, "brainpoolP256t1"           }, /* 266 */
+ {                0x09,     268, 0,  8, "brainpoolP320r1"           }, /* 267 */
+ {                0x0A,     269, 0,  8, "brainpoolP320t1"           }, /* 268 */
+ {                0x0B,     270, 0,  8, "brainpoolP384r1"           }, /* 269 */
+ {                0x0C,     271, 0,  8, "brainpoolP384t1"           }, /* 270 */
+ {                0x0D,     272, 0,  8, "brainpoolP512r1"           }, /* 271 */
+ {                0x0E,       0, 0,  8, "brainpoolP512t1"           }, /* 272 */
+ {  0x81,                     0, 1,  1, ""                          }, /* 273 */
+ {    0x04,                   0, 1,  2, "Certicom"                  }, /* 274 */
+ {      0x00,                 0, 1,  3, "curve"                     }, /* 275 */
+ {        0x01,             277, 0,  4, "sect163k1"                 }, /* 276 */
+ {        0x02,             278, 0,  4, "sect163r1"                 }, /* 277 */
+ {        0x03,             279, 0,  4, "sect239k1"                 }, /* 278 */
+ {        0x04,             280, 0,  4, "sect113r1"                 }, /* 279 */
+ {        0x05,             281, 0,  4, "sect113r2"                 }, /* 280 */
+ {        0x06,             282, 0,  4, "secp112r1"                 }, /* 281 */
+ {        0x07,             283, 0,  4, "secp112r2"                 }, /* 282 */
+ {        0x08,             284, 0,  4, "secp160r1"                 }, /* 283 */
+ {        0x09,             285, 0,  4, "secp160k1"                 }, /* 284 */
+ {        0x0A,             286, 0,  4, "secp256k1"                 }, /* 285 */
+ {        0x0F,             287, 0,  4, "sect163r2"                 }, /* 286 */
+ {        0x10,             288, 0,  4, "sect283k1"                 }, /* 287 */
+ {        0x11,             289, 0,  4, "sect283r1"                 }, /* 288 */
+ {        0x16,             290, 0,  4, "sect131r1"                 }, /* 289 */
+ {        0x17,             291, 0,  4, "sect131r2"                 }, /* 290 */
+ {        0x18,             292, 0,  4, "sect193r1"                 }, /* 291 */
+ {        0x19,             293, 0,  4, "sect193r2"                 }, /* 292 */
+ {        0x1A,             294, 0,  4, "sect233k1"                 }, /* 293 */
+ {        0x1B,             295, 0,  4, "sect233r1"                 }, /* 294 */
+ {        0x1C,             296, 0,  4, "secp128r1"                 }, /* 295 */
+ {        0x1D,             297, 0,  4, "secp128r2"                 }, /* 296 */
+ {        0x1E,             298, 0,  4, "secp160r2"                 }, /* 297 */
+ {        0x1F,             299, 0,  4, "secp192k1"                 }, /* 298 */
+ {        0x20,             300, 0,  4, "secp224k1"                 }, /* 299 */
+ {        0x21,             301, 0,  4, "secp224r1"                 }, /* 300 */
+ {        0x22,             302, 0,  4, "secp384r1"                 }, /* 301 */
+ {        0x23,             303, 0,  4, "secp521r1"                 }, /* 302 */
+ {        0x24,             304, 0,  4, "sect409k1"                 }, /* 303 */
+ {        0x25,             305, 0,  4, "sect409r1"                 }, /* 304 */
+ {        0x26,             306, 0,  4, "sect571k1"                 }, /* 305 */
+ {        0x27,               0, 0,  4, "sect571r1"                 }, /* 306 */
+ {0x60,                       0, 1,  0, ""                          }, /* 307 */
+ {  0x86,                     0, 1,  1, ""                          }, /* 308 */
+ {    0x48,                   0, 1,  2, ""                          }, /* 309 */
+ {      0x01,                 0, 1,  3, "organization"              }, /* 310 */
+ {        0x65,             329, 1,  4, "gov"                       }, /* 311 */
+ {          0x03,             0, 1,  5, "csor"                      }, /* 312 */
+ {            0x04,           0, 1,  6, "nistalgorithm"             }, /* 313 */
+ {              0x01,       324, 1,  7, "aes"                       }, /* 314 */
+ {                0x02,     316, 0,  8, "id-aes128-CBC"             }, /* 315 */
+ {                0x06,     317, 0,  8, "id-aes128-GCM"             }, /* 316 */
+ {                0x07,     318, 0,  8, "id-aes128-CCM"             }, /* 317 */
+ {                0x16,     319, 0,  8, "id-aes192-CBC"             }, /* 318 */
+ {                0x1A,     320, 0,  8, "id-aes192-GCM"             }, /* 319 */
+ {                0x1B,     321, 0,  8, "id-aes192-CCM"             }, /* 320 */
+ {                0x2A,     322, 0,  8, "id-aes256-CBC"             }, /* 321 */
+ {                0x2E,     323, 0,  8, "id-aes256-GCM"             }, /* 322 */
+ {                0x2F,       0, 0,  8, "id-aes256-CCM"             }, /* 323 */
+ {              0x02,         0, 1,  7, "hashalgs"                  }, /* 324 */
+ {                0x01,     326, 0,  8, "id-SHA-256"                }, /* 325 */
+ {                0x02,     327, 0,  8, "id-SHA-384"                }, /* 326 */
+ {                0x03,     328, 0,  8, "id-SHA-512"                }, /* 327 */
+ {                0x04,       0, 0,  8, "id-SHA-224"                }, /* 328 */
+ {        0x86,               0, 1,  4, ""                          }, /* 329 */
+ {          0xf8,             0, 1,  5, ""                          }, /* 330 */
+ {            0x42,         343, 1,  6, "netscape"                  }, /* 331 */
+ {              0x01,       338, 1,  7, ""                          }, /* 332 */
+ {                0x01,     334, 0,  8, "nsCertType"                }, /* 333 */
+ {                0x03,     335, 0,  8, "nsRevocationUrl"           }, /* 334 */
+ {                0x04,     336, 0,  8, "nsCaRevocationUrl"         }, /* 335 */
+ {                0x08,     337, 0,  8, "nsCaPolicyUrl"             }, /* 336 */
+ {                0x0d,       0, 0,  8, "nsComment"                 }, /* 337 */
+ {              0x03,       341, 1,  7, "directory"                 }, /* 338 */
+ {                0x01,       0, 1,  8, ""                          }, /* 339 */
+ {                  0x03,     0, 0,  9, "employeeNumber"            }, /* 340 */
+ {              0x04,         0, 1,  7, "policy"                    }, /* 341 */
+ {                0x01,       0, 0,  8, "nsSGC"                     }, /* 342 */
+ {            0x45,           0, 1,  6, "verisign"                  }, /* 343 */
+ {              0x01,         0, 1,  7, "pki"                       }, /* 344 */
+ {                0x09,       0, 1,  8, "attributes"                }, /* 345 */
+ {                  0x02,   347, 0,  9, "messageType"               }, /* 346 */
+ {                  0x03,   348, 0,  9, "pkiStatus"                 }, /* 347 */
+ {                  0x04,   349, 0,  9, "failInfo"                  }, /* 348 */
+ {                  0x05,   350, 0,  9, "senderNonce"               }, /* 349 */
+ {                  0x06,   351, 0,  9, "recipientNonce"            }, /* 350 */
+ {                  0x07,   352, 0,  9, "transID"                   }, /* 351 */
+ {                  0x08,   353, 0,  9, "extensionReq"              }, /* 352 */
+ {                  0x08,     0, 0,  9, "extensionReq"              }  /* 353 */
 };