summaryrefslogtreecommitdiff
path: root/src/libstrongswan/asn1
diff options
context:
space:
mode:
Diffstat (limited to 'src/libstrongswan/asn1')
-rw-r--r--src/libstrongswan/asn1/asn1.c20
-rw-r--r--src/libstrongswan/asn1/oid.c289
-rw-r--r--src/libstrongswan/asn1/oid.h141
-rw-r--r--src/libstrongswan/asn1/oid.txt3
4 files changed, 229 insertions, 224 deletions
diff --git a/src/libstrongswan/asn1/asn1.c b/src/libstrongswan/asn1/asn1.c
index 4cb38d126..c9f6fce25 100644
--- a/src/libstrongswan/asn1/asn1.c
+++ b/src/libstrongswan/asn1/asn1.c
@@ -28,7 +28,7 @@
/**
* Commonly used ASN1 values.
*/
-const chunk_t ASN1_INTEGER_0 = chunk_from_chars(0x02, 0x00);
+const chunk_t ASN1_INTEGER_0 = chunk_from_chars(0x02, 0x01, 0x00);
const chunk_t ASN1_INTEGER_1 = chunk_from_chars(0x02, 0x01, 0x01);
const chunk_t ASN1_INTEGER_2 = chunk_from_chars(0x02, 0x01, 0x02);
@@ -228,7 +228,8 @@ size_t asn1_length(chunk_t *blob)
/* read length field, skip tag and length */
n = blob->ptr[1];
- *blob = chunk_skip(*blob, 2);
+ blob->ptr += 2;
+ blob->len -= 2;
if ((n & 0x80) == 0)
{ /* single length octet */
@@ -760,16 +761,13 @@ chunk_t asn1_integer(const char *mode, chunk_t content)
size_t len;
u_char *pos;
- if (content.len == 0 || (content.len == 1 && *content.ptr == 0x00))
- {
- /* a zero ASN.1 integer does not have a value field */
- len = 0;
- }
- else
- {
- /* ASN.1 integers must be positive numbers in two's complement */
- len = content.len + ((*content.ptr & 0x80) ? 1 : 0);
+ if (content.len == 0)
+ { /* make sure 0 is encoded properly */
+ content = chunk_from_chars(0x00);
}
+
+ /* ASN.1 integers must be positive numbers in two's complement */
+ len = content.len + ((*content.ptr & 0x80) ? 1 : 0);
pos = asn1_build_object(&object, ASN1_INTEGER, len);
if (len > content.len)
{
diff --git a/src/libstrongswan/asn1/oid.c b/src/libstrongswan/asn1/oid.c
index bfc985c25..b21299620 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, 320, 1, 0, "" }, /* 169 */
- { 0x06, 234, 1, 1, "dod" }, /* 170 */
+ {0x2B, 323, 1, 0, "" }, /* 169 */
+ { 0x06, 237, 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, 0, 1, 5, "id-pkix" }, /* 196 */
+ { 0x07, 234, 1, 5, "id-pkix" }, /* 196 */
{ 0x01, 201, 1, 6, "id-pe" }, /* 197 */
{ 0x01, 199, 0, 7, "authorityInfoAccess" }, /* 198 */
{ 0x03, 200, 0, 7, "qcStatements" }, /* 199 */
@@ -244,144 +244,147 @@ const oid_t oid_names[] = {
{ 0x02, 232, 0, 7, "caIssuers" }, /* 231 */
{ 0x03, 233, 0, 7, "timeStamping" }, /* 232 */
{ 0x05, 0, 0, 7, "caRepository" }, /* 233 */
- { 0x0E, 240, 1, 1, "oiw" }, /* 234 */
- { 0x03, 0, 1, 2, "secsig" }, /* 235 */
- { 0x02, 0, 1, 3, "algorithms" }, /* 236 */
- { 0x07, 238, 0, 4, "des-cbc" }, /* 237 */
- { 0x1A, 239, 0, 4, "sha-1" }, /* 238 */
- { 0x1D, 0, 0, 4, "sha-1WithRSASignature" }, /* 239 */
- { 0x24, 286, 1, 1, "TeleTrusT" }, /* 240 */
- { 0x03, 0, 1, 2, "algorithm" }, /* 241 */
- { 0x03, 0, 1, 3, "signatureAlgorithm" }, /* 242 */
- { 0x01, 247, 1, 4, "rsaSignature" }, /* 243 */
- { 0x02, 245, 0, 5, "rsaSigWithripemd160" }, /* 244 */
- { 0x03, 246, 0, 5, "rsaSigWithripemd128" }, /* 245 */
- { 0x04, 0, 0, 5, "rsaSigWithripemd256" }, /* 246 */
- { 0x02, 0, 1, 4, "ecSign" }, /* 247 */
- { 0x01, 249, 0, 5, "ecSignWithsha1" }, /* 248 */
- { 0x02, 250, 0, 5, "ecSignWithripemd160" }, /* 249 */
- { 0x03, 251, 0, 5, "ecSignWithmd2" }, /* 250 */
- { 0x04, 252, 0, 5, "ecSignWithmd5" }, /* 251 */
- { 0x05, 269, 1, 5, "ttt-ecg" }, /* 252 */
- { 0x01, 257, 1, 6, "fieldType" }, /* 253 */
- { 0x01, 0, 1, 7, "characteristictwoField" }, /* 254 */
- { 0x01, 0, 1, 8, "basisType" }, /* 255 */
- { 0x01, 0, 0, 9, "ipBasis" }, /* 256 */
- { 0x02, 259, 1, 6, "keyType" }, /* 257 */
- { 0x01, 0, 0, 7, "ecgPublicKey" }, /* 258 */
- { 0x03, 260, 0, 6, "curve" }, /* 259 */
- { 0x04, 267, 1, 6, "signatures" }, /* 260 */
- { 0x01, 262, 0, 7, "ecgdsa-with-RIPEMD160" }, /* 261 */
- { 0x02, 263, 0, 7, "ecgdsa-with-SHA1" }, /* 262 */
- { 0x03, 264, 0, 7, "ecgdsa-with-SHA224" }, /* 263 */
- { 0x04, 265, 0, 7, "ecgdsa-with-SHA256" }, /* 264 */
- { 0x05, 266, 0, 7, "ecgdsa-with-SHA384" }, /* 265 */
- { 0x06, 0, 0, 7, "ecgdsa-with-SHA512" }, /* 266 */
- { 0x05, 0, 1, 6, "module" }, /* 267 */
- { 0x01, 0, 0, 7, "1" }, /* 268 */
- { 0x08, 0, 1, 5, "ecStdCurvesAndGeneration" }, /* 269 */
- { 0x01, 0, 1, 6, "ellipticCurve" }, /* 270 */
- { 0x01, 0, 1, 7, "versionOne" }, /* 271 */
- { 0x01, 273, 0, 8, "brainpoolP160r1" }, /* 272 */
- { 0x02, 274, 0, 8, "brainpoolP160t1" }, /* 273 */
- { 0x03, 275, 0, 8, "brainpoolP192r1" }, /* 274 */
- { 0x04, 276, 0, 8, "brainpoolP192t1" }, /* 275 */
- { 0x05, 277, 0, 8, "brainpoolP224r1" }, /* 276 */
- { 0x06, 278, 0, 8, "brainpoolP224t1" }, /* 277 */
- { 0x07, 279, 0, 8, "brainpoolP256r1" }, /* 278 */
- { 0x08, 280, 0, 8, "brainpoolP256t1" }, /* 279 */
- { 0x09, 281, 0, 8, "brainpoolP320r1" }, /* 280 */
- { 0x0A, 282, 0, 8, "brainpoolP320t1" }, /* 281 */
- { 0x0B, 283, 0, 8, "brainpoolP384r1" }, /* 282 */
- { 0x0C, 284, 0, 8, "brainpoolP384t1" }, /* 283 */
- { 0x0D, 285, 0, 8, "brainpoolP512r1" }, /* 284 */
- { 0x0E, 0, 0, 8, "brainpoolP512t1" }, /* 285 */
- { 0x81, 0, 1, 1, "" }, /* 286 */
- { 0x04, 0, 1, 2, "Certicom" }, /* 287 */
- { 0x00, 0, 1, 3, "curve" }, /* 288 */
- { 0x01, 290, 0, 4, "sect163k1" }, /* 289 */
- { 0x02, 291, 0, 4, "sect163r1" }, /* 290 */
- { 0x03, 292, 0, 4, "sect239k1" }, /* 291 */
- { 0x04, 293, 0, 4, "sect113r1" }, /* 292 */
- { 0x05, 294, 0, 4, "sect113r2" }, /* 293 */
- { 0x06, 295, 0, 4, "secp112r1" }, /* 294 */
- { 0x07, 296, 0, 4, "secp112r2" }, /* 295 */
- { 0x08, 297, 0, 4, "secp160r1" }, /* 296 */
- { 0x09, 298, 0, 4, "secp160k1" }, /* 297 */
- { 0x0A, 299, 0, 4, "secp256k1" }, /* 298 */
- { 0x0F, 300, 0, 4, "sect163r2" }, /* 299 */
- { 0x10, 301, 0, 4, "sect283k1" }, /* 300 */
- { 0x11, 302, 0, 4, "sect283r1" }, /* 301 */
- { 0x16, 303, 0, 4, "sect131r1" }, /* 302 */
- { 0x17, 304, 0, 4, "sect131r2" }, /* 303 */
- { 0x18, 305, 0, 4, "sect193r1" }, /* 304 */
- { 0x19, 306, 0, 4, "sect193r2" }, /* 305 */
- { 0x1A, 307, 0, 4, "sect233k1" }, /* 306 */
- { 0x1B, 308, 0, 4, "sect233r1" }, /* 307 */
- { 0x1C, 309, 0, 4, "secp128r1" }, /* 308 */
- { 0x1D, 310, 0, 4, "secp128r2" }, /* 309 */
- { 0x1E, 311, 0, 4, "secp160r2" }, /* 310 */
- { 0x1F, 312, 0, 4, "secp192k1" }, /* 311 */
- { 0x20, 313, 0, 4, "secp224k1" }, /* 312 */
- { 0x21, 314, 0, 4, "secp224r1" }, /* 313 */
- { 0x22, 315, 0, 4, "secp384r1" }, /* 314 */
- { 0x23, 316, 0, 4, "secp521r1" }, /* 315 */
- { 0x24, 317, 0, 4, "sect409k1" }, /* 316 */
- { 0x25, 318, 0, 4, "sect409r1" }, /* 317 */
- { 0x26, 319, 0, 4, "sect571k1" }, /* 318 */
- { 0x27, 0, 0, 4, "sect571r1" }, /* 319 */
- {0x60, 366, 1, 0, "" }, /* 320 */
- { 0x86, 0, 1, 1, "" }, /* 321 */
- { 0x48, 0, 1, 2, "" }, /* 322 */
- { 0x01, 0, 1, 3, "organization" }, /* 323 */
- { 0x65, 342, 1, 4, "gov" }, /* 324 */
- { 0x03, 0, 1, 5, "csor" }, /* 325 */
- { 0x04, 0, 1, 6, "nistalgorithm" }, /* 326 */
- { 0x01, 337, 1, 7, "aes" }, /* 327 */
- { 0x02, 329, 0, 8, "id-aes128-CBC" }, /* 328 */
- { 0x06, 330, 0, 8, "id-aes128-GCM" }, /* 329 */
- { 0x07, 331, 0, 8, "id-aes128-CCM" }, /* 330 */
- { 0x16, 332, 0, 8, "id-aes192-CBC" }, /* 331 */
- { 0x1A, 333, 0, 8, "id-aes192-GCM" }, /* 332 */
- { 0x1B, 334, 0, 8, "id-aes192-CCM" }, /* 333 */
- { 0x2A, 335, 0, 8, "id-aes256-CBC" }, /* 334 */
- { 0x2E, 336, 0, 8, "id-aes256-GCM" }, /* 335 */
- { 0x2F, 0, 0, 8, "id-aes256-CCM" }, /* 336 */
- { 0x02, 0, 1, 7, "hashalgs" }, /* 337 */
- { 0x01, 339, 0, 8, "id-SHA-256" }, /* 338 */
- { 0x02, 340, 0, 8, "id-SHA-384" }, /* 339 */
- { 0x03, 341, 0, 8, "id-SHA-512" }, /* 340 */
- { 0x04, 0, 0, 8, "id-SHA-224" }, /* 341 */
- { 0x86, 0, 1, 4, "" }, /* 342 */
- { 0xf8, 0, 1, 5, "" }, /* 343 */
- { 0x42, 356, 1, 6, "netscape" }, /* 344 */
- { 0x01, 351, 1, 7, "" }, /* 345 */
- { 0x01, 347, 0, 8, "nsCertType" }, /* 346 */
- { 0x03, 348, 0, 8, "nsRevocationUrl" }, /* 347 */
- { 0x04, 349, 0, 8, "nsCaRevocationUrl" }, /* 348 */
- { 0x08, 350, 0, 8, "nsCaPolicyUrl" }, /* 349 */
- { 0x0d, 0, 0, 8, "nsComment" }, /* 350 */
- { 0x03, 354, 1, 7, "directory" }, /* 351 */
- { 0x01, 0, 1, 8, "" }, /* 352 */
- { 0x03, 0, 0, 9, "employeeNumber" }, /* 353 */
- { 0x04, 0, 1, 7, "policy" }, /* 354 */
- { 0x01, 0, 0, 8, "nsSGC" }, /* 355 */
- { 0x45, 0, 1, 6, "verisign" }, /* 356 */
- { 0x01, 0, 1, 7, "pki" }, /* 357 */
- { 0x09, 0, 1, 8, "attributes" }, /* 358 */
- { 0x02, 360, 0, 9, "messageType" }, /* 359 */
- { 0x03, 361, 0, 9, "pkiStatus" }, /* 360 */
- { 0x04, 362, 0, 9, "failInfo" }, /* 361 */
- { 0x05, 363, 0, 9, "senderNonce" }, /* 362 */
- { 0x06, 364, 0, 9, "recipientNonce" }, /* 363 */
- { 0x07, 365, 0, 9, "transID" }, /* 364 */
- { 0x08, 0, 0, 9, "extensionReq" }, /* 365 */
- {0x67, 0, 1, 0, "" }, /* 366 */
- { 0x81, 0, 1, 1, "" }, /* 367 */
- { 0x05, 0, 1, 2, "" }, /* 368 */
- { 0x02, 0, 1, 3, "tcg-attribute" }, /* 369 */
- { 0x01, 371, 0, 4, "tcg-at-tpmManufacturer" }, /* 370 */
- { 0x02, 372, 0, 4, "tcg-at-tpmModel" }, /* 371 */
- { 0x03, 373, 0, 4, "tcg-at-tpmVersion" }, /* 372 */
- { 0x0F, 0, 0, 4, "tcg-at-tpmIdLabel" } /* 373 */
+ { 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, 369, 1, 0, "" }, /* 323 */
+ { 0x86, 0, 1, 1, "" }, /* 324 */
+ { 0x48, 0, 1, 2, "" }, /* 325 */
+ { 0x01, 0, 1, 3, "organization" }, /* 326 */
+ { 0x65, 345, 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, 0, 0, 8, "id-SHA-224" }, /* 344 */
+ { 0x86, 0, 1, 4, "" }, /* 345 */
+ { 0xf8, 0, 1, 5, "" }, /* 346 */
+ { 0x42, 359, 1, 6, "netscape" }, /* 347 */
+ { 0x01, 354, 1, 7, "" }, /* 348 */
+ { 0x01, 350, 0, 8, "nsCertType" }, /* 349 */
+ { 0x03, 351, 0, 8, "nsRevocationUrl" }, /* 350 */
+ { 0x04, 352, 0, 8, "nsCaRevocationUrl" }, /* 351 */
+ { 0x08, 353, 0, 8, "nsCaPolicyUrl" }, /* 352 */
+ { 0x0d, 0, 0, 8, "nsComment" }, /* 353 */
+ { 0x03, 357, 1, 7, "directory" }, /* 354 */
+ { 0x01, 0, 1, 8, "" }, /* 355 */
+ { 0x03, 0, 0, 9, "employeeNumber" }, /* 356 */
+ { 0x04, 0, 1, 7, "policy" }, /* 357 */
+ { 0x01, 0, 0, 8, "nsSGC" }, /* 358 */
+ { 0x45, 0, 1, 6, "verisign" }, /* 359 */
+ { 0x01, 0, 1, 7, "pki" }, /* 360 */
+ { 0x09, 0, 1, 8, "attributes" }, /* 361 */
+ { 0x02, 363, 0, 9, "messageType" }, /* 362 */
+ { 0x03, 364, 0, 9, "pkiStatus" }, /* 363 */
+ { 0x04, 365, 0, 9, "failInfo" }, /* 364 */
+ { 0x05, 366, 0, 9, "senderNonce" }, /* 365 */
+ { 0x06, 367, 0, 9, "recipientNonce" }, /* 366 */
+ { 0x07, 368, 0, 9, "transID" }, /* 367 */
+ { 0x08, 0, 0, 9, "extensionReq" }, /* 368 */
+ {0x67, 0, 1, 0, "" }, /* 369 */
+ { 0x81, 0, 1, 1, "" }, /* 370 */
+ { 0x05, 0, 1, 2, "" }, /* 371 */
+ { 0x02, 0, 1, 3, "tcg-attribute" }, /* 372 */
+ { 0x01, 374, 0, 4, "tcg-at-tpmManufacturer" }, /* 373 */
+ { 0x02, 375, 0, 4, "tcg-at-tpmModel" }, /* 374 */
+ { 0x03, 376, 0, 4, "tcg-at-tpmVersion" }, /* 375 */
+ { 0x0F, 0, 0, 4, "tcg-at-tpmIdLabel" } /* 376 */
};
diff --git a/src/libstrongswan/asn1/oid.h b/src/libstrongswan/asn1/oid.h
index a01c434a9..5e30a3675 100644
--- a/src/libstrongswan/asn1/oid.h
+++ b/src/libstrongswan/asn1/oid.h
@@ -150,76 +150,77 @@ extern const oid_t oid_names[];
#define OID_ARCHIVE_CUTOFF 229
#define OID_SERVICE_LOCATOR 230
#define OID_CA_ISSUERS 231
-#define OID_DES_CBC 237
-#define OID_SHA1 238
-#define OID_SHA1_WITH_RSA_OIW 239
-#define OID_ECGDSA_PUBKEY 258
-#define OID_ECGDSA_SIG_WITH_RIPEMD160 261
-#define OID_ECGDSA_SIG_WITH_SHA1 262
-#define OID_ECGDSA_SIG_WITH_SHA224 263
-#define OID_ECGDSA_SIG_WITH_SHA256 264
-#define OID_ECGDSA_SIG_WITH_SHA384 265
-#define OID_ECGDSA_SIG_WITH_SHA512 266
-#define OID_SECT163K1 289
-#define OID_SECT163R1 290
-#define OID_SECT239K1 291
-#define OID_SECT113R1 292
-#define OID_SECT113R2 293
-#define OID_SECT112R1 294
-#define OID_SECT112R2 295
-#define OID_SECT160R1 296
-#define OID_SECT160K1 297
-#define OID_SECT256K1 298
-#define OID_SECT163R2 299
-#define OID_SECT283K1 300
-#define OID_SECT283R1 301
-#define OID_SECT131R1 302
-#define OID_SECT131R2 303
-#define OID_SECT193R1 304
-#define OID_SECT193R2 305
-#define OID_SECT233K1 306
-#define OID_SECT233R1 307
-#define OID_SECT128R1 308
-#define OID_SECT128R2 309
-#define OID_SECT160R2 310
-#define OID_SECT192K1 311
-#define OID_SECT224K1 312
-#define OID_SECT224R1 313
-#define OID_SECT384R1 314
-#define OID_SECT521R1 315
-#define OID_SECT409K1 316
-#define OID_SECT409R1 317
-#define OID_SECT571K1 318
-#define OID_SECT571R1 319
-#define OID_AES128_CBC 328
-#define OID_AES128_GCM 329
-#define OID_AES128_CCM 330
-#define OID_AES192_CBC 331
-#define OID_AES192_GCM 332
-#define OID_AES192_CCM 333
-#define OID_AES256_CBC 334
-#define OID_AES256_GCM 335
-#define OID_AES256_CCM 336
-#define OID_SHA256 338
-#define OID_SHA384 339
-#define OID_SHA512 340
-#define OID_SHA224 341
-#define OID_NS_REVOCATION_URL 347
-#define OID_NS_CA_REVOCATION_URL 348
-#define OID_NS_CA_POLICY_URL 349
-#define OID_NS_COMMENT 350
-#define OID_EMPLOYEE_NUMBER 353
-#define OID_PKI_MESSAGE_TYPE 359
-#define OID_PKI_STATUS 360
-#define OID_PKI_FAIL_INFO 361
-#define OID_PKI_SENDER_NONCE 362
-#define OID_PKI_RECIPIENT_NONCE 363
-#define OID_PKI_TRANS_ID 364
-#define OID_TPM_MANUFACTURER 370
-#define OID_TPM_MODEL 371
-#define OID_TPM_VERSION 372
-#define OID_TPM_ID_LABEL 373
+#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 350
+#define OID_NS_CA_REVOCATION_URL 351
+#define OID_NS_CA_POLICY_URL 352
+#define OID_NS_COMMENT 353
+#define OID_EMPLOYEE_NUMBER 356
+#define OID_PKI_MESSAGE_TYPE 362
+#define OID_PKI_STATUS 363
+#define OID_PKI_FAIL_INFO 364
+#define OID_PKI_SENDER_NONCE 365
+#define OID_PKI_RECIPIENT_NONCE 366
+#define OID_PKI_TRANS_ID 367
+#define OID_TPM_MANUFACTURER 373
+#define OID_TPM_MODEL 374
+#define OID_TPM_VERSION 375
+#define OID_TPM_ID_LABEL 376
-#define OID_MAX 374
+#define OID_MAX 377
#endif /* OID_H_ */
diff --git a/src/libstrongswan/asn1/oid.txt b/src/libstrongswan/asn1/oid.txt
index c3ff1a9e7..51a29eb33 100644
--- a/src/libstrongswan/asn1/oid.txt
+++ b/src/libstrongswan/asn1/oid.txt
@@ -232,6 +232,9 @@
0x02 "caIssuers" OID_CA_ISSUERS
0x03 "timeStamping"
0x05 "caRepository"
+ 0x08 "ipsec"
+ 0x02 "certificate"
+ 0x02 "iKEIntermediate" OID_IKE_INTERMEDIATE
0x0E "oiw"
0x03 "secsig"
0x02 "algorithms"
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 12:41:17 +0000