summaryrefslogtreecommitdiff
path: root/src/libstrongswan/asn1
diff options
context:
space:
mode:
Diffstat (limited to 'src/libstrongswan/asn1')
-rw-r--r--src/libstrongswan/asn1/oid.c342
-rw-r--r--src/libstrongswan/asn1/oid.h170
-rw-r--r--src/libstrongswan/asn1/oid.txt6
3 files changed, 265 insertions, 253 deletions
diff --git a/src/libstrongswan/asn1/oid.c b/src/libstrongswan/asn1/oid.c
index ec60be811..686233fa3 100644
--- a/src/libstrongswan/asn1/oid.c
+++ b/src/libstrongswan/asn1/oid.c
@@ -179,8 +179,8 @@ const oid_t oid_names[] = {
{ 0x02, 167, 0, 7, "ecdsa-with-SHA256" }, /* 166 */
{ 0x03, 168, 0, 7, "ecdsa-with-SHA384" }, /* 167 */
{ 0x04, 0, 0, 7, "ecdsa-with-SHA512" }, /* 168 */
- {0x2B, 323, 1, 0, "" }, /* 169 */
- { 0x06, 237, 1, 1, "dod" }, /* 170 */
+ {0x2B, 329, 1, 0, "" }, /* 169 */
+ { 0x06, 243, 1, 1, "dod" }, /* 170 */
{ 0x01, 0, 1, 2, "internet" }, /* 171 */
{ 0x04, 194, 1, 3, "private" }, /* 172 */
{ 0x01, 0, 1, 4, "enterprise" }, /* 173 */
@@ -206,7 +206,7 @@ const oid_t oid_names[] = {
{ 0x4B, 0, 0, 11, "TCGID" }, /* 193 */
{ 0x05, 0, 1, 3, "security" }, /* 194 */
{ 0x05, 0, 1, 4, "mechanisms" }, /* 195 */
- { 0x07, 234, 1, 5, "id-pkix" }, /* 196 */
+ { 0x07, 240, 1, 5, "id-pkix" }, /* 196 */
{ 0x01, 201, 1, 6, "id-pe" }, /* 197 */
{ 0x01, 199, 0, 7, "authorityInfoAccess" }, /* 198 */
{ 0x03, 200, 0, 7, "qcStatements" }, /* 199 */
@@ -224,169 +224,175 @@ const oid_t oid_names[] = {
{ 0x07, 212, 0, 7, "ipsecUser" }, /* 211 */
{ 0x08, 213, 0, 7, "timeStamping" }, /* 212 */
{ 0x09, 0, 0, 7, "ocspSigning" }, /* 213 */
- { 0x08, 216, 1, 6, "id-otherNames" }, /* 214 */
- { 0x05, 0, 0, 7, "xmppAddr" }, /* 215 */
- { 0x0A, 221, 1, 6, "id-aca" }, /* 216 */
- { 0x01, 218, 0, 7, "authenticationInfo" }, /* 217 */
- { 0x02, 219, 0, 7, "accessIdentity" }, /* 218 */
- { 0x03, 220, 0, 7, "chargingIdentity" }, /* 219 */
- { 0x04, 0, 0, 7, "group" }, /* 220 */
- { 0x0B, 222, 0, 6, "subjectInfoAccess" }, /* 221 */
- { 0x30, 0, 1, 6, "id-ad" }, /* 222 */
- { 0x01, 231, 1, 7, "ocsp" }, /* 223 */
- { 0x01, 225, 0, 8, "basic" }, /* 224 */
- { 0x02, 226, 0, 8, "nonce" }, /* 225 */
- { 0x03, 227, 0, 8, "crl" }, /* 226 */
- { 0x04, 228, 0, 8, "response" }, /* 227 */
- { 0x05, 229, 0, 8, "noCheck" }, /* 228 */
- { 0x06, 230, 0, 8, "archiveCutoff" }, /* 229 */
- { 0x07, 0, 0, 8, "serviceLocator" }, /* 230 */
- { 0x02, 232, 0, 7, "caIssuers" }, /* 231 */
- { 0x03, 233, 0, 7, "timeStamping" }, /* 232 */
- { 0x05, 0, 0, 7, "caRepository" }, /* 233 */
- { 0x08, 0, 1, 5, "ipsec" }, /* 234 */
- { 0x02, 0, 1, 6, "certificate" }, /* 235 */
- { 0x02, 0, 0, 7, "iKEIntermediate" }, /* 236 */
- { 0x0E, 243, 1, 1, "oiw" }, /* 237 */
- { 0x03, 0, 1, 2, "secsig" }, /* 238 */
- { 0x02, 0, 1, 3, "algorithms" }, /* 239 */
- { 0x07, 241, 0, 4, "des-cbc" }, /* 240 */
- { 0x1A, 242, 0, 4, "sha-1" }, /* 241 */
- { 0x1D, 0, 0, 4, "sha-1WithRSASignature" }, /* 242 */
- { 0x24, 289, 1, 1, "TeleTrusT" }, /* 243 */
- { 0x03, 0, 1, 2, "algorithm" }, /* 244 */
- { 0x03, 0, 1, 3, "signatureAlgorithm" }, /* 245 */
- { 0x01, 250, 1, 4, "rsaSignature" }, /* 246 */
- { 0x02, 248, 0, 5, "rsaSigWithripemd160" }, /* 247 */
- { 0x03, 249, 0, 5, "rsaSigWithripemd128" }, /* 248 */
- { 0x04, 0, 0, 5, "rsaSigWithripemd256" }, /* 249 */
- { 0x02, 0, 1, 4, "ecSign" }, /* 250 */
- { 0x01, 252, 0, 5, "ecSignWithsha1" }, /* 251 */
- { 0x02, 253, 0, 5, "ecSignWithripemd160" }, /* 252 */
- { 0x03, 254, 0, 5, "ecSignWithmd2" }, /* 253 */
- { 0x04, 255, 0, 5, "ecSignWithmd5" }, /* 254 */
- { 0x05, 272, 1, 5, "ttt-ecg" }, /* 255 */
- { 0x01, 260, 1, 6, "fieldType" }, /* 256 */
- { 0x01, 0, 1, 7, "characteristictwoField" }, /* 257 */
- { 0x01, 0, 1, 8, "basisType" }, /* 258 */
- { 0x01, 0, 0, 9, "ipBasis" }, /* 259 */
- { 0x02, 262, 1, 6, "keyType" }, /* 260 */
- { 0x01, 0, 0, 7, "ecgPublicKey" }, /* 261 */
- { 0x03, 263, 0, 6, "curve" }, /* 262 */
- { 0x04, 270, 1, 6, "signatures" }, /* 263 */
- { 0x01, 265, 0, 7, "ecgdsa-with-RIPEMD160" }, /* 264 */
- { 0x02, 266, 0, 7, "ecgdsa-with-SHA1" }, /* 265 */
- { 0x03, 267, 0, 7, "ecgdsa-with-SHA224" }, /* 266 */
- { 0x04, 268, 0, 7, "ecgdsa-with-SHA256" }, /* 267 */
- { 0x05, 269, 0, 7, "ecgdsa-with-SHA384" }, /* 268 */
- { 0x06, 0, 0, 7, "ecgdsa-with-SHA512" }, /* 269 */
- { 0x05, 0, 1, 6, "module" }, /* 270 */
- { 0x01, 0, 0, 7, "1" }, /* 271 */
- { 0x08, 0, 1, 5, "ecStdCurvesAndGeneration" }, /* 272 */
- { 0x01, 0, 1, 6, "ellipticCurve" }, /* 273 */
- { 0x01, 0, 1, 7, "versionOne" }, /* 274 */
- { 0x01, 276, 0, 8, "brainpoolP160r1" }, /* 275 */
- { 0x02, 277, 0, 8, "brainpoolP160t1" }, /* 276 */
- { 0x03, 278, 0, 8, "brainpoolP192r1" }, /* 277 */
- { 0x04, 279, 0, 8, "brainpoolP192t1" }, /* 278 */
- { 0x05, 280, 0, 8, "brainpoolP224r1" }, /* 279 */
- { 0x06, 281, 0, 8, "brainpoolP224t1" }, /* 280 */
- { 0x07, 282, 0, 8, "brainpoolP256r1" }, /* 281 */
- { 0x08, 283, 0, 8, "brainpoolP256t1" }, /* 282 */
- { 0x09, 284, 0, 8, "brainpoolP320r1" }, /* 283 */
- { 0x0A, 285, 0, 8, "brainpoolP320t1" }, /* 284 */
- { 0x0B, 286, 0, 8, "brainpoolP384r1" }, /* 285 */
- { 0x0C, 287, 0, 8, "brainpoolP384t1" }, /* 286 */
- { 0x0D, 288, 0, 8, "brainpoolP512r1" }, /* 287 */
- { 0x0E, 0, 0, 8, "brainpoolP512t1" }, /* 288 */
- { 0x81, 0, 1, 1, "" }, /* 289 */
- { 0x04, 0, 1, 2, "Certicom" }, /* 290 */
- { 0x00, 0, 1, 3, "curve" }, /* 291 */
- { 0x01, 293, 0, 4, "sect163k1" }, /* 292 */
- { 0x02, 294, 0, 4, "sect163r1" }, /* 293 */
- { 0x03, 295, 0, 4, "sect239k1" }, /* 294 */
- { 0x04, 296, 0, 4, "sect113r1" }, /* 295 */
- { 0x05, 297, 0, 4, "sect113r2" }, /* 296 */
- { 0x06, 298, 0, 4, "secp112r1" }, /* 297 */
- { 0x07, 299, 0, 4, "secp112r2" }, /* 298 */
- { 0x08, 300, 0, 4, "secp160r1" }, /* 299 */
- { 0x09, 301, 0, 4, "secp160k1" }, /* 300 */
- { 0x0A, 302, 0, 4, "secp256k1" }, /* 301 */
- { 0x0F, 303, 0, 4, "sect163r2" }, /* 302 */
- { 0x10, 304, 0, 4, "sect283k1" }, /* 303 */
- { 0x11, 305, 0, 4, "sect283r1" }, /* 304 */
- { 0x16, 306, 0, 4, "sect131r1" }, /* 305 */
- { 0x17, 307, 0, 4, "sect131r2" }, /* 306 */
- { 0x18, 308, 0, 4, "sect193r1" }, /* 307 */
- { 0x19, 309, 0, 4, "sect193r2" }, /* 308 */
- { 0x1A, 310, 0, 4, "sect233k1" }, /* 309 */
- { 0x1B, 311, 0, 4, "sect233r1" }, /* 310 */
- { 0x1C, 312, 0, 4, "secp128r1" }, /* 311 */
- { 0x1D, 313, 0, 4, "secp128r2" }, /* 312 */
- { 0x1E, 314, 0, 4, "secp160r2" }, /* 313 */
- { 0x1F, 315, 0, 4, "secp192k1" }, /* 314 */
- { 0x20, 316, 0, 4, "secp224k1" }, /* 315 */
- { 0x21, 317, 0, 4, "secp224r1" }, /* 316 */
- { 0x22, 318, 0, 4, "secp384r1" }, /* 317 */
- { 0x23, 319, 0, 4, "secp521r1" }, /* 318 */
- { 0x24, 320, 0, 4, "sect409k1" }, /* 319 */
- { 0x25, 321, 0, 4, "sect409r1" }, /* 320 */
- { 0x26, 322, 0, 4, "sect571k1" }, /* 321 */
- { 0x27, 0, 0, 4, "sect571r1" }, /* 322 */
- {0x60, 371, 1, 0, "" }, /* 323 */
- { 0x86, 0, 1, 1, "" }, /* 324 */
- { 0x48, 0, 1, 2, "" }, /* 325 */
- { 0x01, 0, 1, 3, "organization" }, /* 326 */
- { 0x65, 347, 1, 4, "gov" }, /* 327 */
- { 0x03, 0, 1, 5, "csor" }, /* 328 */
- { 0x04, 0, 1, 6, "nistalgorithm" }, /* 329 */
- { 0x01, 340, 1, 7, "aes" }, /* 330 */
- { 0x02, 332, 0, 8, "id-aes128-CBC" }, /* 331 */
- { 0x06, 333, 0, 8, "id-aes128-GCM" }, /* 332 */
- { 0x07, 334, 0, 8, "id-aes128-CCM" }, /* 333 */
- { 0x16, 335, 0, 8, "id-aes192-CBC" }, /* 334 */
- { 0x1A, 336, 0, 8, "id-aes192-GCM" }, /* 335 */
- { 0x1B, 337, 0, 8, "id-aes192-CCM" }, /* 336 */
- { 0x2A, 338, 0, 8, "id-aes256-CBC" }, /* 337 */
- { 0x2E, 339, 0, 8, "id-aes256-GCM" }, /* 338 */
- { 0x2F, 0, 0, 8, "id-aes256-CCM" }, /* 339 */
- { 0x02, 0, 1, 7, "hashalgs" }, /* 340 */
- { 0x01, 342, 0, 8, "id-SHA-256" }, /* 341 */
- { 0x02, 343, 0, 8, "id-SHA-384" }, /* 342 */
- { 0x03, 344, 0, 8, "id-SHA-512" }, /* 343 */
- { 0x04, 345, 0, 8, "id-SHA-224" }, /* 344 */
- { 0x05, 346, 0, 8, "id-SHA-512-224" }, /* 345 */
- { 0x06, 0, 0, 8, "id-SHA-512-256" }, /* 346 */
- { 0x86, 0, 1, 4, "" }, /* 347 */
- { 0xf8, 0, 1, 5, "" }, /* 348 */
- { 0x42, 361, 1, 6, "netscape" }, /* 349 */
- { 0x01, 356, 1, 7, "" }, /* 350 */
- { 0x01, 352, 0, 8, "nsCertType" }, /* 351 */
- { 0x03, 353, 0, 8, "nsRevocationUrl" }, /* 352 */
- { 0x04, 354, 0, 8, "nsCaRevocationUrl" }, /* 353 */
- { 0x08, 355, 0, 8, "nsCaPolicyUrl" }, /* 354 */
- { 0x0d, 0, 0, 8, "nsComment" }, /* 355 */
- { 0x03, 359, 1, 7, "directory" }, /* 356 */
- { 0x01, 0, 1, 8, "" }, /* 357 */
- { 0x03, 0, 0, 9, "employeeNumber" }, /* 358 */
- { 0x04, 0, 1, 7, "policy" }, /* 359 */
- { 0x01, 0, 0, 8, "nsSGC" }, /* 360 */
- { 0x45, 0, 1, 6, "verisign" }, /* 361 */
- { 0x01, 0, 1, 7, "pki" }, /* 362 */
- { 0x09, 0, 1, 8, "attributes" }, /* 363 */
- { 0x02, 365, 0, 9, "messageType" }, /* 364 */
- { 0x03, 366, 0, 9, "pkiStatus" }, /* 365 */
- { 0x04, 367, 0, 9, "failInfo" }, /* 366 */
- { 0x05, 368, 0, 9, "senderNonce" }, /* 367 */
- { 0x06, 369, 0, 9, "recipientNonce" }, /* 368 */
- { 0x07, 370, 0, 9, "transID" }, /* 369 */
- { 0x08, 0, 0, 9, "extensionReq" }, /* 370 */
- {0x67, 0, 1, 0, "" }, /* 371 */
- { 0x81, 0, 1, 1, "" }, /* 372 */
- { 0x05, 0, 1, 2, "" }, /* 373 */
- { 0x02, 0, 1, 3, "tcg-attribute" }, /* 374 */
- { 0x01, 376, 0, 4, "tcg-at-tpmManufacturer" }, /* 375 */
- { 0x02, 377, 0, 4, "tcg-at-tpmModel" }, /* 376 */
- { 0x03, 378, 0, 4, "tcg-at-tpmVersion" }, /* 377 */
- { 0x0F, 0, 0, 4, "tcg-at-tpmIdLabel" } /* 378 */
+ { 0x08, 222, 1, 6, "id-otherNames" }, /* 214 */
+ { 0x01, 216, 0, 7, "personalData" }, /* 215 */
+ { 0x02, 217, 0, 7, "userGroup" }, /* 216 */
+ { 0x03, 218, 0, 7, "id-on-permanentIdentifier" }, /* 217 */
+ { 0x04, 219, 0, 7, "id-on-hardwareModuleName" }, /* 218 */
+ { 0x05, 220, 0, 7, "xmppAddr" }, /* 219 */
+ { 0x06, 221, 0, 7, "id-on-SIM" }, /* 220 */
+ { 0x07, 0, 0, 7, "id-on-dnsSRV" }, /* 221 */
+ { 0x0A, 227, 1, 6, "id-aca" }, /* 222 */
+ { 0x01, 224, 0, 7, "authenticationInfo" }, /* 223 */
+ { 0x02, 225, 0, 7, "accessIdentity" }, /* 224 */
+ { 0x03, 226, 0, 7, "chargingIdentity" }, /* 225 */
+ { 0x04, 0, 0, 7, "group" }, /* 226 */
+ { 0x0B, 228, 0, 6, "subjectInfoAccess" }, /* 227 */
+ { 0x30, 0, 1, 6, "id-ad" }, /* 228 */
+ { 0x01, 237, 1, 7, "ocsp" }, /* 229 */
+ { 0x01, 231, 0, 8, "basic" }, /* 230 */
+ { 0x02, 232, 0, 8, "nonce" }, /* 231 */
+ { 0x03, 233, 0, 8, "crl" }, /* 232 */
+ { 0x04, 234, 0, 8, "response" }, /* 233 */
+ { 0x05, 235, 0, 8, "noCheck" }, /* 234 */
+ { 0x06, 236, 0, 8, "archiveCutoff" }, /* 235 */
+ { 0x07, 0, 0, 8, "serviceLocator" }, /* 236 */
+ { 0x02, 238, 0, 7, "caIssuers" }, /* 237 */
+ { 0x03, 239, 0, 7, "timeStamping" }, /* 238 */
+ { 0x05, 0, 0, 7, "caRepository" }, /* 239 */
+ { 0x08, 0, 1, 5, "ipsec" }, /* 240 */
+ { 0x02, 0, 1, 6, "certificate" }, /* 241 */
+ { 0x02, 0, 0, 7, "iKEIntermediate" }, /* 242 */
+ { 0x0E, 249, 1, 1, "oiw" }, /* 243 */
+ { 0x03, 0, 1, 2, "secsig" }, /* 244 */
+ { 0x02, 0, 1, 3, "algorithms" }, /* 245 */
+ { 0x07, 247, 0, 4, "des-cbc" }, /* 246 */
+ { 0x1A, 248, 0, 4, "sha-1" }, /* 247 */
+ { 0x1D, 0, 0, 4, "sha-1WithRSASignature" }, /* 248 */
+ { 0x24, 295, 1, 1, "TeleTrusT" }, /* 249 */
+ { 0x03, 0, 1, 2, "algorithm" }, /* 250 */
+ { 0x03, 0, 1, 3, "signatureAlgorithm" }, /* 251 */
+ { 0x01, 256, 1, 4, "rsaSignature" }, /* 252 */
+ { 0x02, 254, 0, 5, "rsaSigWithripemd160" }, /* 253 */
+ { 0x03, 255, 0, 5, "rsaSigWithripemd128" }, /* 254 */
+ { 0x04, 0, 0, 5, "rsaSigWithripemd256" }, /* 255 */
+ { 0x02, 0, 1, 4, "ecSign" }, /* 256 */
+ { 0x01, 258, 0, 5, "ecSignWithsha1" }, /* 257 */
+ { 0x02, 259, 0, 5, "ecSignWithripemd160" }, /* 258 */
+ { 0x03, 260, 0, 5, "ecSignWithmd2" }, /* 259 */
+ { 0x04, 261, 0, 5, "ecSignWithmd5" }, /* 260 */
+ { 0x05, 278, 1, 5, "ttt-ecg" }, /* 261 */
+ { 0x01, 266, 1, 6, "fieldType" }, /* 262 */
+ { 0x01, 0, 1, 7, "characteristictwoField" }, /* 263 */
+ { 0x01, 0, 1, 8, "basisType" }, /* 264 */
+ { 0x01, 0, 0, 9, "ipBasis" }, /* 265 */
+ { 0x02, 268, 1, 6, "keyType" }, /* 266 */
+ { 0x01, 0, 0, 7, "ecgPublicKey" }, /* 267 */
+ { 0x03, 269, 0, 6, "curve" }, /* 268 */
+ { 0x04, 276, 1, 6, "signatures" }, /* 269 */
+ { 0x01, 271, 0, 7, "ecgdsa-with-RIPEMD160" }, /* 270 */
+ { 0x02, 272, 0, 7, "ecgdsa-with-SHA1" }, /* 271 */
+ { 0x03, 273, 0, 7, "ecgdsa-with-SHA224" }, /* 272 */
+ { 0x04, 274, 0, 7, "ecgdsa-with-SHA256" }, /* 273 */
+ { 0x05, 275, 0, 7, "ecgdsa-with-SHA384" }, /* 274 */
+ { 0x06, 0, 0, 7, "ecgdsa-with-SHA512" }, /* 275 */
+ { 0x05, 0, 1, 6, "module" }, /* 276 */
+ { 0x01, 0, 0, 7, "1" }, /* 277 */
+ { 0x08, 0, 1, 5, "ecStdCurvesAndGeneration" }, /* 278 */
+ { 0x01, 0, 1, 6, "ellipticCurve" }, /* 279 */
+ { 0x01, 0, 1, 7, "versionOne" }, /* 280 */
+ { 0x01, 282, 0, 8, "brainpoolP160r1" }, /* 281 */
+ { 0x02, 283, 0, 8, "brainpoolP160t1" }, /* 282 */
+ { 0x03, 284, 0, 8, "brainpoolP192r1" }, /* 283 */
+ { 0x04, 285, 0, 8, "brainpoolP192t1" }, /* 284 */
+ { 0x05, 286, 0, 8, "brainpoolP224r1" }, /* 285 */
+ { 0x06, 287, 0, 8, "brainpoolP224t1" }, /* 286 */
+ { 0x07, 288, 0, 8, "brainpoolP256r1" }, /* 287 */
+ { 0x08, 289, 0, 8, "brainpoolP256t1" }, /* 288 */
+ { 0x09, 290, 0, 8, "brainpoolP320r1" }, /* 289 */
+ { 0x0A, 291, 0, 8, "brainpoolP320t1" }, /* 290 */
+ { 0x0B, 292, 0, 8, "brainpoolP384r1" }, /* 291 */
+ { 0x0C, 293, 0, 8, "brainpoolP384t1" }, /* 292 */
+ { 0x0D, 294, 0, 8, "brainpoolP512r1" }, /* 293 */
+ { 0x0E, 0, 0, 8, "brainpoolP512t1" }, /* 294 */
+ { 0x81, 0, 1, 1, "" }, /* 295 */
+ { 0x04, 0, 1, 2, "Certicom" }, /* 296 */
+ { 0x00, 0, 1, 3, "curve" }, /* 297 */
+ { 0x01, 299, 0, 4, "sect163k1" }, /* 298 */
+ { 0x02, 300, 0, 4, "sect163r1" }, /* 299 */
+ { 0x03, 301, 0, 4, "sect239k1" }, /* 300 */
+ { 0x04, 302, 0, 4, "sect113r1" }, /* 301 */
+ { 0x05, 303, 0, 4, "sect113r2" }, /* 302 */
+ { 0x06, 304, 0, 4, "secp112r1" }, /* 303 */
+ { 0x07, 305, 0, 4, "secp112r2" }, /* 304 */
+ { 0x08, 306, 0, 4, "secp160r1" }, /* 305 */
+ { 0x09, 307, 0, 4, "secp160k1" }, /* 306 */
+ { 0x0A, 308, 0, 4, "secp256k1" }, /* 307 */
+ { 0x0F, 309, 0, 4, "sect163r2" }, /* 308 */
+ { 0x10, 310, 0, 4, "sect283k1" }, /* 309 */
+ { 0x11, 311, 0, 4, "sect283r1" }, /* 310 */
+ { 0x16, 312, 0, 4, "sect131r1" }, /* 311 */
+ { 0x17, 313, 0, 4, "sect131r2" }, /* 312 */
+ { 0x18, 314, 0, 4, "sect193r1" }, /* 313 */
+ { 0x19, 315, 0, 4, "sect193r2" }, /* 314 */
+ { 0x1A, 316, 0, 4, "sect233k1" }, /* 315 */
+ { 0x1B, 317, 0, 4, "sect233r1" }, /* 316 */
+ { 0x1C, 318, 0, 4, "secp128r1" }, /* 317 */
+ { 0x1D, 319, 0, 4, "secp128r2" }, /* 318 */
+ { 0x1E, 320, 0, 4, "secp160r2" }, /* 319 */
+ { 0x1F, 321, 0, 4, "secp192k1" }, /* 320 */
+ { 0x20, 322, 0, 4, "secp224k1" }, /* 321 */
+ { 0x21, 323, 0, 4, "secp224r1" }, /* 322 */
+ { 0x22, 324, 0, 4, "secp384r1" }, /* 323 */
+ { 0x23, 325, 0, 4, "secp521r1" }, /* 324 */
+ { 0x24, 326, 0, 4, "sect409k1" }, /* 325 */
+ { 0x25, 327, 0, 4, "sect409r1" }, /* 326 */
+ { 0x26, 328, 0, 4, "sect571k1" }, /* 327 */
+ { 0x27, 0, 0, 4, "sect571r1" }, /* 328 */
+ {0x60, 377, 1, 0, "" }, /* 329 */
+ { 0x86, 0, 1, 1, "" }, /* 330 */
+ { 0x48, 0, 1, 2, "" }, /* 331 */
+ { 0x01, 0, 1, 3, "organization" }, /* 332 */
+ { 0x65, 353, 1, 4, "gov" }, /* 333 */
+ { 0x03, 0, 1, 5, "csor" }, /* 334 */
+ { 0x04, 0, 1, 6, "nistalgorithm" }, /* 335 */
+ { 0x01, 346, 1, 7, "aes" }, /* 336 */
+ { 0x02, 338, 0, 8, "id-aes128-CBC" }, /* 337 */
+ { 0x06, 339, 0, 8, "id-aes128-GCM" }, /* 338 */
+ { 0x07, 340, 0, 8, "id-aes128-CCM" }, /* 339 */
+ { 0x16, 341, 0, 8, "id-aes192-CBC" }, /* 340 */
+ { 0x1A, 342, 0, 8, "id-aes192-GCM" }, /* 341 */
+ { 0x1B, 343, 0, 8, "id-aes192-CCM" }, /* 342 */
+ { 0x2A, 344, 0, 8, "id-aes256-CBC" }, /* 343 */
+ { 0x2E, 345, 0, 8, "id-aes256-GCM" }, /* 344 */
+ { 0x2F, 0, 0, 8, "id-aes256-CCM" }, /* 345 */
+ { 0x02, 0, 1, 7, "hashalgs" }, /* 346 */
+ { 0x01, 348, 0, 8, "id-SHA-256" }, /* 347 */
+ { 0x02, 349, 0, 8, "id-SHA-384" }, /* 348 */
+ { 0x03, 350, 0, 8, "id-SHA-512" }, /* 349 */
+ { 0x04, 351, 0, 8, "id-SHA-224" }, /* 350 */
+ { 0x05, 352, 0, 8, "id-SHA-512-224" }, /* 351 */
+ { 0x06, 0, 0, 8, "id-SHA-512-256" }, /* 352 */
+ { 0x86, 0, 1, 4, "" }, /* 353 */
+ { 0xf8, 0, 1, 5, "" }, /* 354 */
+ { 0x42, 367, 1, 6, "netscape" }, /* 355 */
+ { 0x01, 362, 1, 7, "" }, /* 356 */
+ { 0x01, 358, 0, 8, "nsCertType" }, /* 357 */
+ { 0x03, 359, 0, 8, "nsRevocationUrl" }, /* 358 */
+ { 0x04, 360, 0, 8, "nsCaRevocationUrl" }, /* 359 */
+ { 0x08, 361, 0, 8, "nsCaPolicyUrl" }, /* 360 */
+ { 0x0d, 0, 0, 8, "nsComment" }, /* 361 */
+ { 0x03, 365, 1, 7, "directory" }, /* 362 */
+ { 0x01, 0, 1, 8, "" }, /* 363 */
+ { 0x03, 0, 0, 9, "employeeNumber" }, /* 364 */
+ { 0x04, 0, 1, 7, "policy" }, /* 365 */
+ { 0x01, 0, 0, 8, "nsSGC" }, /* 366 */
+ { 0x45, 0, 1, 6, "verisign" }, /* 367 */
+ { 0x01, 0, 1, 7, "pki" }, /* 368 */
+ { 0x09, 0, 1, 8, "attributes" }, /* 369 */
+ { 0x02, 371, 0, 9, "messageType" }, /* 370 */
+ { 0x03, 372, 0, 9, "pkiStatus" }, /* 371 */
+ { 0x04, 373, 0, 9, "failInfo" }, /* 372 */
+ { 0x05, 374, 0, 9, "senderNonce" }, /* 373 */
+ { 0x06, 375, 0, 9, "recipientNonce" }, /* 374 */
+ { 0x07, 376, 0, 9, "transID" }, /* 375 */
+ { 0x08, 0, 0, 9, "extensionReq" }, /* 376 */
+ {0x67, 0, 1, 0, "" }, /* 377 */
+ { 0x81, 0, 1, 1, "" }, /* 378 */
+ { 0x05, 0, 1, 2, "" }, /* 379 */
+ { 0x02, 0, 1, 3, "tcg-attribute" }, /* 380 */
+ { 0x01, 382, 0, 4, "tcg-at-tpmManufacturer" }, /* 381 */
+ { 0x02, 383, 0, 4, "tcg-at-tpmModel" }, /* 382 */
+ { 0x03, 384, 0, 4, "tcg-at-tpmVersion" }, /* 383 */
+ { 0x0F, 0, 0, 4, "tcg-at-tpmIdLabel" } /* 384 */
};
diff --git a/src/libstrongswan/asn1/oid.h b/src/libstrongswan/asn1/oid.h
index d9838ccd8..085e09ceb 100644
--- a/src/libstrongswan/asn1/oid.h
+++ b/src/libstrongswan/asn1/oid.h
@@ -136,91 +136,91 @@ extern const oid_t oid_names[];
#define OID_SERVER_AUTH 205
#define OID_CLIENT_AUTH 206
#define OID_OCSP_SIGNING 213
-#define OID_XMPP_ADDR 215
-#define OID_AUTHENTICATION_INFO 217
-#define OID_ACCESS_IDENTITY 218
-#define OID_CHARGING_IDENTITY 219
-#define OID_GROUP 220
-#define OID_OCSP 223
-#define OID_BASIC 224
-#define OID_NONCE 225
-#define OID_CRL 226
-#define OID_RESPONSE 227
-#define OID_NO_CHECK 228
-#define OID_ARCHIVE_CUTOFF 229
-#define OID_SERVICE_LOCATOR 230
-#define OID_CA_ISSUERS 231
-#define OID_IKE_INTERMEDIATE 236
-#define OID_DES_CBC 240
-#define OID_SHA1 241
-#define OID_SHA1_WITH_RSA_OIW 242
-#define OID_ECGDSA_PUBKEY 261
-#define OID_ECGDSA_SIG_WITH_RIPEMD160 264
-#define OID_ECGDSA_SIG_WITH_SHA1 265
-#define OID_ECGDSA_SIG_WITH_SHA224 266
-#define OID_ECGDSA_SIG_WITH_SHA256 267
-#define OID_ECGDSA_SIG_WITH_SHA384 268
-#define OID_ECGDSA_SIG_WITH_SHA512 269
-#define OID_SECT163K1 292
-#define OID_SECT163R1 293
-#define OID_SECT239K1 294
-#define OID_SECT113R1 295
-#define OID_SECT113R2 296
-#define OID_SECT112R1 297
-#define OID_SECT112R2 298
-#define OID_SECT160R1 299
-#define OID_SECT160K1 300
-#define OID_SECT256K1 301
-#define OID_SECT163R2 302
-#define OID_SECT283K1 303
-#define OID_SECT283R1 304
-#define OID_SECT131R1 305
-#define OID_SECT131R2 306
-#define OID_SECT193R1 307
-#define OID_SECT193R2 308
-#define OID_SECT233K1 309
-#define OID_SECT233R1 310
-#define OID_SECT128R1 311
-#define OID_SECT128R2 312
-#define OID_SECT160R2 313
-#define OID_SECT192K1 314
-#define OID_SECT224K1 315
-#define OID_SECT224R1 316
-#define OID_SECT384R1 317
-#define OID_SECT521R1 318
-#define OID_SECT409K1 319
-#define OID_SECT409R1 320
-#define OID_SECT571K1 321
-#define OID_SECT571R1 322
-#define OID_AES128_CBC 331
-#define OID_AES128_GCM 332
-#define OID_AES128_CCM 333
-#define OID_AES192_CBC 334
-#define OID_AES192_GCM 335
-#define OID_AES192_CCM 336
-#define OID_AES256_CBC 337
-#define OID_AES256_GCM 338
-#define OID_AES256_CCM 339
-#define OID_SHA256 341
-#define OID_SHA384 342
-#define OID_SHA512 343
-#define OID_SHA224 344
-#define OID_NS_REVOCATION_URL 352
-#define OID_NS_CA_REVOCATION_URL 353
-#define OID_NS_CA_POLICY_URL 354
-#define OID_NS_COMMENT 355
-#define OID_EMPLOYEE_NUMBER 358
-#define OID_PKI_MESSAGE_TYPE 364
-#define OID_PKI_STATUS 365
-#define OID_PKI_FAIL_INFO 366
-#define OID_PKI_SENDER_NONCE 367
-#define OID_PKI_RECIPIENT_NONCE 368
-#define OID_PKI_TRANS_ID 369
-#define OID_TPM_MANUFACTURER 375
-#define OID_TPM_MODEL 376
-#define OID_TPM_VERSION 377
-#define OID_TPM_ID_LABEL 378
+#define OID_XMPP_ADDR 219
+#define OID_AUTHENTICATION_INFO 223
+#define OID_ACCESS_IDENTITY 224
+#define OID_CHARGING_IDENTITY 225
+#define OID_GROUP 226
+#define OID_OCSP 229
+#define OID_BASIC 230
+#define OID_NONCE 231
+#define OID_CRL 232
+#define OID_RESPONSE 233
+#define OID_NO_CHECK 234
+#define OID_ARCHIVE_CUTOFF 235
+#define OID_SERVICE_LOCATOR 236
+#define OID_CA_ISSUERS 237
+#define OID_IKE_INTERMEDIATE 242
+#define OID_DES_CBC 246
+#define OID_SHA1 247
+#define OID_SHA1_WITH_RSA_OIW 248
+#define OID_ECGDSA_PUBKEY 267
+#define OID_ECGDSA_SIG_WITH_RIPEMD160 270
+#define OID_ECGDSA_SIG_WITH_SHA1 271
+#define OID_ECGDSA_SIG_WITH_SHA224 272
+#define OID_ECGDSA_SIG_WITH_SHA256 273
+#define OID_ECGDSA_SIG_WITH_SHA384 274
+#define OID_ECGDSA_SIG_WITH_SHA512 275
+#define OID_SECT163K1 298
+#define OID_SECT163R1 299
+#define OID_SECT239K1 300
+#define OID_SECT113R1 301
+#define OID_SECT113R2 302
+#define OID_SECT112R1 303
+#define OID_SECT112R2 304
+#define OID_SECT160R1 305
+#define OID_SECT160K1 306
+#define OID_SECT256K1 307
+#define OID_SECT163R2 308
+#define OID_SECT283K1 309
+#define OID_SECT283R1 310
+#define OID_SECT131R1 311
+#define OID_SECT131R2 312
+#define OID_SECT193R1 313
+#define OID_SECT193R2 314
+#define OID_SECT233K1 315
+#define OID_SECT233R1 316
+#define OID_SECT128R1 317
+#define OID_SECT128R2 318
+#define OID_SECT160R2 319
+#define OID_SECT192K1 320
+#define OID_SECT224K1 321
+#define OID_SECT224R1 322
+#define OID_SECT384R1 323
+#define OID_SECT521R1 324
+#define OID_SECT409K1 325
+#define OID_SECT409R1 326
+#define OID_SECT571K1 327
+#define OID_SECT571R1 328
+#define OID_AES128_CBC 337
+#define OID_AES128_GCM 338
+#define OID_AES128_CCM 339
+#define OID_AES192_CBC 340
+#define OID_AES192_GCM 341
+#define OID_AES192_CCM 342
+#define OID_AES256_CBC 343
+#define OID_AES256_GCM 344
+#define OID_AES256_CCM 345
+#define OID_SHA256 347
+#define OID_SHA384 348
+#define OID_SHA512 349
+#define OID_SHA224 350
+#define OID_NS_REVOCATION_URL 358
+#define OID_NS_CA_REVOCATION_URL 359
+#define OID_NS_CA_POLICY_URL 360
+#define OID_NS_COMMENT 361
+#define OID_EMPLOYEE_NUMBER 364
+#define OID_PKI_MESSAGE_TYPE 370
+#define OID_PKI_STATUS 371
+#define OID_PKI_FAIL_INFO 372
+#define OID_PKI_SENDER_NONCE 373
+#define OID_PKI_RECIPIENT_NONCE 374
+#define OID_PKI_TRANS_ID 375
+#define OID_TPM_MANUFACTURER 381
+#define OID_TPM_MODEL 382
+#define OID_TPM_VERSION 383
+#define OID_TPM_ID_LABEL 384
-#define OID_MAX 379
+#define OID_MAX 385
#endif /* OID_H_ */
diff --git a/src/libstrongswan/asn1/oid.txt b/src/libstrongswan/asn1/oid.txt
index c4677a537..49ef1cdf2 100644
--- a/src/libstrongswan/asn1/oid.txt
+++ b/src/libstrongswan/asn1/oid.txt
@@ -213,7 +213,13 @@
0x08 "timeStamping"
0x09 "ocspSigning" OID_OCSP_SIGNING
0x08 "id-otherNames"
+ 0x01 "personalData"
+ 0x02 "userGroup"
+ 0x03 "id-on-permanentIdentifier"
+ 0x04 "id-on-hardwareModuleName"
0x05 "xmppAddr" OID_XMPP_ADDR
+ 0x06 "id-on-SIM"
+ 0x07 "id-on-dnsSRV"
0x0A "id-aca"
0x01 "authenticationInfo" OID_AUTHENTICATION_INFO
0x02 "accessIdentity" OID_ACCESS_IDENTITY