Imported Upstream version 5.4.0

1 files changed, 215 insertions, 214 deletions

diff --git a/src/libstrongswan/asn1/oid.h b/src/libstrongswan/asn1/oid.h
index b9ed08d2e..1120156e5 100644
--- a/src/libstrongswan/asn1/oid.h
+++ b/src/libstrongswan/asn1/oid.h
@@ -40,220 +40,221 @@ extern const oid_t oid_names[];
 #define OID_INITIALS						33
 #define OID_UNIQUE_IDENTIFIER				34
 #define OID_DN_QUALIFIER					35
-#define OID_ROLE							36
-#define OID_SUBJECT_KEY_ID					39
-#define OID_KEY_USAGE						40
-#define OID_SUBJECT_ALT_NAME				42
-#define OID_BASIC_CONSTRAINTS				44
-#define OID_CRL_NUMBER						45
-#define OID_CRL_REASON_CODE					46
-#define OID_DELTA_CRL_INDICATOR				49
-#define OID_ISSUING_DIST_POINT				50
-#define OID_NAME_CONSTRAINTS				52
-#define OID_CRL_DISTRIBUTION_POINTS			53
-#define OID_CERTIFICATE_POLICIES			54
-#define OID_ANY_POLICY						55
-#define OID_POLICY_MAPPINGS					56
-#define OID_AUTHORITY_KEY_ID				57
-#define OID_POLICY_CONSTRAINTS				58
-#define OID_EXTENDED_KEY_USAGE				59
-#define OID_FRESHEST_CRL					61
-#define OID_INHIBIT_ANY_POLICY				62
-#define OID_TARGET_INFORMATION				63
-#define OID_NO_REV_AVAIL					64
-#define OID_CAMELLIA128_CBC					75
-#define OID_CAMELLIA192_CBC					76
-#define OID_CAMELLIA256_CBC					77
-#define OID_RSA_ENCRYPTION					90
-#define OID_MD2_WITH_RSA					91
-#define OID_MD5_WITH_RSA					92
-#define OID_SHA1_WITH_RSA					93
-#define OID_RSAES_OAEP						94
-#define OID_SHA256_WITH_RSA					97
-#define OID_SHA384_WITH_RSA					98
-#define OID_SHA512_WITH_RSA					99
-#define OID_SHA224_WITH_RSA					100
-#define OID_PBE_MD5_DES_CBC					102
-#define OID_PBE_SHA1_DES_CBC				103
-#define OID_PBKDF2							104
-#define OID_PBES2							105
-#define OID_PKCS7_DATA						107
-#define OID_PKCS7_SIGNED_DATA				108
-#define OID_PKCS7_ENVELOPED_DATA			109
-#define OID_PKCS7_SIGNED_ENVELOPED_DATA		110
-#define OID_PKCS7_DIGESTED_DATA				111
-#define OID_PKCS7_ENCRYPTED_DATA			112
-#define OID_EMAIL_ADDRESS					114
-#define OID_UNSTRUCTURED_NAME				115
-#define OID_PKCS9_CONTENT_TYPE				116
-#define OID_PKCS9_MESSAGE_DIGEST			117
-#define OID_PKCS9_SIGNING_TIME				118
-#define OID_CHALLENGE_PASSWORD				120
-#define OID_UNSTRUCTURED_ADDRESS			121
-#define OID_EXTENSION_REQUEST				122
-#define OID_X509_CERTIFICATE				125
-#define OID_PBE_SHA1_RC4_128				129
-#define OID_PBE_SHA1_RC4_40					130
-#define OID_PBE_SHA1_3DES_CBC				131
-#define OID_PBE_SHA1_3DES_2KEY_CBC			132
-#define OID_PBE_SHA1_RC2_CBC_128			133
-#define OID_PBE_SHA1_RC2_CBC_40				134
-#define OID_P12_KEY_BAG						137
-#define OID_P12_PKCS8_KEY_BAG				138
-#define OID_P12_CERT_BAG					139
-#define OID_P12_CRL_BAG						140
-#define OID_MD2								144
-#define OID_MD5								145
-#define OID_3DES_EDE_CBC					147
-#define OID_EC_PUBLICKEY					151
-#define OID_C2PNB163V1						154
-#define OID_C2PNB163V2						155
-#define OID_C2PNB163V3						156
-#define OID_C2PNB176W1						157
-#define OID_C2PNB191V1						158
-#define OID_C2PNB191V2						159
-#define OID_C2PNB191V3						160
-#define OID_C2PNB191V4						161
-#define OID_C2PNB191V5						162
-#define OID_C2PNB208W1						163
-#define OID_C2PNB239V1						164
-#define OID_C2PNB239V2						165
-#define OID_C2PNB239V3						166
-#define OID_C2PNB239V4						167
-#define OID_C2PNB239V5						168
-#define OID_C2PNB272W1						169
-#define OID_C2PNB304W1						170
-#define OID_C2PNB359V1						171
-#define OID_C2PNB368W1						172
-#define OID_C2PNB431R1						173
-#define OID_PRIME192V1						175
-#define OID_PRIME192V2						176
-#define OID_PRIME192V3						177
-#define OID_PRIME239V1						178
-#define OID_PRIME239V2						179
-#define OID_PRIME239V3						180
-#define OID_PRIME256V1						181
-#define OID_ECDSA_WITH_SHA1					183
-#define OID_ECDSA_WITH_SHA224				185
-#define OID_ECDSA_WITH_SHA256				186
-#define OID_ECDSA_WITH_SHA384				187
-#define OID_ECDSA_WITH_SHA512				188
-#define OID_MS_SMARTCARD_LOGON				202
-#define OID_USER_PRINCIPAL_NAME				203
-#define OID_STRONGSWAN						209
-#define OID_BLISS_PUBLICKEY					214
-#define OID_BLISS_I							216
-#define OID_BLISS_II						217
-#define OID_BLISS_III						218
-#define OID_BLISS_IV						219
-#define OID_BLISS_B_I						220
-#define OID_BLISS_B_II						221
-#define OID_BLISS_B_III						222
-#define OID_BLISS_B_IV						223
-#define OID_BLISS_WITH_SHA2_512				225
-#define OID_BLISS_WITH_SHA2_384				226
-#define OID_BLISS_WITH_SHA2_256				227
-#define OID_BLISS_WITH_SHA3_512				228
-#define OID_BLISS_WITH_SHA3_384				229
-#define OID_BLISS_WITH_SHA3_256				230
-#define OID_TCGID							237
-#define OID_BLOWFISH_CBC					241
-#define OID_AUTHORITY_INFO_ACCESS			285
-#define OID_IP_ADDR_BLOCKS					287
-#define OID_POLICY_QUALIFIER_CPS			289
-#define OID_POLICY_QUALIFIER_UNOTICE		290
-#define OID_SERVER_AUTH						292
-#define OID_CLIENT_AUTH						293
-#define OID_OCSP_SIGNING					300
-#define OID_XMPP_ADDR						306
-#define OID_AUTHENTICATION_INFO				310
-#define OID_ACCESS_IDENTITY					311
-#define OID_CHARGING_IDENTITY				312
-#define OID_GROUP							313
-#define OID_OCSP							316
-#define OID_BASIC							317
-#define OID_NONCE							318
-#define OID_CRL								319
-#define OID_RESPONSE						320
-#define OID_NO_CHECK						321
-#define OID_ARCHIVE_CUTOFF					322
-#define OID_SERVICE_LOCATOR					323
-#define OID_CA_ISSUERS						324
-#define OID_IKE_INTERMEDIATE				329
-#define OID_DES_CBC							333
-#define OID_SHA1							334
-#define OID_SHA1_WITH_RSA_OIW				335
-#define OID_ECGDSA_PUBKEY					354
-#define OID_ECGDSA_SIG_WITH_RIPEMD160		357
-#define OID_ECGDSA_SIG_WITH_SHA1			358
-#define OID_ECGDSA_SIG_WITH_SHA224			359
-#define OID_ECGDSA_SIG_WITH_SHA256			360
-#define OID_ECGDSA_SIG_WITH_SHA384			361
-#define OID_ECGDSA_SIG_WITH_SHA512			362
-#define OID_SECT163K1						385
-#define OID_SECT163R1						386
-#define OID_SECT239K1						387
-#define OID_SECT113R1						388
-#define OID_SECT113R2						389
-#define OID_SECT112R1						390
-#define OID_SECT112R2						391
-#define OID_SECT160R1						392
-#define OID_SECT160K1						393
-#define OID_SECT256K1						394
-#define OID_SECT163R2						395
-#define OID_SECT283K1						396
-#define OID_SECT283R1						397
-#define OID_SECT131R1						398
-#define OID_SECT131R2						399
-#define OID_SECT193R1						400
-#define OID_SECT193R2						401
-#define OID_SECT233K1						402
-#define OID_SECT233R1						403
-#define OID_SECT128R1						404
-#define OID_SECT128R2						405
-#define OID_SECT160R2						406
-#define OID_SECT192K1						407
-#define OID_SECT224K1						408
-#define OID_SECT224R1						409
-#define OID_SECT384R1						410
-#define OID_SECT521R1						411
-#define OID_SECT409K1						412
-#define OID_SECT409R1						413
-#define OID_SECT571K1						414
-#define OID_SECT571R1						415
-#define OID_AES128_CBC						424
-#define OID_AES128_GCM						425
-#define OID_AES128_CCM						426
-#define OID_AES192_CBC						427
-#define OID_AES192_GCM						428
-#define OID_AES192_CCM						429
-#define OID_AES256_CBC						430
-#define OID_AES256_GCM						431
-#define OID_AES256_CCM						432
-#define OID_SHA256							434
-#define OID_SHA384							435
-#define OID_SHA512							436
-#define OID_SHA224							437
-#define OID_SHA3_224						440
-#define OID_SHA3_256						441
-#define OID_SHA3_384						442
-#define OID_SHA3_512						443
-#define OID_NS_REVOCATION_URL				451
-#define OID_NS_CA_REVOCATION_URL			452
-#define OID_NS_CA_POLICY_URL				453
-#define OID_NS_COMMENT						454
-#define OID_EMPLOYEE_NUMBER					457
-#define OID_PKI_MESSAGE_TYPE				463
-#define OID_PKI_STATUS						464
-#define OID_PKI_FAIL_INFO					465
-#define OID_PKI_SENDER_NONCE				466
-#define OID_PKI_RECIPIENT_NONCE				467
-#define OID_PKI_TRANS_ID					468
-#define OID_TPM_MANUFACTURER				474
-#define OID_TPM_MODEL						475
-#define OID_TPM_VERSION						476
-#define OID_TPM_ID_LABEL					477
+#define OID_PSEUDONYM						36
+#define OID_ROLE							37
+#define OID_SUBJECT_KEY_ID					40
+#define OID_KEY_USAGE						41
+#define OID_SUBJECT_ALT_NAME				43
+#define OID_BASIC_CONSTRAINTS				45
+#define OID_CRL_NUMBER						46
+#define OID_CRL_REASON_CODE					47
+#define OID_DELTA_CRL_INDICATOR				50
+#define OID_ISSUING_DIST_POINT				51
+#define OID_NAME_CONSTRAINTS				53
+#define OID_CRL_DISTRIBUTION_POINTS			54
+#define OID_CERTIFICATE_POLICIES			55
+#define OID_ANY_POLICY						56
+#define OID_POLICY_MAPPINGS					57
+#define OID_AUTHORITY_KEY_ID				58
+#define OID_POLICY_CONSTRAINTS				59
+#define OID_EXTENDED_KEY_USAGE				60
+#define OID_FRESHEST_CRL					62
+#define OID_INHIBIT_ANY_POLICY				63
+#define OID_TARGET_INFORMATION				64
+#define OID_NO_REV_AVAIL					65
+#define OID_CAMELLIA128_CBC					76
+#define OID_CAMELLIA192_CBC					77
+#define OID_CAMELLIA256_CBC					78
+#define OID_RSA_ENCRYPTION					91
+#define OID_MD2_WITH_RSA					92
+#define OID_MD5_WITH_RSA					93
+#define OID_SHA1_WITH_RSA					94
+#define OID_RSAES_OAEP						95
+#define OID_SHA256_WITH_RSA					98
+#define OID_SHA384_WITH_RSA					99
+#define OID_SHA512_WITH_RSA					100
+#define OID_SHA224_WITH_RSA					101
+#define OID_PBE_MD5_DES_CBC					103
+#define OID_PBE_SHA1_DES_CBC				104
+#define OID_PBKDF2							105
+#define OID_PBES2							106
+#define OID_PKCS7_DATA						108
+#define OID_PKCS7_SIGNED_DATA				109
+#define OID_PKCS7_ENVELOPED_DATA			110
+#define OID_PKCS7_SIGNED_ENVELOPED_DATA		111
+#define OID_PKCS7_DIGESTED_DATA				112
+#define OID_PKCS7_ENCRYPTED_DATA			113
+#define OID_EMAIL_ADDRESS					115
+#define OID_UNSTRUCTURED_NAME				116
+#define OID_PKCS9_CONTENT_TYPE				117
+#define OID_PKCS9_MESSAGE_DIGEST			118
+#define OID_PKCS9_SIGNING_TIME				119
+#define OID_CHALLENGE_PASSWORD				121
+#define OID_UNSTRUCTURED_ADDRESS			122
+#define OID_EXTENSION_REQUEST				123
+#define OID_X509_CERTIFICATE				126
+#define OID_PBE_SHA1_RC4_128				130
+#define OID_PBE_SHA1_RC4_40					131
+#define OID_PBE_SHA1_3DES_CBC				132
+#define OID_PBE_SHA1_3DES_2KEY_CBC			133
+#define OID_PBE_SHA1_RC2_CBC_128			134
+#define OID_PBE_SHA1_RC2_CBC_40				135
+#define OID_P12_KEY_BAG						138
+#define OID_P12_PKCS8_KEY_BAG				139
+#define OID_P12_CERT_BAG					140
+#define OID_P12_CRL_BAG						141
+#define OID_MD2								145
+#define OID_MD5								146
+#define OID_3DES_EDE_CBC					148
+#define OID_EC_PUBLICKEY					152
+#define OID_C2PNB163V1						155
+#define OID_C2PNB163V2						156
+#define OID_C2PNB163V3						157
+#define OID_C2PNB176W1						158
+#define OID_C2PNB191V1						159
+#define OID_C2PNB191V2						160
+#define OID_C2PNB191V3						161
+#define OID_C2PNB191V4						162
+#define OID_C2PNB191V5						163
+#define OID_C2PNB208W1						164
+#define OID_C2PNB239V1						165
+#define OID_C2PNB239V2						166
+#define OID_C2PNB239V3						167
+#define OID_C2PNB239V4						168
+#define OID_C2PNB239V5						169
+#define OID_C2PNB272W1						170
+#define OID_C2PNB304W1						171
+#define OID_C2PNB359V1						172
+#define OID_C2PNB368W1						173
+#define OID_C2PNB431R1						174
+#define OID_PRIME192V1						176
+#define OID_PRIME192V2						177
+#define OID_PRIME192V3						178
+#define OID_PRIME239V1						179
+#define OID_PRIME239V2						180
+#define OID_PRIME239V3						181
+#define OID_PRIME256V1						182
+#define OID_ECDSA_WITH_SHA1					184
+#define OID_ECDSA_WITH_SHA224				186
+#define OID_ECDSA_WITH_SHA256				187
+#define OID_ECDSA_WITH_SHA384				188
+#define OID_ECDSA_WITH_SHA512				189
+#define OID_MS_SMARTCARD_LOGON				203
+#define OID_USER_PRINCIPAL_NAME				204
+#define OID_STRONGSWAN						210
+#define OID_BLISS_PUBLICKEY					215
+#define OID_BLISS_I							217
+#define OID_BLISS_II						218
+#define OID_BLISS_III						219
+#define OID_BLISS_IV						220
+#define OID_BLISS_B_I						221
+#define OID_BLISS_B_II						222
+#define OID_BLISS_B_III						223
+#define OID_BLISS_B_IV						224
+#define OID_BLISS_WITH_SHA2_512				226
+#define OID_BLISS_WITH_SHA2_384				227
+#define OID_BLISS_WITH_SHA2_256				228
+#define OID_BLISS_WITH_SHA3_512				229
+#define OID_BLISS_WITH_SHA3_384				230
+#define OID_BLISS_WITH_SHA3_256				231
+#define OID_TCGID							238
+#define OID_BLOWFISH_CBC					242
+#define OID_AUTHORITY_INFO_ACCESS			286
+#define OID_IP_ADDR_BLOCKS					288
+#define OID_POLICY_QUALIFIER_CPS			290
+#define OID_POLICY_QUALIFIER_UNOTICE		291
+#define OID_SERVER_AUTH						293
+#define OID_CLIENT_AUTH						294
+#define OID_OCSP_SIGNING					301
+#define OID_XMPP_ADDR						307
+#define OID_AUTHENTICATION_INFO				311
+#define OID_ACCESS_IDENTITY					312
+#define OID_CHARGING_IDENTITY				313
+#define OID_GROUP							314
+#define OID_OCSP							317
+#define OID_BASIC							318
+#define OID_NONCE							319
+#define OID_CRL								320
+#define OID_RESPONSE						321
+#define OID_NO_CHECK						322
+#define OID_ARCHIVE_CUTOFF					323
+#define OID_SERVICE_LOCATOR					324
+#define OID_CA_ISSUERS						325
+#define OID_IKE_INTERMEDIATE				330
+#define OID_DES_CBC							334
+#define OID_SHA1							335
+#define OID_SHA1_WITH_RSA_OIW				336
+#define OID_ECGDSA_PUBKEY					355
+#define OID_ECGDSA_SIG_WITH_RIPEMD160		358
+#define OID_ECGDSA_SIG_WITH_SHA1			359
+#define OID_ECGDSA_SIG_WITH_SHA224			360
+#define OID_ECGDSA_SIG_WITH_SHA256			361
+#define OID_ECGDSA_SIG_WITH_SHA384			362
+#define OID_ECGDSA_SIG_WITH_SHA512			363
+#define OID_SECT163K1						386
+#define OID_SECT163R1						387
+#define OID_SECT239K1						388
+#define OID_SECT113R1						389
+#define OID_SECT113R2						390
+#define OID_SECT112R1						391
+#define OID_SECT112R2						392
+#define OID_SECT160R1						393
+#define OID_SECT160K1						394
+#define OID_SECT256K1						395
+#define OID_SECT163R2						396
+#define OID_SECT283K1						397
+#define OID_SECT283R1						398
+#define OID_SECT131R1						399
+#define OID_SECT131R2						400
+#define OID_SECT193R1						401
+#define OID_SECT193R2						402
+#define OID_SECT233K1						403
+#define OID_SECT233R1						404
+#define OID_SECT128R1						405
+#define OID_SECT128R2						406
+#define OID_SECT160R2						407
+#define OID_SECT192K1						408
+#define OID_SECT224K1						409
+#define OID_SECT224R1						410
+#define OID_SECT384R1						411
+#define OID_SECT521R1						412
+#define OID_SECT409K1						413
+#define OID_SECT409R1						414
+#define OID_SECT571K1						415
+#define OID_SECT571R1						416
+#define OID_AES128_CBC						425
+#define OID_AES128_GCM						426
+#define OID_AES128_CCM						427
+#define OID_AES192_CBC						428
+#define OID_AES192_GCM						429
+#define OID_AES192_CCM						430
+#define OID_AES256_CBC						431
+#define OID_AES256_GCM						432
+#define OID_AES256_CCM						433
+#define OID_SHA256							435
+#define OID_SHA384							436
+#define OID_SHA512							437
+#define OID_SHA224							438
+#define OID_SHA3_224						441
+#define OID_SHA3_256						442
+#define OID_SHA3_384						443
+#define OID_SHA3_512						444
+#define OID_NS_REVOCATION_URL				452
+#define OID_NS_CA_REVOCATION_URL			453
+#define OID_NS_CA_POLICY_URL				454
+#define OID_NS_COMMENT						455
+#define OID_EMPLOYEE_NUMBER					458
+#define OID_PKI_MESSAGE_TYPE				464
+#define OID_PKI_STATUS						465
+#define OID_PKI_FAIL_INFO					466
+#define OID_PKI_SENDER_NONCE				467
+#define OID_PKI_RECIPIENT_NONCE				468
+#define OID_PKI_TRANS_ID					469
+#define OID_TPM_MANUFACTURER				475
+#define OID_TPM_MODEL						476
+#define OID_TPM_VERSION						477
+#define OID_TPM_ID_LABEL					478
 
-#define OID_MAX								478
+#define OID_MAX								479
 
 #endif /* OID_H_ */