Imported Upstream version 5.0.1

1 files changed, 71 insertions, 70 deletions

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_ */