summaryrefslogtreecommitdiff
path: root/src/libstrongswan/asn1
diff options
context:
space:
mode:
authorYves-Alexis Perez <corsac@debian.org>2013-02-07 13:27:27 +0100
committerYves-Alexis Perez <corsac@debian.org>2013-02-07 13:27:27 +0100
commit7585facf05d927eb6df3929ce09ed5e60d905437 (patch)
treee4d14b4dc180db20356b6b01ce0112f3a2d7897e /src/libstrongswan/asn1
parentc1343b3278cdf99533b7902744d15969f9d6fdc1 (diff)
downloadvyos-strongswan-7585facf05d927eb6df3929ce09ed5e60d905437.tar.gz
vyos-strongswan-7585facf05d927eb6df3929ce09ed5e60d905437.zip
Imported Upstream version 5.0.2
Diffstat (limited to 'src/libstrongswan/asn1')
-rw-r--r--src/libstrongswan/asn1/asn1.c2
-rw-r--r--src/libstrongswan/asn1/asn1_parser.c2
-rw-r--r--src/libstrongswan/asn1/oid.c72
-rw-r--r--src/libstrongswan/asn1/oid.h32
-rw-r--r--src/libstrongswan/asn1/oid.txt2
5 files changed, 57 insertions, 53 deletions
diff --git a/src/libstrongswan/asn1/asn1.c b/src/libstrongswan/asn1/asn1.c
index c9f6fce25..f438cb20e 100644
--- a/src/libstrongswan/asn1/asn1.c
+++ b/src/libstrongswan/asn1/asn1.c
@@ -19,7 +19,7 @@
#include <string.h>
#include <time.h>
-#include <debug.h>
+#include <utils/debug.h>
#include "oid.h"
#include "asn1.h"
diff --git a/src/libstrongswan/asn1/asn1_parser.c b/src/libstrongswan/asn1/asn1_parser.c
index 40e11b321..c31fb75f0 100644
--- a/src/libstrongswan/asn1/asn1_parser.c
+++ b/src/libstrongswan/asn1/asn1_parser.c
@@ -19,7 +19,7 @@
#include <string.h>
#include <time.h>
-#include <debug.h>
+#include <utils/debug.h>
#include "asn1.h"
#include "asn1_parser.h"
diff --git a/src/libstrongswan/asn1/oid.c b/src/libstrongswan/asn1/oid.c
index b21299620..ec60be811 100644
--- a/src/libstrongswan/asn1/oid.c
+++ b/src/libstrongswan/asn1/oid.c
@@ -333,11 +333,11 @@ const oid_t oid_names[] = {
{ 0x25, 321, 0, 4, "sect409r1" }, /* 320 */
{ 0x26, 322, 0, 4, "sect571k1" }, /* 321 */
{ 0x27, 0, 0, 4, "sect571r1" }, /* 322 */
- {0x60, 369, 1, 0, "" }, /* 323 */
+ {0x60, 371, 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 */
+ { 0x65, 347, 1, 4, "gov" }, /* 327 */
{ 0x03, 0, 1, 5, "csor" }, /* 328 */
{ 0x04, 0, 1, 6, "nistalgorithm" }, /* 329 */
{ 0x01, 340, 1, 7, "aes" }, /* 330 */
@@ -354,37 +354,39 @@ const oid_t oid_names[] = {
{ 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 */
+ { 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 */
};
diff --git a/src/libstrongswan/asn1/oid.h b/src/libstrongswan/asn1/oid.h
index 5e30a3675..d9838ccd8 100644
--- a/src/libstrongswan/asn1/oid.h
+++ b/src/libstrongswan/asn1/oid.h
@@ -205,22 +205,22 @@ extern const oid_t oid_names[];
#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_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_MAX 377
+#define OID_MAX 379
#endif /* OID_H_ */
diff --git a/src/libstrongswan/asn1/oid.txt b/src/libstrongswan/asn1/oid.txt
index 51a29eb33..c4677a537 100644
--- a/src/libstrongswan/asn1/oid.txt
+++ b/src/libstrongswan/asn1/oid.txt
@@ -343,6 +343,8 @@
0x02 "id-SHA-384" OID_SHA384
0x03 "id-SHA-512" OID_SHA512
0x04 "id-SHA-224" OID_SHA224
+ 0x05 "id-SHA-512-224"
+ 0x06 "id-SHA-512-256"
0x86 ""
0xf8 ""
0x42 "netscape"
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-11 04:40:07 +0000