Imported Upstream version 5.0.3

1 files changed, 85 insertions, 85 deletions

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