summaryrefslogtreecommitdiff
path: root/src/libstrongswan/asn1
diff options
context:
space:
mode:
Diffstat (limited to 'src/libstrongswan/asn1')
-rw-r--r--src/libstrongswan/asn1/oid.c518
-rw-r--r--src/libstrongswan/asn1/oid.h199
-rw-r--r--src/libstrongswan/asn1/oid.txt22
3 files changed, 398 insertions, 341 deletions
diff --git a/src/libstrongswan/asn1/oid.c b/src/libstrongswan/asn1/oid.c
index b479b0f4b..a750f7fcb 100644
--- a/src/libstrongswan/asn1/oid.c
+++ b/src/libstrongswan/asn1/oid.c
@@ -199,12 +199,12 @@ const oid_t oid_names[] = {
{ 0x02, 187, 0, 7, "ecdsa-with-SHA256" }, /* 186 */
{ 0x03, 188, 0, 7, "ecdsa-with-SHA384" }, /* 187 */
{ 0x04, 0, 0, 7, "ecdsa-with-SHA512" }, /* 188 */
- {0x2B, 391, 1, 0, "" }, /* 189 */
- { 0x06, 305, 1, 1, "dod" }, /* 190 */
+ {0x2B, 413, 1, 0, "" }, /* 189 */
+ { 0x06, 327, 1, 1, "dod" }, /* 190 */
{ 0x01, 0, 1, 2, "internet" }, /* 191 */
- { 0x04, 256, 1, 3, "private" }, /* 192 */
+ { 0x04, 278, 1, 3, "private" }, /* 192 */
{ 0x01, 0, 1, 4, "enterprise" }, /* 193 */
- { 0x82, 210, 1, 5, "" }, /* 194 */
+ { 0x82, 228, 1, 5, "" }, /* 194 */
{ 0x37, 207, 1, 6, "Microsoft" }, /* 195 */
{ 0x0A, 200, 1, 7, "" }, /* 196 */
{ 0x03, 0, 1, 8, "" }, /* 197 */
@@ -219,248 +219,270 @@ const oid_t oid_names[] = {
{ 0x0A, 0, 0, 8, "msApplicationCertPolicies" }, /* 206 */
{ 0xA0, 0, 1, 6, "" }, /* 207 */
{ 0x2A, 0, 1, 7, "ITA" }, /* 208 */
- { 0x01, 0, 0, 8, "strongSwan" }, /* 209 */
- { 0x89, 217, 1, 5, "" }, /* 210 */
- { 0x31, 0, 1, 6, "" }, /* 211 */
- { 0x01, 0, 1, 7, "" }, /* 212 */
- { 0x01, 0, 1, 8, "" }, /* 213 */
- { 0x02, 0, 1, 9, "" }, /* 214 */
- { 0x02, 0, 1, 10, "" }, /* 215 */
- { 0x4B, 0, 0, 11, "TCGID" }, /* 216 */
- { 0xC1, 0, 1, 5, "" }, /* 217 */
- { 0x16, 0, 1, 6, "ntruCryptosystems" }, /* 218 */
- { 0x01, 0, 1, 7, "eess" }, /* 219 */
- { 0x01, 0, 1, 8, "eess1" }, /* 220 */
- { 0x01, 225, 1, 9, "eess1-algs" }, /* 221 */
- { 0x01, 223, 0, 10, "ntru-EESS1v1-SVES" }, /* 222 */
- { 0x02, 224, 0, 10, "ntru-EESS1v1-SVSSA" }, /* 223 */
- { 0x03, 0, 0, 10, "ntru-EESS1v1-NTRUSign" }, /* 224 */
- { 0x02, 255, 1, 9, "eess1-params" }, /* 225 */
- { 0x01, 227, 0, 10, "ees251ep1" }, /* 226 */
- { 0x02, 228, 0, 10, "ees347ep1" }, /* 227 */
- { 0x03, 229, 0, 10, "ees503ep1" }, /* 228 */
- { 0x07, 230, 0, 10, "ees251sp2" }, /* 229 */
- { 0x0C, 231, 0, 10, "ees251ep4" }, /* 230 */
- { 0x0D, 232, 0, 10, "ees251ep5" }, /* 231 */
- { 0x0E, 233, 0, 10, "ees251sp3" }, /* 232 */
- { 0x0F, 234, 0, 10, "ees251sp4" }, /* 233 */
- { 0x10, 235, 0, 10, "ees251sp5" }, /* 234 */
- { 0x11, 236, 0, 10, "ees251sp6" }, /* 235 */
- { 0x12, 237, 0, 10, "ees251sp7" }, /* 236 */
- { 0x13, 238, 0, 10, "ees251sp8" }, /* 237 */
- { 0x14, 239, 0, 10, "ees251sp9" }, /* 238 */
- { 0x22, 240, 0, 10, "ees401ep1" }, /* 239 */
- { 0x23, 241, 0, 10, "ees449ep1" }, /* 240 */
- { 0x24, 242, 0, 10, "ees677ep1" }, /* 241 */
- { 0x25, 243, 0, 10, "ees1087ep2" }, /* 242 */
- { 0x26, 244, 0, 10, "ees541ep1" }, /* 243 */
- { 0x27, 245, 0, 10, "ees613ep1" }, /* 244 */
- { 0x28, 246, 0, 10, "ees887ep1" }, /* 245 */
- { 0x29, 247, 0, 10, "ees1171ep1" }, /* 246 */
- { 0x2A, 248, 0, 10, "ees659ep1" }, /* 247 */
- { 0x2B, 249, 0, 10, "ees761ep1" }, /* 248 */
- { 0x2C, 250, 0, 10, "ees1087ep1" }, /* 249 */
- { 0x2D, 251, 0, 10, "ees1499ep1" }, /* 250 */
- { 0x2E, 252, 0, 10, "ees401ep2" }, /* 251 */
- { 0x2F, 253, 0, 10, "ees439ep1" }, /* 252 */
- { 0x30, 254, 0, 10, "ees593ep1" }, /* 253 */
- { 0x31, 0, 0, 10, "ees743ep1" }, /* 254 */
- { 0x03, 0, 0, 9, "eess1-encodingMethods" }, /* 255 */
- { 0x05, 0, 1, 3, "security" }, /* 256 */
- { 0x05, 0, 1, 4, "mechanisms" }, /* 257 */
- { 0x07, 302, 1, 5, "id-pkix" }, /* 258 */
- { 0x01, 263, 1, 6, "id-pe" }, /* 259 */
- { 0x01, 261, 0, 7, "authorityInfoAccess" }, /* 260 */
- { 0x03, 262, 0, 7, "qcStatements" }, /* 261 */
- { 0x07, 0, 0, 7, "ipAddrBlocks" }, /* 262 */
- { 0x02, 266, 1, 6, "id-qt" }, /* 263 */
- { 0x01, 265, 0, 7, "cps" }, /* 264 */
- { 0x02, 0, 0, 7, "unotice" }, /* 265 */
- { 0x03, 276, 1, 6, "id-kp" }, /* 266 */
- { 0x01, 268, 0, 7, "serverAuth" }, /* 267 */
- { 0x02, 269, 0, 7, "clientAuth" }, /* 268 */
- { 0x03, 270, 0, 7, "codeSigning" }, /* 269 */
- { 0x04, 271, 0, 7, "emailProtection" }, /* 270 */
- { 0x05, 272, 0, 7, "ipsecEndSystem" }, /* 271 */
- { 0x06, 273, 0, 7, "ipsecTunnel" }, /* 272 */
- { 0x07, 274, 0, 7, "ipsecUser" }, /* 273 */
- { 0x08, 275, 0, 7, "timeStamping" }, /* 274 */
- { 0x09, 0, 0, 7, "ocspSigning" }, /* 275 */
- { 0x08, 284, 1, 6, "id-otherNames" }, /* 276 */
- { 0x01, 278, 0, 7, "personalData" }, /* 277 */
- { 0x02, 279, 0, 7, "userGroup" }, /* 278 */
- { 0x03, 280, 0, 7, "id-on-permanentIdentifier" }, /* 279 */
- { 0x04, 281, 0, 7, "id-on-hardwareModuleName" }, /* 280 */
- { 0x05, 282, 0, 7, "xmppAddr" }, /* 281 */
- { 0x06, 283, 0, 7, "id-on-SIM" }, /* 282 */
- { 0x07, 0, 0, 7, "id-on-dnsSRV" }, /* 283 */
- { 0x0A, 289, 1, 6, "id-aca" }, /* 284 */
- { 0x01, 286, 0, 7, "authenticationInfo" }, /* 285 */
- { 0x02, 287, 0, 7, "accessIdentity" }, /* 286 */
- { 0x03, 288, 0, 7, "chargingIdentity" }, /* 287 */
- { 0x04, 0, 0, 7, "group" }, /* 288 */
- { 0x0B, 290, 0, 6, "subjectInfoAccess" }, /* 289 */
- { 0x30, 0, 1, 6, "id-ad" }, /* 290 */
- { 0x01, 299, 1, 7, "ocsp" }, /* 291 */
- { 0x01, 293, 0, 8, "basic" }, /* 292 */
- { 0x02, 294, 0, 8, "nonce" }, /* 293 */
- { 0x03, 295, 0, 8, "crl" }, /* 294 */
- { 0x04, 296, 0, 8, "response" }, /* 295 */
- { 0x05, 297, 0, 8, "noCheck" }, /* 296 */
- { 0x06, 298, 0, 8, "archiveCutoff" }, /* 297 */
- { 0x07, 0, 0, 8, "serviceLocator" }, /* 298 */
- { 0x02, 300, 0, 7, "caIssuers" }, /* 299 */
- { 0x03, 301, 0, 7, "timeStamping" }, /* 300 */
- { 0x05, 0, 0, 7, "caRepository" }, /* 301 */
- { 0x08, 0, 1, 5, "ipsec" }, /* 302 */
- { 0x02, 0, 1, 6, "certificate" }, /* 303 */
- { 0x02, 0, 0, 7, "iKEIntermediate" }, /* 304 */
- { 0x0E, 311, 1, 1, "oiw" }, /* 305 */
- { 0x03, 0, 1, 2, "secsig" }, /* 306 */
- { 0x02, 0, 1, 3, "algorithms" }, /* 307 */
- { 0x07, 309, 0, 4, "des-cbc" }, /* 308 */
- { 0x1A, 310, 0, 4, "sha-1" }, /* 309 */
- { 0x1D, 0, 0, 4, "sha-1WithRSASignature" }, /* 310 */
- { 0x24, 357, 1, 1, "TeleTrusT" }, /* 311 */
- { 0x03, 0, 1, 2, "algorithm" }, /* 312 */
- { 0x03, 0, 1, 3, "signatureAlgorithm" }, /* 313 */
- { 0x01, 318, 1, 4, "rsaSignature" }, /* 314 */
- { 0x02, 316, 0, 5, "rsaSigWithripemd160" }, /* 315 */
- { 0x03, 317, 0, 5, "rsaSigWithripemd128" }, /* 316 */
- { 0x04, 0, 0, 5, "rsaSigWithripemd256" }, /* 317 */
- { 0x02, 0, 1, 4, "ecSign" }, /* 318 */
- { 0x01, 320, 0, 5, "ecSignWithsha1" }, /* 319 */
- { 0x02, 321, 0, 5, "ecSignWithripemd160" }, /* 320 */
- { 0x03, 322, 0, 5, "ecSignWithmd2" }, /* 321 */
- { 0x04, 323, 0, 5, "ecSignWithmd5" }, /* 322 */
- { 0x05, 340, 1, 5, "ttt-ecg" }, /* 323 */
- { 0x01, 328, 1, 6, "fieldType" }, /* 324 */
- { 0x01, 0, 1, 7, "characteristictwoField" }, /* 325 */
- { 0x01, 0, 1, 8, "basisType" }, /* 326 */
- { 0x01, 0, 0, 9, "ipBasis" }, /* 327 */
- { 0x02, 330, 1, 6, "keyType" }, /* 328 */
- { 0x01, 0, 0, 7, "ecgPublicKey" }, /* 329 */
- { 0x03, 331, 0, 6, "curve" }, /* 330 */
- { 0x04, 338, 1, 6, "signatures" }, /* 331 */
- { 0x01, 333, 0, 7, "ecgdsa-with-RIPEMD160" }, /* 332 */
- { 0x02, 334, 0, 7, "ecgdsa-with-SHA1" }, /* 333 */
- { 0x03, 335, 0, 7, "ecgdsa-with-SHA224" }, /* 334 */
- { 0x04, 336, 0, 7, "ecgdsa-with-SHA256" }, /* 335 */
- { 0x05, 337, 0, 7, "ecgdsa-with-SHA384" }, /* 336 */
- { 0x06, 0, 0, 7, "ecgdsa-with-SHA512" }, /* 337 */
- { 0x05, 0, 1, 6, "module" }, /* 338 */
- { 0x01, 0, 0, 7, "1" }, /* 339 */
- { 0x08, 0, 1, 5, "ecStdCurvesAndGeneration" }, /* 340 */
- { 0x01, 0, 1, 6, "ellipticCurve" }, /* 341 */
- { 0x01, 0, 1, 7, "versionOne" }, /* 342 */
- { 0x01, 344, 0, 8, "brainpoolP160r1" }, /* 343 */
- { 0x02, 345, 0, 8, "brainpoolP160t1" }, /* 344 */
- { 0x03, 346, 0, 8, "brainpoolP192r1" }, /* 345 */
- { 0x04, 347, 0, 8, "brainpoolP192t1" }, /* 346 */
- { 0x05, 348, 0, 8, "brainpoolP224r1" }, /* 347 */
- { 0x06, 349, 0, 8, "brainpoolP224t1" }, /* 348 */
- { 0x07, 350, 0, 8, "brainpoolP256r1" }, /* 349 */
- { 0x08, 351, 0, 8, "brainpoolP256t1" }, /* 350 */
- { 0x09, 352, 0, 8, "brainpoolP320r1" }, /* 351 */
- { 0x0A, 353, 0, 8, "brainpoolP320t1" }, /* 352 */
- { 0x0B, 354, 0, 8, "brainpoolP384r1" }, /* 353 */
- { 0x0C, 355, 0, 8, "brainpoolP384t1" }, /* 354 */
- { 0x0D, 356, 0, 8, "brainpoolP512r1" }, /* 355 */
- { 0x0E, 0, 0, 8, "brainpoolP512t1" }, /* 356 */
- { 0x81, 0, 1, 1, "" }, /* 357 */
- { 0x04, 0, 1, 2, "Certicom" }, /* 358 */
- { 0x00, 0, 1, 3, "curve" }, /* 359 */
- { 0x01, 361, 0, 4, "sect163k1" }, /* 360 */
- { 0x02, 362, 0, 4, "sect163r1" }, /* 361 */
- { 0x03, 363, 0, 4, "sect239k1" }, /* 362 */
- { 0x04, 364, 0, 4, "sect113r1" }, /* 363 */
- { 0x05, 365, 0, 4, "sect113r2" }, /* 364 */
- { 0x06, 366, 0, 4, "secp112r1" }, /* 365 */
- { 0x07, 367, 0, 4, "secp112r2" }, /* 366 */
- { 0x08, 368, 0, 4, "secp160r1" }, /* 367 */
- { 0x09, 369, 0, 4, "secp160k1" }, /* 368 */
- { 0x0A, 370, 0, 4, "secp256k1" }, /* 369 */
- { 0x0F, 371, 0, 4, "sect163r2" }, /* 370 */
- { 0x10, 372, 0, 4, "sect283k1" }, /* 371 */
- { 0x11, 373, 0, 4, "sect283r1" }, /* 372 */
- { 0x16, 374, 0, 4, "sect131r1" }, /* 373 */
- { 0x17, 375, 0, 4, "sect131r2" }, /* 374 */
- { 0x18, 376, 0, 4, "sect193r1" }, /* 375 */
- { 0x19, 377, 0, 4, "sect193r2" }, /* 376 */
- { 0x1A, 378, 0, 4, "sect233k1" }, /* 377 */
- { 0x1B, 379, 0, 4, "sect233r1" }, /* 378 */
- { 0x1C, 380, 0, 4, "secp128r1" }, /* 379 */
- { 0x1D, 381, 0, 4, "secp128r2" }, /* 380 */
- { 0x1E, 382, 0, 4, "secp160r2" }, /* 381 */
- { 0x1F, 383, 0, 4, "secp192k1" }, /* 382 */
- { 0x20, 384, 0, 4, "secp224k1" }, /* 383 */
- { 0x21, 385, 0, 4, "secp224r1" }, /* 384 */
- { 0x22, 386, 0, 4, "secp384r1" }, /* 385 */
- { 0x23, 387, 0, 4, "secp521r1" }, /* 386 */
- { 0x24, 388, 0, 4, "sect409k1" }, /* 387 */
- { 0x25, 389, 0, 4, "sect409r1" }, /* 388 */
- { 0x26, 390, 0, 4, "sect571k1" }, /* 389 */
- { 0x27, 0, 0, 4, "sect571r1" }, /* 390 */
- {0x60, 445, 1, 0, "" }, /* 391 */
- { 0x86, 0, 1, 1, "" }, /* 392 */
- { 0x48, 0, 1, 2, "" }, /* 393 */
- { 0x01, 0, 1, 3, "organization" }, /* 394 */
- { 0x65, 421, 1, 4, "gov" }, /* 395 */
- { 0x03, 0, 1, 5, "csor" }, /* 396 */
- { 0x04, 0, 1, 6, "nistalgorithm" }, /* 397 */
- { 0x01, 408, 1, 7, "aes" }, /* 398 */
- { 0x02, 400, 0, 8, "id-aes128-CBC" }, /* 399 */
- { 0x06, 401, 0, 8, "id-aes128-GCM" }, /* 400 */
- { 0x07, 402, 0, 8, "id-aes128-CCM" }, /* 401 */
- { 0x16, 403, 0, 8, "id-aes192-CBC" }, /* 402 */
- { 0x1A, 404, 0, 8, "id-aes192-GCM" }, /* 403 */
- { 0x1B, 405, 0, 8, "id-aes192-CCM" }, /* 404 */
- { 0x2A, 406, 0, 8, "id-aes256-CBC" }, /* 405 */
- { 0x2E, 407, 0, 8, "id-aes256-GCM" }, /* 406 */
- { 0x2F, 0, 0, 8, "id-aes256-CCM" }, /* 407 */
- { 0x02, 0, 1, 7, "hashalgs" }, /* 408 */
- { 0x01, 410, 0, 8, "id-sha256" }, /* 409 */
- { 0x02, 411, 0, 8, "id-sha384" }, /* 410 */
- { 0x03, 412, 0, 8, "id-sha512" }, /* 411 */
- { 0x04, 413, 0, 8, "id-sha224" }, /* 412 */
- { 0x05, 414, 0, 8, "id-sha512-224" }, /* 413 */
- { 0x06, 415, 0, 8, "id-sha512-256" }, /* 414 */
- { 0x07, 416, 0, 8, "id-sha3-224" }, /* 415 */
- { 0x08, 417, 0, 8, "id-sha3-256" }, /* 416 */
- { 0x09, 418, 0, 8, "id-sha3-384" }, /* 417 */
- { 0x0A, 419, 0, 8, "id-sha3-512" }, /* 418 */
- { 0x0B, 420, 0, 8, "id-shake128" }, /* 419 */
- { 0x0C, 0, 0, 8, "id-shake256" }, /* 420 */
- { 0x86, 0, 1, 4, "" }, /* 421 */
- { 0xf8, 0, 1, 5, "" }, /* 422 */
- { 0x42, 435, 1, 6, "netscape" }, /* 423 */
- { 0x01, 430, 1, 7, "" }, /* 424 */
- { 0x01, 426, 0, 8, "nsCertType" }, /* 425 */
- { 0x03, 427, 0, 8, "nsRevocationUrl" }, /* 426 */
- { 0x04, 428, 0, 8, "nsCaRevocationUrl" }, /* 427 */
- { 0x08, 429, 0, 8, "nsCaPolicyUrl" }, /* 428 */
- { 0x0d, 0, 0, 8, "nsComment" }, /* 429 */
- { 0x03, 433, 1, 7, "directory" }, /* 430 */
- { 0x01, 0, 1, 8, "" }, /* 431 */
- { 0x03, 0, 0, 9, "employeeNumber" }, /* 432 */
- { 0x04, 0, 1, 7, "policy" }, /* 433 */
- { 0x01, 0, 0, 8, "nsSGC" }, /* 434 */
- { 0x45, 0, 1, 6, "verisign" }, /* 435 */
- { 0x01, 0, 1, 7, "pki" }, /* 436 */
- { 0x09, 0, 1, 8, "attributes" }, /* 437 */
- { 0x02, 439, 0, 9, "messageType" }, /* 438 */
- { 0x03, 440, 0, 9, "pkiStatus" }, /* 439 */
- { 0x04, 441, 0, 9, "failInfo" }, /* 440 */
- { 0x05, 442, 0, 9, "senderNonce" }, /* 441 */
- { 0x06, 443, 0, 9, "recipientNonce" }, /* 442 */
- { 0x07, 444, 0, 9, "transID" }, /* 443 */
- { 0x08, 0, 0, 9, "extensionReq" }, /* 444 */
- {0x67, 0, 1, 0, "" }, /* 445 */
- { 0x81, 0, 1, 1, "" }, /* 446 */
- { 0x05, 0, 1, 2, "" }, /* 447 */
- { 0x02, 0, 1, 3, "tcg-attribute" }, /* 448 */
- { 0x01, 450, 0, 4, "tcg-at-tpmManufacturer" }, /* 449 */
- { 0x02, 451, 0, 4, "tcg-at-tpmModel" }, /* 450 */
- { 0x03, 452, 0, 4, "tcg-at-tpmVersion" }, /* 451 */
- { 0x0F, 0, 0, 4, "tcg-at-tpmIdLabel" } /* 452 */
+ { 0x01, 210, 0, 8, "strongSwan" }, /* 209 */
+ { 0x02, 211, 0, 8, "cps" }, /* 210 */
+ { 0x03, 212, 0, 8, "e-voting" }, /* 211 */
+ { 0x05, 0, 1, 8, "BLISS" }, /* 212 */
+ { 0x01, 215, 1, 9, "keyType" }, /* 213 */
+ { 0x01, 0, 0, 10, "blissPublicKey" }, /* 214 */
+ { 0x02, 224, 1, 9, "parameters" }, /* 215 */
+ { 0x01, 217, 0, 10, "BLISS-I" }, /* 216 */
+ { 0x02, 218, 0, 10, "BLISS-II" }, /* 217 */
+ { 0x03, 219, 0, 10, "BLISS-III" }, /* 218 */
+ { 0x04, 220, 0, 10, "BLISS-IV" }, /* 219 */
+ { 0x05, 221, 0, 10, "BLISS-B-I" }, /* 220 */
+ { 0x06, 222, 0, 10, "BLISS-B-II" }, /* 221 */
+ { 0x07, 223, 0, 10, "BLISS-B-III" }, /* 222 */
+ { 0x08, 0, 0, 10, "BLISS-B-IV" }, /* 223 */
+ { 0x03, 0, 1, 9, "blissSigType" }, /* 224 */
+ { 0x01, 226, 0, 10, "BLISS-with-SHA512" }, /* 225 */
+ { 0x02, 227, 0, 10, "BLISS-with-SHA384" }, /* 226 */
+ { 0x03, 0, 0, 10, "BLISS-with-SHA256" }, /* 227 */
+ { 0x89, 235, 1, 5, "" }, /* 228 */
+ { 0x31, 0, 1, 6, "" }, /* 229 */
+ { 0x01, 0, 1, 7, "" }, /* 230 */
+ { 0x01, 0, 1, 8, "" }, /* 231 */
+ { 0x02, 0, 1, 9, "" }, /* 232 */
+ { 0x02, 0, 1, 10, "" }, /* 233 */
+ { 0x4B, 0, 0, 11, "TCGID" }, /* 234 */
+ { 0x97, 239, 1, 5, "" }, /* 235 */
+ { 0x55, 0, 1, 6, "" }, /* 236 */
+ { 0x01, 0, 1, 7, "" }, /* 237 */
+ { 0x02, 0, 0, 8, "blowfish-cbc" }, /* 238 */
+ { 0xC1, 0, 1, 5, "" }, /* 239 */
+ { 0x16, 0, 1, 6, "ntruCryptosystems" }, /* 240 */
+ { 0x01, 0, 1, 7, "eess" }, /* 241 */
+ { 0x01, 0, 1, 8, "eess1" }, /* 242 */
+ { 0x01, 247, 1, 9, "eess1-algs" }, /* 243 */
+ { 0x01, 245, 0, 10, "ntru-EESS1v1-SVES" }, /* 244 */
+ { 0x02, 246, 0, 10, "ntru-EESS1v1-SVSSA" }, /* 245 */
+ { 0x03, 0, 0, 10, "ntru-EESS1v1-NTRUSign" }, /* 246 */
+ { 0x02, 277, 1, 9, "eess1-params" }, /* 247 */
+ { 0x01, 249, 0, 10, "ees251ep1" }, /* 248 */
+ { 0x02, 250, 0, 10, "ees347ep1" }, /* 249 */
+ { 0x03, 251, 0, 10, "ees503ep1" }, /* 250 */
+ { 0x07, 252, 0, 10, "ees251sp2" }, /* 251 */
+ { 0x0C, 253, 0, 10, "ees251ep4" }, /* 252 */
+ { 0x0D, 254, 0, 10, "ees251ep5" }, /* 253 */
+ { 0x0E, 255, 0, 10, "ees251sp3" }, /* 254 */
+ { 0x0F, 256, 0, 10, "ees251sp4" }, /* 255 */
+ { 0x10, 257, 0, 10, "ees251sp5" }, /* 256 */
+ { 0x11, 258, 0, 10, "ees251sp6" }, /* 257 */
+ { 0x12, 259, 0, 10, "ees251sp7" }, /* 258 */
+ { 0x13, 260, 0, 10, "ees251sp8" }, /* 259 */
+ { 0x14, 261, 0, 10, "ees251sp9" }, /* 260 */
+ { 0x22, 262, 0, 10, "ees401ep1" }, /* 261 */
+ { 0x23, 263, 0, 10, "ees449ep1" }, /* 262 */
+ { 0x24, 264, 0, 10, "ees677ep1" }, /* 263 */
+ { 0x25, 265, 0, 10, "ees1087ep2" }, /* 264 */
+ { 0x26, 266, 0, 10, "ees541ep1" }, /* 265 */
+ { 0x27, 267, 0, 10, "ees613ep1" }, /* 266 */
+ { 0x28, 268, 0, 10, "ees887ep1" }, /* 267 */
+ { 0x29, 269, 0, 10, "ees1171ep1" }, /* 268 */
+ { 0x2A, 270, 0, 10, "ees659ep1" }, /* 269 */
+ { 0x2B, 271, 0, 10, "ees761ep1" }, /* 270 */
+ { 0x2C, 272, 0, 10, "ees1087ep1" }, /* 271 */
+ { 0x2D, 273, 0, 10, "ees1499ep1" }, /* 272 */
+ { 0x2E, 274, 0, 10, "ees401ep2" }, /* 273 */
+ { 0x2F, 275, 0, 10, "ees439ep1" }, /* 274 */
+ { 0x30, 276, 0, 10, "ees593ep1" }, /* 275 */
+ { 0x31, 0, 0, 10, "ees743ep1" }, /* 276 */
+ { 0x03, 0, 0, 9, "eess1-encodingMethods" }, /* 277 */
+ { 0x05, 0, 1, 3, "security" }, /* 278 */
+ { 0x05, 0, 1, 4, "mechanisms" }, /* 279 */
+ { 0x07, 324, 1, 5, "id-pkix" }, /* 280 */
+ { 0x01, 285, 1, 6, "id-pe" }, /* 281 */
+ { 0x01, 283, 0, 7, "authorityInfoAccess" }, /* 282 */
+ { 0x03, 284, 0, 7, "qcStatements" }, /* 283 */
+ { 0x07, 0, 0, 7, "ipAddrBlocks" }, /* 284 */
+ { 0x02, 288, 1, 6, "id-qt" }, /* 285 */
+ { 0x01, 287, 0, 7, "cps" }, /* 286 */
+ { 0x02, 0, 0, 7, "unotice" }, /* 287 */
+ { 0x03, 298, 1, 6, "id-kp" }, /* 288 */
+ { 0x01, 290, 0, 7, "serverAuth" }, /* 289 */
+ { 0x02, 291, 0, 7, "clientAuth" }, /* 290 */
+ { 0x03, 292, 0, 7, "codeSigning" }, /* 291 */
+ { 0x04, 293, 0, 7, "emailProtection" }, /* 292 */
+ { 0x05, 294, 0, 7, "ipsecEndSystem" }, /* 293 */
+ { 0x06, 295, 0, 7, "ipsecTunnel" }, /* 294 */
+ { 0x07, 296, 0, 7, "ipsecUser" }, /* 295 */
+ { 0x08, 297, 0, 7, "timeStamping" }, /* 296 */
+ { 0x09, 0, 0, 7, "ocspSigning" }, /* 297 */
+ { 0x08, 306, 1, 6, "id-otherNames" }, /* 298 */
+ { 0x01, 300, 0, 7, "personalData" }, /* 299 */
+ { 0x02, 301, 0, 7, "userGroup" }, /* 300 */
+ { 0x03, 302, 0, 7, "id-on-permanentIdentifier" }, /* 301 */
+ { 0x04, 303, 0, 7, "id-on-hardwareModuleName" }, /* 302 */
+ { 0x05, 304, 0, 7, "xmppAddr" }, /* 303 */
+ { 0x06, 305, 0, 7, "id-on-SIM" }, /* 304 */
+ { 0x07, 0, 0, 7, "id-on-dnsSRV" }, /* 305 */
+ { 0x0A, 311, 1, 6, "id-aca" }, /* 306 */
+ { 0x01, 308, 0, 7, "authenticationInfo" }, /* 307 */
+ { 0x02, 309, 0, 7, "accessIdentity" }, /* 308 */
+ { 0x03, 310, 0, 7, "chargingIdentity" }, /* 309 */
+ { 0x04, 0, 0, 7, "group" }, /* 310 */
+ { 0x0B, 312, 0, 6, "subjectInfoAccess" }, /* 311 */
+ { 0x30, 0, 1, 6, "id-ad" }, /* 312 */
+ { 0x01, 321, 1, 7, "ocsp" }, /* 313 */
+ { 0x01, 315, 0, 8, "basic" }, /* 314 */
+ { 0x02, 316, 0, 8, "nonce" }, /* 315 */
+ { 0x03, 317, 0, 8, "crl" }, /* 316 */
+ { 0x04, 318, 0, 8, "response" }, /* 317 */
+ { 0x05, 319, 0, 8, "noCheck" }, /* 318 */
+ { 0x06, 320, 0, 8, "archiveCutoff" }, /* 319 */
+ { 0x07, 0, 0, 8, "serviceLocator" }, /* 320 */
+ { 0x02, 322, 0, 7, "caIssuers" }, /* 321 */
+ { 0x03, 323, 0, 7, "timeStamping" }, /* 322 */
+ { 0x05, 0, 0, 7, "caRepository" }, /* 323 */
+ { 0x08, 0, 1, 5, "ipsec" }, /* 324 */
+ { 0x02, 0, 1, 6, "certificate" }, /* 325 */
+ { 0x02, 0, 0, 7, "iKEIntermediate" }, /* 326 */
+ { 0x0E, 333, 1, 1, "oiw" }, /* 327 */
+ { 0x03, 0, 1, 2, "secsig" }, /* 328 */
+ { 0x02, 0, 1, 3, "algorithms" }, /* 329 */
+ { 0x07, 331, 0, 4, "des-cbc" }, /* 330 */
+ { 0x1A, 332, 0, 4, "sha-1" }, /* 331 */
+ { 0x1D, 0, 0, 4, "sha-1WithRSASignature" }, /* 332 */
+ { 0x24, 379, 1, 1, "TeleTrusT" }, /* 333 */
+ { 0x03, 0, 1, 2, "algorithm" }, /* 334 */
+ { 0x03, 0, 1, 3, "signatureAlgorithm" }, /* 335 */
+ { 0x01, 340, 1, 4, "rsaSignature" }, /* 336 */
+ { 0x02, 338, 0, 5, "rsaSigWithripemd160" }, /* 337 */
+ { 0x03, 339, 0, 5, "rsaSigWithripemd128" }, /* 338 */
+ { 0x04, 0, 0, 5, "rsaSigWithripemd256" }, /* 339 */
+ { 0x02, 0, 1, 4, "ecSign" }, /* 340 */
+ { 0x01, 342, 0, 5, "ecSignWithsha1" }, /* 341 */
+ { 0x02, 343, 0, 5, "ecSignWithripemd160" }, /* 342 */
+ { 0x03, 344, 0, 5, "ecSignWithmd2" }, /* 343 */
+ { 0x04, 345, 0, 5, "ecSignWithmd5" }, /* 344 */
+ { 0x05, 362, 1, 5, "ttt-ecg" }, /* 345 */
+ { 0x01, 350, 1, 6, "fieldType" }, /* 346 */
+ { 0x01, 0, 1, 7, "characteristictwoField" }, /* 347 */
+ { 0x01, 0, 1, 8, "basisType" }, /* 348 */
+ { 0x01, 0, 0, 9, "ipBasis" }, /* 349 */
+ { 0x02, 352, 1, 6, "keyType" }, /* 350 */
+ { 0x01, 0, 0, 7, "ecgPublicKey" }, /* 351 */
+ { 0x03, 353, 0, 6, "curve" }, /* 352 */
+ { 0x04, 360, 1, 6, "signatures" }, /* 353 */
+ { 0x01, 355, 0, 7, "ecgdsa-with-RIPEMD160" }, /* 354 */
+ { 0x02, 356, 0, 7, "ecgdsa-with-SHA1" }, /* 355 */
+ { 0x03, 357, 0, 7, "ecgdsa-with-SHA224" }, /* 356 */
+ { 0x04, 358, 0, 7, "ecgdsa-with-SHA256" }, /* 357 */
+ { 0x05, 359, 0, 7, "ecgdsa-with-SHA384" }, /* 358 */
+ { 0x06, 0, 0, 7, "ecgdsa-with-SHA512" }, /* 359 */
+ { 0x05, 0, 1, 6, "module" }, /* 360 */
+ { 0x01, 0, 0, 7, "1" }, /* 361 */
+ { 0x08, 0, 1, 5, "ecStdCurvesAndGeneration" }, /* 362 */
+ { 0x01, 0, 1, 6, "ellipticCurve" }, /* 363 */
+ { 0x01, 0, 1, 7, "versionOne" }, /* 364 */
+ { 0x01, 366, 0, 8, "brainpoolP160r1" }, /* 365 */
+ { 0x02, 367, 0, 8, "brainpoolP160t1" }, /* 366 */
+ { 0x03, 368, 0, 8, "brainpoolP192r1" }, /* 367 */
+ { 0x04, 369, 0, 8, "brainpoolP192t1" }, /* 368 */
+ { 0x05, 370, 0, 8, "brainpoolP224r1" }, /* 369 */
+ { 0x06, 371, 0, 8, "brainpoolP224t1" }, /* 370 */
+ { 0x07, 372, 0, 8, "brainpoolP256r1" }, /* 371 */
+ { 0x08, 373, 0, 8, "brainpoolP256t1" }, /* 372 */
+ { 0x09, 374, 0, 8, "brainpoolP320r1" }, /* 373 */
+ { 0x0A, 375, 0, 8, "brainpoolP320t1" }, /* 374 */
+ { 0x0B, 376, 0, 8, "brainpoolP384r1" }, /* 375 */
+ { 0x0C, 377, 0, 8, "brainpoolP384t1" }, /* 376 */
+ { 0x0D, 378, 0, 8, "brainpoolP512r1" }, /* 377 */
+ { 0x0E, 0, 0, 8, "brainpoolP512t1" }, /* 378 */
+ { 0x81, 0, 1, 1, "" }, /* 379 */
+ { 0x04, 0, 1, 2, "Certicom" }, /* 380 */
+ { 0x00, 0, 1, 3, "curve" }, /* 381 */
+ { 0x01, 383, 0, 4, "sect163k1" }, /* 382 */
+ { 0x02, 384, 0, 4, "sect163r1" }, /* 383 */
+ { 0x03, 385, 0, 4, "sect239k1" }, /* 384 */
+ { 0x04, 386, 0, 4, "sect113r1" }, /* 385 */
+ { 0x05, 387, 0, 4, "sect113r2" }, /* 386 */
+ { 0x06, 388, 0, 4, "secp112r1" }, /* 387 */
+ { 0x07, 389, 0, 4, "secp112r2" }, /* 388 */
+ { 0x08, 390, 0, 4, "secp160r1" }, /* 389 */
+ { 0x09, 391, 0, 4, "secp160k1" }, /* 390 */
+ { 0x0A, 392, 0, 4, "secp256k1" }, /* 391 */
+ { 0x0F, 393, 0, 4, "sect163r2" }, /* 392 */
+ { 0x10, 394, 0, 4, "sect283k1" }, /* 393 */
+ { 0x11, 395, 0, 4, "sect283r1" }, /* 394 */
+ { 0x16, 396, 0, 4, "sect131r1" }, /* 395 */
+ { 0x17, 397, 0, 4, "sect131r2" }, /* 396 */
+ { 0x18, 398, 0, 4, "sect193r1" }, /* 397 */
+ { 0x19, 399, 0, 4, "sect193r2" }, /* 398 */
+ { 0x1A, 400, 0, 4, "sect233k1" }, /* 399 */
+ { 0x1B, 401, 0, 4, "sect233r1" }, /* 400 */
+ { 0x1C, 402, 0, 4, "secp128r1" }, /* 401 */
+ { 0x1D, 403, 0, 4, "secp128r2" }, /* 402 */
+ { 0x1E, 404, 0, 4, "secp160r2" }, /* 403 */
+ { 0x1F, 405, 0, 4, "secp192k1" }, /* 404 */
+ { 0x20, 406, 0, 4, "secp224k1" }, /* 405 */
+ { 0x21, 407, 0, 4, "secp224r1" }, /* 406 */
+ { 0x22, 408, 0, 4, "secp384r1" }, /* 407 */
+ { 0x23, 409, 0, 4, "secp521r1" }, /* 408 */
+ { 0x24, 410, 0, 4, "sect409k1" }, /* 409 */
+ { 0x25, 411, 0, 4, "sect409r1" }, /* 410 */
+ { 0x26, 412, 0, 4, "sect571k1" }, /* 411 */
+ { 0x27, 0, 0, 4, "sect571r1" }, /* 412 */
+ {0x60, 467, 1, 0, "" }, /* 413 */
+ { 0x86, 0, 1, 1, "" }, /* 414 */
+ { 0x48, 0, 1, 2, "" }, /* 415 */
+ { 0x01, 0, 1, 3, "organization" }, /* 416 */
+ { 0x65, 443, 1, 4, "gov" }, /* 417 */
+ { 0x03, 0, 1, 5, "csor" }, /* 418 */
+ { 0x04, 0, 1, 6, "nistalgorithm" }, /* 419 */
+ { 0x01, 430, 1, 7, "aes" }, /* 420 */
+ { 0x02, 422, 0, 8, "id-aes128-CBC" }, /* 421 */
+ { 0x06, 423, 0, 8, "id-aes128-GCM" }, /* 422 */
+ { 0x07, 424, 0, 8, "id-aes128-CCM" }, /* 423 */
+ { 0x16, 425, 0, 8, "id-aes192-CBC" }, /* 424 */
+ { 0x1A, 426, 0, 8, "id-aes192-GCM" }, /* 425 */
+ { 0x1B, 427, 0, 8, "id-aes192-CCM" }, /* 426 */
+ { 0x2A, 428, 0, 8, "id-aes256-CBC" }, /* 427 */
+ { 0x2E, 429, 0, 8, "id-aes256-GCM" }, /* 428 */
+ { 0x2F, 0, 0, 8, "id-aes256-CCM" }, /* 429 */
+ { 0x02, 0, 1, 7, "hashalgs" }, /* 430 */
+ { 0x01, 432, 0, 8, "id-sha256" }, /* 431 */
+ { 0x02, 433, 0, 8, "id-sha384" }, /* 432 */
+ { 0x03, 434, 0, 8, "id-sha512" }, /* 433 */
+ { 0x04, 435, 0, 8, "id-sha224" }, /* 434 */
+ { 0x05, 436, 0, 8, "id-sha512-224" }, /* 435 */
+ { 0x06, 437, 0, 8, "id-sha512-256" }, /* 436 */
+ { 0x07, 438, 0, 8, "id-sha3-224" }, /* 437 */
+ { 0x08, 439, 0, 8, "id-sha3-256" }, /* 438 */
+ { 0x09, 440, 0, 8, "id-sha3-384" }, /* 439 */
+ { 0x0A, 441, 0, 8, "id-sha3-512" }, /* 440 */
+ { 0x0B, 442, 0, 8, "id-shake128" }, /* 441 */
+ { 0x0C, 0, 0, 8, "id-shake256" }, /* 442 */
+ { 0x86, 0, 1, 4, "" }, /* 443 */
+ { 0xf8, 0, 1, 5, "" }, /* 444 */
+ { 0x42, 457, 1, 6, "netscape" }, /* 445 */
+ { 0x01, 452, 1, 7, "" }, /* 446 */
+ { 0x01, 448, 0, 8, "nsCertType" }, /* 447 */
+ { 0x03, 449, 0, 8, "nsRevocationUrl" }, /* 448 */
+ { 0x04, 450, 0, 8, "nsCaRevocationUrl" }, /* 449 */
+ { 0x08, 451, 0, 8, "nsCaPolicyUrl" }, /* 450 */
+ { 0x0d, 0, 0, 8, "nsComment" }, /* 451 */
+ { 0x03, 455, 1, 7, "directory" }, /* 452 */
+ { 0x01, 0, 1, 8, "" }, /* 453 */
+ { 0x03, 0, 0, 9, "employeeNumber" }, /* 454 */
+ { 0x04, 0, 1, 7, "policy" }, /* 455 */
+ { 0x01, 0, 0, 8, "nsSGC" }, /* 456 */
+ { 0x45, 0, 1, 6, "verisign" }, /* 457 */
+ { 0x01, 0, 1, 7, "pki" }, /* 458 */
+ { 0x09, 0, 1, 8, "attributes" }, /* 459 */
+ { 0x02, 461, 0, 9, "messageType" }, /* 460 */
+ { 0x03, 462, 0, 9, "pkiStatus" }, /* 461 */
+ { 0x04, 463, 0, 9, "failInfo" }, /* 462 */
+ { 0x05, 464, 0, 9, "senderNonce" }, /* 463 */
+ { 0x06, 465, 0, 9, "recipientNonce" }, /* 464 */
+ { 0x07, 466, 0, 9, "transID" }, /* 465 */
+ { 0x08, 0, 0, 9, "extensionReq" }, /* 466 */
+ {0x67, 0, 1, 0, "" }, /* 467 */
+ { 0x81, 0, 1, 1, "" }, /* 468 */
+ { 0x05, 0, 1, 2, "" }, /* 469 */
+ { 0x02, 0, 1, 3, "tcg-attribute" }, /* 470 */
+ { 0x01, 472, 0, 4, "tcg-at-tpmManufacturer" }, /* 471 */
+ { 0x02, 473, 0, 4, "tcg-at-tpmModel" }, /* 472 */
+ { 0x03, 474, 0, 4, "tcg-at-tpmVersion" }, /* 473 */
+ { 0x0F, 0, 0, 4, "tcg-at-tpmIdLabel" } /* 474 */
};
diff --git a/src/libstrongswan/asn1/oid.h b/src/libstrongswan/asn1/oid.h
index 0933f236a..0f7c5d644 100644
--- a/src/libstrongswan/asn1/oid.h
+++ b/src/libstrongswan/asn1/oid.h
@@ -141,99 +141,112 @@ extern const oid_t oid_names[];
#define OID_MS_SMARTCARD_LOGON 202
#define OID_USER_PRINCIPAL_NAME 203
#define OID_STRONGSWAN 209
-#define OID_TCGID 216
-#define OID_AUTHORITY_INFO_ACCESS 260
-#define OID_IP_ADDR_BLOCKS 262
-#define OID_POLICY_QUALIFIER_CPS 264
-#define OID_POLICY_QUALIFIER_UNOTICE 265
-#define OID_SERVER_AUTH 267
-#define OID_CLIENT_AUTH 268
-#define OID_OCSP_SIGNING 275
-#define OID_XMPP_ADDR 281
-#define OID_AUTHENTICATION_INFO 285
-#define OID_ACCESS_IDENTITY 286
-#define OID_CHARGING_IDENTITY 287
-#define OID_GROUP 288
-#define OID_OCSP 291
-#define OID_BASIC 292
-#define OID_NONCE 293
-#define OID_CRL 294
-#define OID_RESPONSE 295
-#define OID_NO_CHECK 296
-#define OID_ARCHIVE_CUTOFF 297
-#define OID_SERVICE_LOCATOR 298
-#define OID_CA_ISSUERS 299
-#define OID_IKE_INTERMEDIATE 304
-#define OID_DES_CBC 308
-#define OID_SHA1 309
-#define OID_SHA1_WITH_RSA_OIW 310
-#define OID_ECGDSA_PUBKEY 329
-#define OID_ECGDSA_SIG_WITH_RIPEMD160 332
-#define OID_ECGDSA_SIG_WITH_SHA1 333
-#define OID_ECGDSA_SIG_WITH_SHA224 334
-#define OID_ECGDSA_SIG_WITH_SHA256 335
-#define OID_ECGDSA_SIG_WITH_SHA384 336
-#define OID_ECGDSA_SIG_WITH_SHA512 337
-#define OID_SECT163K1 360
-#define OID_SECT163R1 361
-#define OID_SECT239K1 362
-#define OID_SECT113R1 363
-#define OID_SECT113R2 364
-#define OID_SECT112R1 365
-#define OID_SECT112R2 366
-#define OID_SECT160R1 367
-#define OID_SECT160K1 368
-#define OID_SECT256K1 369
-#define OID_SECT163R2 370
-#define OID_SECT283K1 371
-#define OID_SECT283R1 372
-#define OID_SECT131R1 373
-#define OID_SECT131R2 374
-#define OID_SECT193R1 375
-#define OID_SECT193R2 376
-#define OID_SECT233K1 377
-#define OID_SECT233R1 378
-#define OID_SECT128R1 379
-#define OID_SECT128R2 380
-#define OID_SECT160R2 381
-#define OID_SECT192K1 382
-#define OID_SECT224K1 383
-#define OID_SECT224R1 384
-#define OID_SECT384R1 385
-#define OID_SECT521R1 386
-#define OID_SECT409K1 387
-#define OID_SECT409R1 388
-#define OID_SECT571K1 389
-#define OID_SECT571R1 390
-#define OID_AES128_CBC 399
-#define OID_AES128_GCM 400
-#define OID_AES128_CCM 401
-#define OID_AES192_CBC 402
-#define OID_AES192_GCM 403
-#define OID_AES192_CCM 404
-#define OID_AES256_CBC 405
-#define OID_AES256_GCM 406
-#define OID_AES256_CCM 407
-#define OID_SHA256 409
-#define OID_SHA384 410
-#define OID_SHA512 411
-#define OID_SHA224 412
-#define OID_NS_REVOCATION_URL 426
-#define OID_NS_CA_REVOCATION_URL 427
-#define OID_NS_CA_POLICY_URL 428
-#define OID_NS_COMMENT 429
-#define OID_EMPLOYEE_NUMBER 432
-#define OID_PKI_MESSAGE_TYPE 438
-#define OID_PKI_STATUS 439
-#define OID_PKI_FAIL_INFO 440
-#define OID_PKI_SENDER_NONCE 441
-#define OID_PKI_RECIPIENT_NONCE 442
-#define OID_PKI_TRANS_ID 443
-#define OID_TPM_MANUFACTURER 449
-#define OID_TPM_MODEL 450
-#define OID_TPM_VERSION 451
-#define OID_TPM_ID_LABEL 452
+#define OID_BLISS_PUBLICKEY 214
+#define OID_BLISS_I 216
+#define OID_BLISS_II 217
+#define OID_BLISS_III 218
+#define OID_BLISS_IV 219
+#define OID_BLISS_B_I 220
+#define OID_BLISS_B_II 221
+#define OID_BLISS_B_III 222
+#define OID_BLISS_B_IV 223
+#define OID_BLISS_WITH_SHA512 225
+#define OID_BLISS_WITH_SHA384 226
+#define OID_BLISS_WITH_SHA256 227
+#define OID_TCGID 234
+#define OID_BLOWFISH_CBC 238
+#define OID_AUTHORITY_INFO_ACCESS 282
+#define OID_IP_ADDR_BLOCKS 284
+#define OID_POLICY_QUALIFIER_CPS 286
+#define OID_POLICY_QUALIFIER_UNOTICE 287
+#define OID_SERVER_AUTH 289
+#define OID_CLIENT_AUTH 290
+#define OID_OCSP_SIGNING 297
+#define OID_XMPP_ADDR 303
+#define OID_AUTHENTICATION_INFO 307
+#define OID_ACCESS_IDENTITY 308
+#define OID_CHARGING_IDENTITY 309
+#define OID_GROUP 310
+#define OID_OCSP 313
+#define OID_BASIC 314
+#define OID_NONCE 315
+#define OID_CRL 316
+#define OID_RESPONSE 317
+#define OID_NO_CHECK 318
+#define OID_ARCHIVE_CUTOFF 319
+#define OID_SERVICE_LOCATOR 320
+#define OID_CA_ISSUERS 321
+#define OID_IKE_INTERMEDIATE 326
+#define OID_DES_CBC 330
+#define OID_SHA1 331
+#define OID_SHA1_WITH_RSA_OIW 332
+#define OID_ECGDSA_PUBKEY 351
+#define OID_ECGDSA_SIG_WITH_RIPEMD160 354
+#define OID_ECGDSA_SIG_WITH_SHA1 355
+#define OID_ECGDSA_SIG_WITH_SHA224 356
+#define OID_ECGDSA_SIG_WITH_SHA256 357
+#define OID_ECGDSA_SIG_WITH_SHA384 358
+#define OID_ECGDSA_SIG_WITH_SHA512 359
+#define OID_SECT163K1 382
+#define OID_SECT163R1 383
+#define OID_SECT239K1 384
+#define OID_SECT113R1 385
+#define OID_SECT113R2 386
+#define OID_SECT112R1 387
+#define OID_SECT112R2 388
+#define OID_SECT160R1 389
+#define OID_SECT160K1 390
+#define OID_SECT256K1 391
+#define OID_SECT163R2 392
+#define OID_SECT283K1 393
+#define OID_SECT283R1 394
+#define OID_SECT131R1 395
+#define OID_SECT131R2 396
+#define OID_SECT193R1 397
+#define OID_SECT193R2 398
+#define OID_SECT233K1 399
+#define OID_SECT233R1 400
+#define OID_SECT128R1 401
+#define OID_SECT128R2 402
+#define OID_SECT160R2 403
+#define OID_SECT192K1 404
+#define OID_SECT224K1 405
+#define OID_SECT224R1 406
+#define OID_SECT384R1 407
+#define OID_SECT521R1 408
+#define OID_SECT409K1 409
+#define OID_SECT409R1 410
+#define OID_SECT571K1 411
+#define OID_SECT571R1 412
+#define OID_AES128_CBC 421
+#define OID_AES128_GCM 422
+#define OID_AES128_CCM 423
+#define OID_AES192_CBC 424
+#define OID_AES192_GCM 425
+#define OID_AES192_CCM 426
+#define OID_AES256_CBC 427
+#define OID_AES256_GCM 428
+#define OID_AES256_CCM 429
+#define OID_SHA256 431
+#define OID_SHA384 432
+#define OID_SHA512 433
+#define OID_SHA224 434
+#define OID_NS_REVOCATION_URL 448
+#define OID_NS_CA_REVOCATION_URL 449
+#define OID_NS_CA_POLICY_URL 450
+#define OID_NS_COMMENT 451
+#define OID_EMPLOYEE_NUMBER 454
+#define OID_PKI_MESSAGE_TYPE 460
+#define OID_PKI_STATUS 461
+#define OID_PKI_FAIL_INFO 462
+#define OID_PKI_SENDER_NONCE 463
+#define OID_PKI_RECIPIENT_NONCE 464
+#define OID_PKI_TRANS_ID 465
+#define OID_TPM_MANUFACTURER 471
+#define OID_TPM_MODEL 472
+#define OID_TPM_VERSION 473
+#define OID_TPM_ID_LABEL 474
-#define OID_MAX 453
+#define OID_MAX 475
#endif /* OID_H_ */
diff --git a/src/libstrongswan/asn1/oid.txt b/src/libstrongswan/asn1/oid.txt
index e545188d4..919d24c43 100644
--- a/src/libstrongswan/asn1/oid.txt
+++ b/src/libstrongswan/asn1/oid.txt
@@ -208,6 +208,24 @@
0xA0 ""
0x2A "ITA"
0x01 "strongSwan" OID_STRONGSWAN
+ 0x02 "cps"
+ 0x03 "e-voting"
+ 0x05 "BLISS"
+ 0x01 "keyType"
+ 0x01 "blissPublicKey" OID_BLISS_PUBLICKEY
+ 0x02 "parameters"
+ 0x01 "BLISS-I" OID_BLISS_I
+ 0x02 "BLISS-II" OID_BLISS_II
+ 0x03 "BLISS-III" OID_BLISS_III
+ 0x04 "BLISS-IV" OID_BLISS_IV
+ 0x05 "BLISS-B-I" OID_BLISS_B_I
+ 0x06 "BLISS-B-II" OID_BLISS_B_II
+ 0x07 "BLISS-B-III" OID_BLISS_B_III
+ 0x08 "BLISS-B-IV" OID_BLISS_B_IV
+ 0x03 "blissSigType"
+ 0x01 "BLISS-with-SHA512" OID_BLISS_WITH_SHA512
+ 0x02 "BLISS-with-SHA384" OID_BLISS_WITH_SHA384
+ 0x03 "BLISS-with-SHA256" OID_BLISS_WITH_SHA256
0x89 ""
0x31 ""
0x01 ""
@@ -215,6 +233,10 @@
0x02 ""
0x02 ""
0x4B "TCGID" OID_TCGID
+ 0x97 ""
+ 0x55 ""
+ 0x01 ""
+ 0x02 "blowfish-cbc" OID_BLOWFISH_CBC
0xC1 ""
0x16 "ntruCryptosystems"
0x01 "eess"