From 05ddd767992d68bb38c7f16ece142e8c2e9ae016 Mon Sep 17 00:00:00 2001 From: Yves-Alexis Perez Date: Sat, 1 Apr 2017 16:26:44 +0200 Subject: New upstream version 5.5.2 --- src/libstrongswan/asn1/asn1.c | 4 +- src/libstrongswan/asn1/oid.c | 215 +++++++++++++++++++++-------------------- src/libstrongswan/asn1/oid.h | 146 ++++++++++++++-------------- src/libstrongswan/asn1/oid.txt | 3 + 4 files changed, 189 insertions(+), 179 deletions(-) (limited to 'src/libstrongswan/asn1') diff --git a/src/libstrongswan/asn1/asn1.c b/src/libstrongswan/asn1/asn1.c index 2ee414abf..5ce840325 100644 --- a/src/libstrongswan/asn1/asn1.c +++ b/src/libstrongswan/asn1/asn1.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2006 Martin Will - * Copyright (C) 2000-2008 Andreas Steffen + * Copyright (C) 2000-2016 Andreas Steffen * * Hochschule fuer Technik Rapperswil * @@ -47,6 +47,8 @@ chunk_t asn1_algorithmIdentifier(int oid) case OID_ECDSA_WITH_SHA256: case OID_ECDSA_WITH_SHA384: case OID_ECDSA_WITH_SHA512: + case OID_ED25519: + case OID_ED448: parameters = chunk_empty; break; default: diff --git a/src/libstrongswan/asn1/oid.c b/src/libstrongswan/asn1/oid.c index 40174446c..bb423dcac 100644 --- a/src/libstrongswan/asn1/oid.c +++ b/src/libstrongswan/asn1/oid.c @@ -201,7 +201,7 @@ const oid_t oid_names[] = { { 0x02, 189, 0, 7, "ecdsa-with-SHA256" }, /* 188 */ { 0x03, 190, 0, 7, "ecdsa-with-SHA384" }, /* 189 */ { 0x04, 0, 0, 7, "ecdsa-with-SHA512" }, /* 190 */ - {0x2B, 418, 1, 0, "" }, /* 191 */ + {0x2B, 421, 1, 0, "" }, /* 191 */ { 0x06, 332, 1, 1, "dod" }, /* 192 */ { 0x01, 0, 1, 2, "internet" }, /* 193 */ { 0x04, 283, 1, 3, "private" }, /* 194 */ @@ -394,109 +394,112 @@ const oid_t oid_names[] = { { 0x0C, 382, 0, 8, "brainpoolP384t1" }, /* 381 */ { 0x0D, 383, 0, 8, "brainpoolP512r1" }, /* 382 */ { 0x0E, 0, 0, 8, "brainpoolP512t1" }, /* 383 */ - { 0x81, 0, 1, 1, "" }, /* 384 */ - { 0x04, 0, 1, 2, "Certicom" }, /* 385 */ - { 0x00, 0, 1, 3, "curve" }, /* 386 */ - { 0x01, 388, 0, 4, "sect163k1" }, /* 387 */ - { 0x02, 389, 0, 4, "sect163r1" }, /* 388 */ - { 0x03, 390, 0, 4, "sect239k1" }, /* 389 */ - { 0x04, 391, 0, 4, "sect113r1" }, /* 390 */ - { 0x05, 392, 0, 4, "sect113r2" }, /* 391 */ - { 0x06, 393, 0, 4, "secp112r1" }, /* 392 */ - { 0x07, 394, 0, 4, "secp112r2" }, /* 393 */ - { 0x08, 395, 0, 4, "secp160r1" }, /* 394 */ - { 0x09, 396, 0, 4, "secp160k1" }, /* 395 */ - { 0x0A, 397, 0, 4, "secp256k1" }, /* 396 */ - { 0x0F, 398, 0, 4, "sect163r2" }, /* 397 */ - { 0x10, 399, 0, 4, "sect283k1" }, /* 398 */ - { 0x11, 400, 0, 4, "sect283r1" }, /* 399 */ - { 0x16, 401, 0, 4, "sect131r1" }, /* 400 */ - { 0x17, 402, 0, 4, "sect131r2" }, /* 401 */ - { 0x18, 403, 0, 4, "sect193r1" }, /* 402 */ - { 0x19, 404, 0, 4, "sect193r2" }, /* 403 */ - { 0x1A, 405, 0, 4, "sect233k1" }, /* 404 */ - { 0x1B, 406, 0, 4, "sect233r1" }, /* 405 */ - { 0x1C, 407, 0, 4, "secp128r1" }, /* 406 */ - { 0x1D, 408, 0, 4, "secp128r2" }, /* 407 */ - { 0x1E, 409, 0, 4, "secp160r2" }, /* 408 */ - { 0x1F, 410, 0, 4, "secp192k1" }, /* 409 */ - { 0x20, 411, 0, 4, "secp224k1" }, /* 410 */ - { 0x21, 412, 0, 4, "secp224r1" }, /* 411 */ - { 0x22, 413, 0, 4, "secp384r1" }, /* 412 */ - { 0x23, 414, 0, 4, "secp521r1" }, /* 413 */ - { 0x24, 415, 0, 4, "sect409k1" }, /* 414 */ - { 0x25, 416, 0, 4, "sect409r1" }, /* 415 */ - { 0x26, 417, 0, 4, "sect571k1" }, /* 416 */ - { 0x27, 0, 0, 4, "sect571r1" }, /* 417 */ - {0x60, 481, 1, 0, "" }, /* 418 */ - { 0x86, 0, 1, 1, "" }, /* 419 */ - { 0x48, 0, 1, 2, "" }, /* 420 */ - { 0x01, 0, 1, 3, "organization" }, /* 421 */ - { 0x65, 457, 1, 4, "gov" }, /* 422 */ - { 0x03, 0, 1, 5, "csor" }, /* 423 */ - { 0x04, 0, 1, 6, "nistalgorithm" }, /* 424 */ - { 0x01, 435, 1, 7, "aes" }, /* 425 */ - { 0x02, 427, 0, 8, "id-aes128-CBC" }, /* 426 */ - { 0x06, 428, 0, 8, "id-aes128-GCM" }, /* 427 */ - { 0x07, 429, 0, 8, "id-aes128-CCM" }, /* 428 */ - { 0x16, 430, 0, 8, "id-aes192-CBC" }, /* 429 */ - { 0x1A, 431, 0, 8, "id-aes192-GCM" }, /* 430 */ - { 0x1B, 432, 0, 8, "id-aes192-CCM" }, /* 431 */ - { 0x2A, 433, 0, 8, "id-aes256-CBC" }, /* 432 */ - { 0x2E, 434, 0, 8, "id-aes256-GCM" }, /* 433 */ - { 0x2F, 0, 0, 8, "id-aes256-CCM" }, /* 434 */ - { 0x02, 448, 1, 7, "hashAlgs" }, /* 435 */ - { 0x01, 437, 0, 8, "id-sha256" }, /* 436 */ - { 0x02, 438, 0, 8, "id-sha384" }, /* 437 */ - { 0x03, 439, 0, 8, "id-sha512" }, /* 438 */ - { 0x04, 440, 0, 8, "id-sha224" }, /* 439 */ - { 0x05, 441, 0, 8, "id-sha512-224" }, /* 440 */ - { 0x06, 442, 0, 8, "id-sha512-256" }, /* 441 */ - { 0x07, 443, 0, 8, "id-sha3-224" }, /* 442 */ - { 0x08, 444, 0, 8, "id-sha3-256" }, /* 443 */ - { 0x09, 445, 0, 8, "id-sha3-384" }, /* 444 */ - { 0x0A, 446, 0, 8, "id-sha3-512" }, /* 445 */ - { 0x0B, 447, 0, 8, "id-shake128" }, /* 446 */ - { 0x0C, 0, 0, 8, "id-shake256" }, /* 447 */ - { 0x03, 0, 1, 7, "sigAlgs" }, /* 448 */ - { 0x09, 450, 0, 8, "id-ecdsa-with-sha3-224" }, /* 449 */ - { 0x0A, 451, 0, 8, "id-ecdsa-with-sha3-256" }, /* 450 */ - { 0x0B, 452, 0, 8, "id-ecdsa-with-sha3-384" }, /* 451 */ - { 0x0C, 453, 0, 8, "id-ecdsa-with-sha3-512" }, /* 452 */ - { 0x0D, 454, 0, 8, "id-rsassa-pkcs1v15-with-sha3-224"}, /* 453 */ - { 0x0E, 455, 0, 8, "id-rsassa-pkcs1v15-with-sha3-256"}, /* 454 */ - { 0x0F, 456, 0, 8, "id-rsassa-pkcs1v15-with-sha3-384"}, /* 455 */ - { 0x10, 0, 0, 8, "id-rsassa-pkcs1v15-with-sha3-512"}, /* 456 */ - { 0x86, 0, 1, 4, "" }, /* 457 */ - { 0xf8, 0, 1, 5, "" }, /* 458 */ - { 0x42, 471, 1, 6, "netscape" }, /* 459 */ - { 0x01, 466, 1, 7, "" }, /* 460 */ - { 0x01, 462, 0, 8, "nsCertType" }, /* 461 */ - { 0x03, 463, 0, 8, "nsRevocationUrl" }, /* 462 */ - { 0x04, 464, 0, 8, "nsCaRevocationUrl" }, /* 463 */ - { 0x08, 465, 0, 8, "nsCaPolicyUrl" }, /* 464 */ - { 0x0d, 0, 0, 8, "nsComment" }, /* 465 */ - { 0x03, 469, 1, 7, "directory" }, /* 466 */ - { 0x01, 0, 1, 8, "" }, /* 467 */ - { 0x03, 0, 0, 9, "employeeNumber" }, /* 468 */ - { 0x04, 0, 1, 7, "policy" }, /* 469 */ - { 0x01, 0, 0, 8, "nsSGC" }, /* 470 */ - { 0x45, 0, 1, 6, "verisign" }, /* 471 */ - { 0x01, 0, 1, 7, "pki" }, /* 472 */ - { 0x09, 0, 1, 8, "attributes" }, /* 473 */ - { 0x02, 475, 0, 9, "messageType" }, /* 474 */ - { 0x03, 476, 0, 9, "pkiStatus" }, /* 475 */ - { 0x04, 477, 0, 9, "failInfo" }, /* 476 */ - { 0x05, 478, 0, 9, "senderNonce" }, /* 477 */ - { 0x06, 479, 0, 9, "recipientNonce" }, /* 478 */ - { 0x07, 480, 0, 9, "transID" }, /* 479 */ - { 0x08, 0, 0, 9, "extensionReq" }, /* 480 */ - {0x67, 0, 1, 0, "" }, /* 481 */ - { 0x81, 0, 1, 1, "" }, /* 482 */ - { 0x05, 0, 1, 2, "" }, /* 483 */ - { 0x02, 0, 1, 3, "tcg-attribute" }, /* 484 */ - { 0x01, 486, 0, 4, "tcg-at-tpmManufacturer" }, /* 485 */ - { 0x02, 487, 0, 4, "tcg-at-tpmModel" }, /* 486 */ - { 0x03, 488, 0, 4, "tcg-at-tpmVersion" }, /* 487 */ - { 0x0F, 0, 0, 4, "tcg-at-tpmIdLabel" } /* 488 */ + { 0x65, 387, 1, 1, "Thawte" }, /* 384 */ + { 0x70, 386, 0, 2, "id-Ed25519" }, /* 385 */ + { 0x71, 0, 0, 2, "id-Ed448" }, /* 386 */ + { 0x81, 0, 1, 1, "" }, /* 387 */ + { 0x04, 0, 1, 2, "Certicom" }, /* 388 */ + { 0x00, 0, 1, 3, "curve" }, /* 389 */ + { 0x01, 391, 0, 4, "sect163k1" }, /* 390 */ + { 0x02, 392, 0, 4, "sect163r1" }, /* 391 */ + { 0x03, 393, 0, 4, "sect239k1" }, /* 392 */ + { 0x04, 394, 0, 4, "sect113r1" }, /* 393 */ + { 0x05, 395, 0, 4, "sect113r2" }, /* 394 */ + { 0x06, 396, 0, 4, "secp112r1" }, /* 395 */ + { 0x07, 397, 0, 4, "secp112r2" }, /* 396 */ + { 0x08, 398, 0, 4, "secp160r1" }, /* 397 */ + { 0x09, 399, 0, 4, "secp160k1" }, /* 398 */ + { 0x0A, 400, 0, 4, "secp256k1" }, /* 399 */ + { 0x0F, 401, 0, 4, "sect163r2" }, /* 400 */ + { 0x10, 402, 0, 4, "sect283k1" }, /* 401 */ + { 0x11, 403, 0, 4, "sect283r1" }, /* 402 */ + { 0x16, 404, 0, 4, "sect131r1" }, /* 403 */ + { 0x17, 405, 0, 4, "sect131r2" }, /* 404 */ + { 0x18, 406, 0, 4, "sect193r1" }, /* 405 */ + { 0x19, 407, 0, 4, "sect193r2" }, /* 406 */ + { 0x1A, 408, 0, 4, "sect233k1" }, /* 407 */ + { 0x1B, 409, 0, 4, "sect233r1" }, /* 408 */ + { 0x1C, 410, 0, 4, "secp128r1" }, /* 409 */ + { 0x1D, 411, 0, 4, "secp128r2" }, /* 410 */ + { 0x1E, 412, 0, 4, "secp160r2" }, /* 411 */ + { 0x1F, 413, 0, 4, "secp192k1" }, /* 412 */ + { 0x20, 414, 0, 4, "secp224k1" }, /* 413 */ + { 0x21, 415, 0, 4, "secp224r1" }, /* 414 */ + { 0x22, 416, 0, 4, "secp384r1" }, /* 415 */ + { 0x23, 417, 0, 4, "secp521r1" }, /* 416 */ + { 0x24, 418, 0, 4, "sect409k1" }, /* 417 */ + { 0x25, 419, 0, 4, "sect409r1" }, /* 418 */ + { 0x26, 420, 0, 4, "sect571k1" }, /* 419 */ + { 0x27, 0, 0, 4, "sect571r1" }, /* 420 */ + {0x60, 484, 1, 0, "" }, /* 421 */ + { 0x86, 0, 1, 1, "" }, /* 422 */ + { 0x48, 0, 1, 2, "" }, /* 423 */ + { 0x01, 0, 1, 3, "organization" }, /* 424 */ + { 0x65, 460, 1, 4, "gov" }, /* 425 */ + { 0x03, 0, 1, 5, "csor" }, /* 426 */ + { 0x04, 0, 1, 6, "nistalgorithm" }, /* 427 */ + { 0x01, 438, 1, 7, "aes" }, /* 428 */ + { 0x02, 430, 0, 8, "id-aes128-CBC" }, /* 429 */ + { 0x06, 431, 0, 8, "id-aes128-GCM" }, /* 430 */ + { 0x07, 432, 0, 8, "id-aes128-CCM" }, /* 431 */ + { 0x16, 433, 0, 8, "id-aes192-CBC" }, /* 432 */ + { 0x1A, 434, 0, 8, "id-aes192-GCM" }, /* 433 */ + { 0x1B, 435, 0, 8, "id-aes192-CCM" }, /* 434 */ + { 0x2A, 436, 0, 8, "id-aes256-CBC" }, /* 435 */ + { 0x2E, 437, 0, 8, "id-aes256-GCM" }, /* 436 */ + { 0x2F, 0, 0, 8, "id-aes256-CCM" }, /* 437 */ + { 0x02, 451, 1, 7, "hashAlgs" }, /* 438 */ + { 0x01, 440, 0, 8, "id-sha256" }, /* 439 */ + { 0x02, 441, 0, 8, "id-sha384" }, /* 440 */ + { 0x03, 442, 0, 8, "id-sha512" }, /* 441 */ + { 0x04, 443, 0, 8, "id-sha224" }, /* 442 */ + { 0x05, 444, 0, 8, "id-sha512-224" }, /* 443 */ + { 0x06, 445, 0, 8, "id-sha512-256" }, /* 444 */ + { 0x07, 446, 0, 8, "id-sha3-224" }, /* 445 */ + { 0x08, 447, 0, 8, "id-sha3-256" }, /* 446 */ + { 0x09, 448, 0, 8, "id-sha3-384" }, /* 447 */ + { 0x0A, 449, 0, 8, "id-sha3-512" }, /* 448 */ + { 0x0B, 450, 0, 8, "id-shake128" }, /* 449 */ + { 0x0C, 0, 0, 8, "id-shake256" }, /* 450 */ + { 0x03, 0, 1, 7, "sigAlgs" }, /* 451 */ + { 0x09, 453, 0, 8, "id-ecdsa-with-sha3-224" }, /* 452 */ + { 0x0A, 454, 0, 8, "id-ecdsa-with-sha3-256" }, /* 453 */ + { 0x0B, 455, 0, 8, "id-ecdsa-with-sha3-384" }, /* 454 */ + { 0x0C, 456, 0, 8, "id-ecdsa-with-sha3-512" }, /* 455 */ + { 0x0D, 457, 0, 8, "id-rsassa-pkcs1v15-with-sha3-224"}, /* 456 */ + { 0x0E, 458, 0, 8, "id-rsassa-pkcs1v15-with-sha3-256"}, /* 457 */ + { 0x0F, 459, 0, 8, "id-rsassa-pkcs1v15-with-sha3-384"}, /* 458 */ + { 0x10, 0, 0, 8, "id-rsassa-pkcs1v15-with-sha3-512"}, /* 459 */ + { 0x86, 0, 1, 4, "" }, /* 460 */ + { 0xf8, 0, 1, 5, "" }, /* 461 */ + { 0x42, 474, 1, 6, "netscape" }, /* 462 */ + { 0x01, 469, 1, 7, "" }, /* 463 */ + { 0x01, 465, 0, 8, "nsCertType" }, /* 464 */ + { 0x03, 466, 0, 8, "nsRevocationUrl" }, /* 465 */ + { 0x04, 467, 0, 8, "nsCaRevocationUrl" }, /* 466 */ + { 0x08, 468, 0, 8, "nsCaPolicyUrl" }, /* 467 */ + { 0x0d, 0, 0, 8, "nsComment" }, /* 468 */ + { 0x03, 472, 1, 7, "directory" }, /* 469 */ + { 0x01, 0, 1, 8, "" }, /* 470 */ + { 0x03, 0, 0, 9, "employeeNumber" }, /* 471 */ + { 0x04, 0, 1, 7, "policy" }, /* 472 */ + { 0x01, 0, 0, 8, "nsSGC" }, /* 473 */ + { 0x45, 0, 1, 6, "verisign" }, /* 474 */ + { 0x01, 0, 1, 7, "pki" }, /* 475 */ + { 0x09, 0, 1, 8, "attributes" }, /* 476 */ + { 0x02, 478, 0, 9, "messageType" }, /* 477 */ + { 0x03, 479, 0, 9, "pkiStatus" }, /* 478 */ + { 0x04, 480, 0, 9, "failInfo" }, /* 479 */ + { 0x05, 481, 0, 9, "senderNonce" }, /* 480 */ + { 0x06, 482, 0, 9, "recipientNonce" }, /* 481 */ + { 0x07, 483, 0, 9, "transID" }, /* 482 */ + { 0x08, 0, 0, 9, "extensionReq" }, /* 483 */ + {0x67, 0, 1, 0, "" }, /* 484 */ + { 0x81, 0, 1, 1, "" }, /* 485 */ + { 0x05, 0, 1, 2, "" }, /* 486 */ + { 0x02, 0, 1, 3, "tcg-attribute" }, /* 487 */ + { 0x01, 489, 0, 4, "tcg-at-tpmManufacturer" }, /* 488 */ + { 0x02, 490, 0, 4, "tcg-at-tpmModel" }, /* 489 */ + { 0x03, 491, 0, 4, "tcg-at-tpmVersion" }, /* 490 */ + { 0x0F, 0, 0, 4, "tcg-at-tpmIdLabel" } /* 491 */ }; diff --git a/src/libstrongswan/asn1/oid.h b/src/libstrongswan/asn1/oid.h index bca299923..f316c0c78 100644 --- a/src/libstrongswan/asn1/oid.h +++ b/src/libstrongswan/asn1/oid.h @@ -192,78 +192,80 @@ extern const oid_t oid_names[]; #define OID_ECGDSA_SIG_WITH_SHA256 362 #define OID_ECGDSA_SIG_WITH_SHA384 363 #define OID_ECGDSA_SIG_WITH_SHA512 364 -#define OID_SECT163K1 387 -#define OID_SECT163R1 388 -#define OID_SECT239K1 389 -#define OID_SECT113R1 390 -#define OID_SECT113R2 391 -#define OID_SECT112R1 392 -#define OID_SECT112R2 393 -#define OID_SECT160R1 394 -#define OID_SECT160K1 395 -#define OID_SECT256K1 396 -#define OID_SECT163R2 397 -#define OID_SECT283K1 398 -#define OID_SECT283R1 399 -#define OID_SECT131R1 400 -#define OID_SECT131R2 401 -#define OID_SECT193R1 402 -#define OID_SECT193R2 403 -#define OID_SECT233K1 404 -#define OID_SECT233R1 405 -#define OID_SECT128R1 406 -#define OID_SECT128R2 407 -#define OID_SECT160R2 408 -#define OID_SECT192K1 409 -#define OID_SECT224K1 410 -#define OID_SECT224R1 411 -#define OID_SECT384R1 412 -#define OID_SECT521R1 413 -#define OID_SECT409K1 414 -#define OID_SECT409R1 415 -#define OID_SECT571K1 416 -#define OID_SECT571R1 417 -#define OID_AES128_CBC 426 -#define OID_AES128_GCM 427 -#define OID_AES128_CCM 428 -#define OID_AES192_CBC 429 -#define OID_AES192_GCM 430 -#define OID_AES192_CCM 431 -#define OID_AES256_CBC 432 -#define OID_AES256_GCM 433 -#define OID_AES256_CCM 434 -#define OID_SHA256 436 -#define OID_SHA384 437 -#define OID_SHA512 438 -#define OID_SHA224 439 -#define OID_SHA3_224 442 -#define OID_SHA3_256 443 -#define OID_SHA3_384 444 -#define OID_SHA3_512 445 -#define OID_ECDSA_WITH_SHA3_224 449 -#define OID_ECDSA_WITH_SHA3_256 450 -#define OID_ECDSA_WITH_SHA3_384 451 -#define OID_ECDSA_WITH_SHA3_512 452 -#define OID_RSASSA_PKCS1V15_WITH_SHA3_224 453 -#define OID_RSASSA_PKCS1V15_WITH_SHA3_256 454 -#define OID_RSASSA_PKCS1V15_WITH_SHA3_384 455 -#define OID_RSASSA_PKCS1V15_WITH_SHA3_512 456 -#define OID_NS_REVOCATION_URL 462 -#define OID_NS_CA_REVOCATION_URL 463 -#define OID_NS_CA_POLICY_URL 464 -#define OID_NS_COMMENT 465 -#define OID_EMPLOYEE_NUMBER 468 -#define OID_PKI_MESSAGE_TYPE 474 -#define OID_PKI_STATUS 475 -#define OID_PKI_FAIL_INFO 476 -#define OID_PKI_SENDER_NONCE 477 -#define OID_PKI_RECIPIENT_NONCE 478 -#define OID_PKI_TRANS_ID 479 -#define OID_TPM_MANUFACTURER 485 -#define OID_TPM_MODEL 486 -#define OID_TPM_VERSION 487 -#define OID_TPM_ID_LABEL 488 +#define OID_ED25519 385 +#define OID_ED448 386 +#define OID_SECT163K1 390 +#define OID_SECT163R1 391 +#define OID_SECT239K1 392 +#define OID_SECT113R1 393 +#define OID_SECT113R2 394 +#define OID_SECT112R1 395 +#define OID_SECT112R2 396 +#define OID_SECT160R1 397 +#define OID_SECT160K1 398 +#define OID_SECT256K1 399 +#define OID_SECT163R2 400 +#define OID_SECT283K1 401 +#define OID_SECT283R1 402 +#define OID_SECT131R1 403 +#define OID_SECT131R2 404 +#define OID_SECT193R1 405 +#define OID_SECT193R2 406 +#define OID_SECT233K1 407 +#define OID_SECT233R1 408 +#define OID_SECT128R1 409 +#define OID_SECT128R2 410 +#define OID_SECT160R2 411 +#define OID_SECT192K1 412 +#define OID_SECT224K1 413 +#define OID_SECT224R1 414 +#define OID_SECT384R1 415 +#define OID_SECT521R1 416 +#define OID_SECT409K1 417 +#define OID_SECT409R1 418 +#define OID_SECT571K1 419 +#define OID_SECT571R1 420 +#define OID_AES128_CBC 429 +#define OID_AES128_GCM 430 +#define OID_AES128_CCM 431 +#define OID_AES192_CBC 432 +#define OID_AES192_GCM 433 +#define OID_AES192_CCM 434 +#define OID_AES256_CBC 435 +#define OID_AES256_GCM 436 +#define OID_AES256_CCM 437 +#define OID_SHA256 439 +#define OID_SHA384 440 +#define OID_SHA512 441 +#define OID_SHA224 442 +#define OID_SHA3_224 445 +#define OID_SHA3_256 446 +#define OID_SHA3_384 447 +#define OID_SHA3_512 448 +#define OID_ECDSA_WITH_SHA3_224 452 +#define OID_ECDSA_WITH_SHA3_256 453 +#define OID_ECDSA_WITH_SHA3_384 454 +#define OID_ECDSA_WITH_SHA3_512 455 +#define OID_RSASSA_PKCS1V15_WITH_SHA3_224 456 +#define OID_RSASSA_PKCS1V15_WITH_SHA3_256 457 +#define OID_RSASSA_PKCS1V15_WITH_SHA3_384 458 +#define OID_RSASSA_PKCS1V15_WITH_SHA3_512 459 +#define OID_NS_REVOCATION_URL 465 +#define OID_NS_CA_REVOCATION_URL 466 +#define OID_NS_CA_POLICY_URL 467 +#define OID_NS_COMMENT 468 +#define OID_EMPLOYEE_NUMBER 471 +#define OID_PKI_MESSAGE_TYPE 477 +#define OID_PKI_STATUS 478 +#define OID_PKI_FAIL_INFO 479 +#define OID_PKI_SENDER_NONCE 480 +#define OID_PKI_RECIPIENT_NONCE 481 +#define OID_PKI_TRANS_ID 482 +#define OID_TPM_MANUFACTURER 488 +#define OID_TPM_MODEL 489 +#define OID_TPM_VERSION 490 +#define OID_TPM_ID_LABEL 491 -#define OID_MAX 489 +#define OID_MAX 492 #endif /* OID_H_ */ diff --git a/src/libstrongswan/asn1/oid.txt b/src/libstrongswan/asn1/oid.txt index 761a38ab6..a0c2aada3 100644 --- a/src/libstrongswan/asn1/oid.txt +++ b/src/libstrongswan/asn1/oid.txt @@ -382,6 +382,9 @@ 0x0C "brainpoolP384t1" 0x0D "brainpoolP512r1" 0x0E "brainpoolP512t1" + 0x65 "Thawte" + 0x70 "id-Ed25519" OID_ED25519 + 0x71 "id-Ed448" OID_ED448 0x81 "" 0x04 "Certicom" 0x00 "curve" -- cgit v1.2.3