X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fobjects%2Fobj_mac.h;h=725efdb62a783d3dd11cf29a76f3e9fd250bfcac;hp=ccfea00d8cf830439632380d58eca3a1c0413633;hb=4e1b0d890489a1e13a3ea431de7dafda548c2d74;hpb=259810e05bfcb465469a326cbfb939661a2fbcb9

diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h
index ccfea00d8c..725efdb62a 100644
--- a/crypto/objects/obj_mac.h
+++ b/crypto/objects/obj_mac.h
@@ -66,6 +66,11 @@
 #define NID_undef			0
 #define OBJ_undef			0L
 
+#define SN_ccitt		"CCITT"
+#define LN_ccitt		"ccitt"
+#define NID_ccitt		410
+#define OBJ_ccitt		0L
+
 #define SN_iso		"ISO"
 #define LN_iso		"iso"
 #define NID_iso		181
@@ -101,6 +106,67 @@
 #define NID_dsaWithSHA1		113
 #define OBJ_dsaWithSHA1		OBJ_X9cm,3L
 
+#define SN_ansi_X9_62		"ansi-X9-62"
+#define LN_ansi_X9_62		"ANSI X9.62"
+#define NID_ansi_X9_62		480
+#define OBJ_ansi_X9_62		OBJ_ISO_US,10045L
+
+#define OBJ_X9_62_id_fieldType		OBJ_ansi_X9_62,1L
+
+#define SN_X9_62_prime_field		"prime-field"
+#define NID_X9_62_prime_field		481
+#define OBJ_X9_62_prime_field		OBJ_X9_62_id_fieldType,1L
+
+#define SN_X9_62_characteristic_two_field		"characteristic-two-field"
+#define NID_X9_62_characteristic_two_field		482
+#define OBJ_X9_62_characteristic_two_field		OBJ_X9_62_id_fieldType,2L
+
+#define OBJ_X9_62_id_publicKeyType		OBJ_ansi_X9_62,2L
+
+#define SN_X9_62_id_ecPublicKey		"id-ecPublicKey"
+#define NID_X9_62_id_ecPublicKey		483
+#define OBJ_X9_62_id_ecPublicKey		OBJ_X9_62_id_publicKeyType,1L
+
+#define OBJ_X9_62_ellipticCurve		OBJ_ansi_X9_62,3L
+
+#define OBJ_X9_62_c_TwoCurve		OBJ_X9_62_ellipticCurve,0L
+
+#define OBJ_X9_62_primeCurve		OBJ_X9_62_ellipticCurve,1L
+
+#define SN_X9_62_prime192v1		"prime192v1"
+#define NID_X9_62_prime192v1		484
+#define OBJ_X9_62_prime192v1		OBJ_X9_62_primeCurve,1L
+
+#define SN_X9_62_prime192v2		"prime192v2"
+#define NID_X9_62_prime192v2		485
+#define OBJ_X9_62_prime192v2		OBJ_X9_62_primeCurve,2L
+
+#define SN_X9_62_prime192v3		"prime192v3"
+#define NID_X9_62_prime192v3		486
+#define OBJ_X9_62_prime192v3		OBJ_X9_62_primeCurve,3L
+
+#define SN_X9_62_prime239v1		"prime239v1"
+#define NID_X9_62_prime239v1		487
+#define OBJ_X9_62_prime239v1		OBJ_X9_62_primeCurve,4L
+
+#define SN_X9_62_prime239v2		"prime239v2"
+#define NID_X9_62_prime239v2		488
+#define OBJ_X9_62_prime239v2		OBJ_X9_62_primeCurve,5L
+
+#define SN_X9_62_prime239v3		"prime239v3"
+#define NID_X9_62_prime239v3		489
+#define OBJ_X9_62_prime239v3		OBJ_X9_62_primeCurve,6L
+
+#define SN_X9_62_prime256v1		"prime256v1"
+#define NID_X9_62_prime256v1		490
+#define OBJ_X9_62_prime256v1		OBJ_X9_62_primeCurve,7L
+
+#define OBJ_X9_62_id_ecSigType		OBJ_ansi_X9_62,4L
+
+#define SN_ecdsa_with_SHA1		"ecdsa-with-SHA1"
+#define NID_ecdsa_with_SHA1		491
+#define OBJ_ecdsa_with_SHA1		OBJ_X9_62_id_ecSigType,1L
+
 #define SN_cast5_cbc		"CAST5-CBC"
 #define LN_cast5_cbc		"cast5-cbc"
 #define NID_cast5_cbc		108
@@ -573,6 +639,11 @@
 #define NID_localKeyID		157
 #define OBJ_localKeyID		OBJ_pkcs9,21L
 
+#define SN_ms_csp_name		"CSPName"
+#define LN_ms_csp_name		"Microsoft CSP Name"
+#define NID_ms_csp_name		492
+#define OBJ_ms_csp_name		1L,3L,6L,1L,4L,1L,311L,17L,1L
+
 #define OBJ_certTypes		OBJ_pkcs9,22L
 
 #define LN_x509Certificate		"x509Certificate"
@@ -1404,14 +1475,14 @@
 #define NID_shaWithRSAEncryption		42
 #define OBJ_shaWithRSAEncryption		OBJ_algorithm,15L
 
-#define SN_des_ede		"DES-EDE"
-#define LN_des_ede		"des-ede"
-#define NID_des_ede		32
-#define OBJ_des_ede		OBJ_algorithm,17L
+#define SN_des_ede_ecb		"DES-EDE"
+#define LN_des_ede_ecb		"des-ede"
+#define NID_des_ede_ecb		32
+#define OBJ_des_ede_ecb		OBJ_algorithm,17L
 
-#define SN_des_ede3		"DES-EDE3"
-#define LN_des_ede3		"des-ede3"
-#define NID_des_ede3		33
+#define SN_des_ede3_ecb		"DES-EDE3"
+#define LN_des_ede3_ecb		"des-ede3"
+#define NID_des_ede3_ecb		33
 
 #define SN_des_ede_cbc		"DES-EDE-CBC"
 #define LN_des_ede_cbc		"des-ede-cbc"
@@ -1777,16 +1848,6 @@
 #define NID_dcObject		390
 #define OBJ_dcObject		OBJ_enterprises,1466L,344L
 
-#define SN_domainComponent		"DC"
-#define LN_domainComponent		"domainComponent"
-#define NID_domainComponent		391
-#define OBJ_domainComponent		0L,9L,2342L,19200300L,100L,1L,25L
-
-#define SN_Domain		"domain"
-#define LN_Domain		"Domain"
-#define NID_Domain		392
-#define OBJ_Domain		0L,9L,2342L,19200300L,100L,4L,13L
-
 #define SN_rle_compression		"RLE"
 #define LN_rle_compression		"run length compression"
 #define NID_rle_compression		124
@@ -1797,75 +1858,377 @@
 #define NID_zlib_compression		125
 #define OBJ_zlib_compression		1L,1L,1L,1L,666L,2L
 
-#define SN_rijndael_ecb_k128_b128		"RIJNDAEL-ECB-K128-B128"
-#define LN_rijndael_ecb_k128_b128		"rijndael-ecb-k128-b128"
-#define NID_rijndael_ecb_k128_b128		396
+#define OBJ_csor		2L,16L,840L,1L,101L,3L
+
+#define OBJ_nistAlgorithms		OBJ_csor,4L
+
+#define OBJ_aes		OBJ_nistAlgorithms,1L
+
+#define SN_aes_128_ecb		"AES-128-ECB"
+#define LN_aes_128_ecb		"aes-128-ecb"
+#define NID_aes_128_ecb		394
+#define OBJ_aes_128_ecb		OBJ_aes,1L
+
+#define SN_aes_128_cbc		"AES-128-CBC"
+#define LN_aes_128_cbc		"aes-128-cbc"
+#define NID_aes_128_cbc		395
+#define OBJ_aes_128_cbc		OBJ_aes,2L
+
+#define SN_aes_128_ofb		"AES-128-OFB"
+#define LN_aes_128_ofb		"aes-128-ofb"
+#define NID_aes_128_ofb		396
+#define OBJ_aes_128_ofb		OBJ_aes,3L
+
+#define SN_aes_128_cfb		"AES-128-CFB"
+#define LN_aes_128_cfb		"aes-128-cfb"
+#define NID_aes_128_cfb		397
+#define OBJ_aes_128_cfb		OBJ_aes,4L
+
+#define SN_aes_192_ecb		"AES-192-ECB"
+#define LN_aes_192_ecb		"aes-192-ecb"
+#define NID_aes_192_ecb		398
+#define OBJ_aes_192_ecb		OBJ_aes,21L
+
+#define SN_aes_192_cbc		"AES-192-CBC"
+#define LN_aes_192_cbc		"aes-192-cbc"
+#define NID_aes_192_cbc		399
+#define OBJ_aes_192_cbc		OBJ_aes,22L
+
+#define SN_aes_192_ofb		"AES-192-OFB"
+#define LN_aes_192_ofb		"aes-192-ofb"
+#define NID_aes_192_ofb		400
+#define OBJ_aes_192_ofb		OBJ_aes,23L
+
+#define SN_aes_192_cfb		"AES-192-CFB"
+#define LN_aes_192_cfb		"aes-192-cfb"
+#define NID_aes_192_cfb		401
+#define OBJ_aes_192_cfb		OBJ_aes,24L
+
+#define SN_aes_256_ecb		"AES-256-ECB"
+#define LN_aes_256_ecb		"aes-256-ecb"
+#define NID_aes_256_ecb		402
+#define OBJ_aes_256_ecb		OBJ_aes,41L
+
+#define SN_aes_256_cbc		"AES-256-CBC"
+#define LN_aes_256_cbc		"aes-256-cbc"
+#define NID_aes_256_cbc		403
+#define OBJ_aes_256_cbc		OBJ_aes,42L
+
+#define SN_aes_256_ofb		"AES-256-OFB"
+#define LN_aes_256_ofb		"aes-256-ofb"
+#define NID_aes_256_ofb		404
+#define OBJ_aes_256_ofb		OBJ_aes,43L
+
+#define SN_aes_256_cfb		"AES-256-CFB"
+#define LN_aes_256_cfb		"aes-256-cfb"
+#define NID_aes_256_cfb		405
+#define OBJ_aes_256_cfb		OBJ_aes,44L
+
+#define SN_hold_instruction_code		"holdInstructionCode"
+#define LN_hold_instruction_code		"Hold Instruction Code"
+#define NID_hold_instruction_code		406
+#define OBJ_hold_instruction_code		OBJ_id_ce,23L
+
+#define OBJ_holdInstruction		OBJ_X9_57,2L
+
+#define SN_hold_instruction_none		"holdInstructionNone"
+#define LN_hold_instruction_none		"Hold Instruction None"
+#define NID_hold_instruction_none		407
+#define OBJ_hold_instruction_none		OBJ_holdInstruction,1L
+
+#define SN_hold_instruction_call_issuer		"holdInstructionCallIssuer"
+#define LN_hold_instruction_call_issuer		"Hold Instruction Call Issuer"
+#define NID_hold_instruction_call_issuer		408
+#define OBJ_hold_instruction_call_issuer		OBJ_holdInstruction,2L
+
+#define SN_hold_instruction_reject		"holdInstructionReject"
+#define LN_hold_instruction_reject		"Hold Instruction Reject"
+#define NID_hold_instruction_reject		409
+#define OBJ_hold_instruction_reject		OBJ_holdInstruction,3L
+
+#define SN_data		"data"
+#define NID_data		411
+#define OBJ_data		OBJ_ccitt,9L
+
+#define SN_pss		"pss"
+#define NID_pss		412
+#define OBJ_pss		OBJ_data,2342L
+
+#define SN_ucl		"ucl"
+#define NID_ucl		413
+#define OBJ_ucl		OBJ_pss,19200300L
+
+#define SN_pilot		"pilot"
+#define NID_pilot		414
+#define OBJ_pilot		OBJ_ucl,100L
+
+#define LN_pilotAttributeType		"pilotAttributeType"
+#define NID_pilotAttributeType		415
+#define OBJ_pilotAttributeType		OBJ_pilot,1L
+
+#define LN_pilotAttributeSyntax		"pilotAttributeSyntax"
+#define NID_pilotAttributeSyntax		416
+#define OBJ_pilotAttributeSyntax		OBJ_pilot,3L
+
+#define LN_pilotObjectClass		"pilotObjectClass"
+#define NID_pilotObjectClass		417
+#define OBJ_pilotObjectClass		OBJ_pilot,4L
+
+#define LN_pilotGroups		"pilotGroups"
+#define NID_pilotGroups		418
+#define OBJ_pilotGroups		OBJ_pilot,10L
+
+#define LN_iA5StringSyntax		"iA5StringSyntax"
+#define NID_iA5StringSyntax		419
+#define OBJ_iA5StringSyntax		OBJ_pilotAttributeSyntax,4L
+
+#define LN_caseIgnoreIA5StringSyntax		"caseIgnoreIA5StringSyntax"
+#define NID_caseIgnoreIA5StringSyntax		420
+#define OBJ_caseIgnoreIA5StringSyntax		OBJ_pilotAttributeSyntax,5L
+
+#define LN_pilotObject		"pilotObject"
+#define NID_pilotObject		421
+#define OBJ_pilotObject		OBJ_pilotObjectClass,3L
+
+#define LN_pilotPerson		"pilotPerson"
+#define NID_pilotPerson		422
+#define OBJ_pilotPerson		OBJ_pilotObjectClass,4L
+
+#define SN_account		"account"
+#define NID_account		423
+#define OBJ_account		OBJ_pilotObjectClass,5L
+
+#define SN_document		"document"
+#define NID_document		424
+#define OBJ_document		OBJ_pilotObjectClass,6L
+
+#define SN_room		"room"
+#define NID_room		425
+#define OBJ_room		OBJ_pilotObjectClass,7L
+
+#define LN_documentSeries		"documentSeries"
+#define NID_documentSeries		426
+#define OBJ_documentSeries		OBJ_pilotObjectClass,9L
+
+#define SN_Domain		"domain"
+#define LN_Domain		"Domain"
+#define NID_Domain		392
+#define OBJ_Domain		OBJ_pilotObjectClass,13L
+
+#define LN_rFC822localPart		"rFC822localPart"
+#define NID_rFC822localPart		427
+#define OBJ_rFC822localPart		OBJ_pilotObjectClass,14L
+
+#define LN_dNSDomain		"dNSDomain"
+#define NID_dNSDomain		428
+#define OBJ_dNSDomain		OBJ_pilotObjectClass,15L
+
+#define LN_domainRelatedObject		"domainRelatedObject"
+#define NID_domainRelatedObject		429
+#define OBJ_domainRelatedObject		OBJ_pilotObjectClass,17L
+
+#define LN_friendlyCountry		"friendlyCountry"
+#define NID_friendlyCountry		430
+#define OBJ_friendlyCountry		OBJ_pilotObjectClass,18L
+
+#define LN_simpleSecurityObject		"simpleSecurityObject"
+#define NID_simpleSecurityObject		431
+#define OBJ_simpleSecurityObject		OBJ_pilotObjectClass,19L
+
+#define LN_pilotOrganization		"pilotOrganization"
+#define NID_pilotOrganization		432
+#define OBJ_pilotOrganization		OBJ_pilotObjectClass,20L
+
+#define LN_pilotDSA		"pilotDSA"
+#define NID_pilotDSA		433
+#define OBJ_pilotDSA		OBJ_pilotObjectClass,21L
+
+#define LN_qualityLabelledData		"qualityLabelledData"
+#define NID_qualityLabelledData		434
+#define OBJ_qualityLabelledData		OBJ_pilotObjectClass,22L
+
+#define SN_userid		"userid"
+#define NID_userid		435
+#define OBJ_userid		OBJ_pilotAttributeType,1L
+
+#define LN_textEncodedORAddress		"textEncodedORAddress"
+#define NID_textEncodedORAddress		436
+#define OBJ_textEncodedORAddress		OBJ_pilotAttributeType,2L
+
+#define LN_rfc822Mailbox		"rfc822Mailbox"
+#define NID_rfc822Mailbox		437
+#define OBJ_rfc822Mailbox		OBJ_pilotAttributeType,3L
+
+#define SN_info		"info"
+#define NID_info		438
+#define OBJ_info		OBJ_pilotAttributeType,4L
+
+#define LN_favouriteDrink		"favouriteDrink"
+#define NID_favouriteDrink		439
+#define OBJ_favouriteDrink		OBJ_pilotAttributeType,5L
+
+#define LN_roomNumber		"roomNumber"
+#define NID_roomNumber		440
+#define OBJ_roomNumber		OBJ_pilotAttributeType,6L
+
+#define SN_photo		"photo"
+#define NID_photo		441
+#define OBJ_photo		OBJ_pilotAttributeType,7L
+
+#define LN_userClass		"userClass"
+#define NID_userClass		442
+#define OBJ_userClass		OBJ_pilotAttributeType,8L
+
+#define SN_host		"host"
+#define NID_host		443
+#define OBJ_host		OBJ_pilotAttributeType,9L
+
+#define SN_manager		"manager"
+#define NID_manager		444
+#define OBJ_manager		OBJ_pilotAttributeType,10L
+
+#define LN_documentIdentifier		"documentIdentifier"
+#define NID_documentIdentifier		445
+#define OBJ_documentIdentifier		OBJ_pilotAttributeType,11L
+
+#define LN_documentTitle		"documentTitle"
+#define NID_documentTitle		446
+#define OBJ_documentTitle		OBJ_pilotAttributeType,12L
+
+#define LN_documentVersion		"documentVersion"
+#define NID_documentVersion		447
+#define OBJ_documentVersion		OBJ_pilotAttributeType,13L
+
+#define LN_documentAuthor		"documentAuthor"
+#define NID_documentAuthor		448
+#define OBJ_documentAuthor		OBJ_pilotAttributeType,14L
+
+#define LN_documentLocation		"documentLocation"
+#define NID_documentLocation		449
+#define OBJ_documentLocation		OBJ_pilotAttributeType,15L
+
+#define LN_homeTelephoneNumber		"homeTelephoneNumber"
+#define NID_homeTelephoneNumber		450
+#define OBJ_homeTelephoneNumber		OBJ_pilotAttributeType,20L
+
+#define SN_secretary		"secretary"
+#define NID_secretary		451
+#define OBJ_secretary		OBJ_pilotAttributeType,21L
+
+#define LN_otherMailbox		"otherMailbox"
+#define NID_otherMailbox		452
+#define OBJ_otherMailbox		OBJ_pilotAttributeType,22L
+
+#define LN_lastModifiedTime		"lastModifiedTime"
+#define NID_lastModifiedTime		453
+#define OBJ_lastModifiedTime		OBJ_pilotAttributeType,23L
+
+#define LN_lastModifiedBy		"lastModifiedBy"
+#define NID_lastModifiedBy		454
+#define OBJ_lastModifiedBy		OBJ_pilotAttributeType,24L
+
+#define SN_domainComponent		"DC"
+#define LN_domainComponent		"domainComponent"
+#define NID_domainComponent		391
+#define OBJ_domainComponent		OBJ_pilotAttributeType,25L
+
+#define LN_aRecord		"aRecord"
+#define NID_aRecord		455
+#define OBJ_aRecord		OBJ_pilotAttributeType,26L
+
+#define LN_pilotAttributeType27		"pilotAttributeType27"
+#define NID_pilotAttributeType27		456
+#define OBJ_pilotAttributeType27		OBJ_pilotAttributeType,27L
+
+#define LN_mXRecord		"mXRecord"
+#define NID_mXRecord		457
+#define OBJ_mXRecord		OBJ_pilotAttributeType,28L
+
+#define LN_nSRecord		"nSRecord"
+#define NID_nSRecord		458
+#define OBJ_nSRecord		OBJ_pilotAttributeType,29L
+
+#define LN_sOARecord		"sOARecord"
+#define NID_sOARecord		459
+#define OBJ_sOARecord		OBJ_pilotAttributeType,30L
+
+#define LN_cNAMERecord		"cNAMERecord"
+#define NID_cNAMERecord		460
+#define OBJ_cNAMERecord		OBJ_pilotAttributeType,31L
+
+#define LN_associatedDomain		"associatedDomain"
+#define NID_associatedDomain		461
+#define OBJ_associatedDomain		OBJ_pilotAttributeType,37L
+
+#define LN_associatedName		"associatedName"
+#define NID_associatedName		462
+#define OBJ_associatedName		OBJ_pilotAttributeType,38L
 
-#define SN_rijndael_ecb_k192_b128		"RIJNDAEL-ECB-K192-B128"
-#define LN_rijndael_ecb_k192_b128		"rijndael-ecb-k192-b128"
-#define NID_rijndael_ecb_k192_b128		397
+#define LN_homePostalAddress		"homePostalAddress"
+#define NID_homePostalAddress		463
+#define OBJ_homePostalAddress		OBJ_pilotAttributeType,39L
 
-#define SN_rijndael_ecb_k256_b128		"RIJNDAEL-ECB-K256-B128"
-#define LN_rijndael_ecb_k256_b128		"rijndael-ecb-k256-b128"
-#define NID_rijndael_ecb_k256_b128		398
+#define LN_personalTitle		"personalTitle"
+#define NID_personalTitle		464
+#define OBJ_personalTitle		OBJ_pilotAttributeType,40L
 
-#define SN_rijndael_ecb_k128_b192		"RIJNDAEL-ECB-K128-B192"
-#define LN_rijndael_ecb_k128_b192		"rijndael-ecb-k128-b192"
-#define NID_rijndael_ecb_k128_b192		399
+#define LN_mobileTelephoneNumber		"mobileTelephoneNumber"
+#define NID_mobileTelephoneNumber		465
+#define OBJ_mobileTelephoneNumber		OBJ_pilotAttributeType,41L
 
-#define SN_rijndael_ecb_k192_b192		"RIJNDAEL-ECB-K192-B192"
-#define LN_rijndael_ecb_k192_b192		"rijndael-ecb-k192-b192"
-#define NID_rijndael_ecb_k192_b192		400
+#define LN_pagerTelephoneNumber		"pagerTelephoneNumber"
+#define NID_pagerTelephoneNumber		466
+#define OBJ_pagerTelephoneNumber		OBJ_pilotAttributeType,42L
 
-#define SN_rijndael_ecb_k256_b192		"RIJNDAEL-ECB-K256-B192"
-#define LN_rijndael_ecb_k256_b192		"rijndael-ecb-k256-b192"
-#define NID_rijndael_ecb_k256_b192		401
+#define LN_friendlyCountryName		"friendlyCountryName"
+#define NID_friendlyCountryName		467
+#define OBJ_friendlyCountryName		OBJ_pilotAttributeType,43L
 
-#define SN_rijndael_ecb_k128_b256		"RIJNDAEL-ECB-K128-B256"
-#define LN_rijndael_ecb_k128_b256		"rijndael-ecb-k128-b256"
-#define NID_rijndael_ecb_k128_b256		402
+#define LN_organizationalStatus		"organizationalStatus"
+#define NID_organizationalStatus		468
+#define OBJ_organizationalStatus		OBJ_pilotAttributeType,45L
 
-#define SN_rijndael_ecb_k192_b256		"RIJNDAEL-ECB-K192-B256"
-#define LN_rijndael_ecb_k192_b256		"rijndael-ecb-k192-b256"
-#define NID_rijndael_ecb_k192_b256		403
+#define LN_janetMailbox		"janetMailbox"
+#define NID_janetMailbox		469
+#define OBJ_janetMailbox		OBJ_pilotAttributeType,46L
 
-#define SN_rijndael_ecb_k256_b256		"RIJNDAEL-ECB-K256-B256"
-#define LN_rijndael_ecb_k256_b256		"rijndael-ecb-k256-b256"
-#define NID_rijndael_ecb_k256_b256		404
+#define LN_mailPreferenceOption		"mailPreferenceOption"
+#define NID_mailPreferenceOption		470
+#define OBJ_mailPreferenceOption		OBJ_pilotAttributeType,47L
 
-#define SN_rd128_cbc_b128		"RD128-CBC-B128"
-#define LN_rd128_cbc_b128		"rd128-cbc-b128"
-#define NID_rd128_cbc_b128		408
+#define LN_buildingName		"buildingName"
+#define NID_buildingName		471
+#define OBJ_buildingName		OBJ_pilotAttributeType,48L
 
-#define SN_rd192_cbc_b128		"RD192-CBC-B128"
-#define LN_rd192_cbc_b128		"rd192-cbc-b128"
-#define NID_rd192_cbc_b128		409
+#define LN_dSAQuality		"dSAQuality"
+#define NID_dSAQuality		472
+#define OBJ_dSAQuality		OBJ_pilotAttributeType,49L
 
-#define SN_rd256_cbc_b128		"RD256-CBC-B128"
-#define LN_rd256_cbc_b128		"rd256-cbc-b128"
-#define NID_rd256_cbc_b128		410
+#define LN_singleLevelQuality		"singleLevelQuality"
+#define NID_singleLevelQuality		473
+#define OBJ_singleLevelQuality		OBJ_pilotAttributeType,50L
 
-#define SN_rd128_cbc_b192		"RD128-CBC-B192"
-#define LN_rd128_cbc_b192		"rd128-cbc-b192"
-#define NID_rd128_cbc_b192		411
+#define LN_subtreeMinimumQuality		"subtreeMinimumQuality"
+#define NID_subtreeMinimumQuality		474
+#define OBJ_subtreeMinimumQuality		OBJ_pilotAttributeType,51L
 
-#define SN_rd192_cbc_b192		"RD192-CBC-B192"
-#define LN_rd192_cbc_b192		"rd192-cbc-b192"
-#define NID_rd192_cbc_b192		412
+#define LN_subtreeMaximumQuality		"subtreeMaximumQuality"
+#define NID_subtreeMaximumQuality		475
+#define OBJ_subtreeMaximumQuality		OBJ_pilotAttributeType,52L
 
-#define SN_rd256_cbc_b192		"RD256-CBC-B192"
-#define LN_rd256_cbc_b192		"rd256-cbc-b192"
-#define NID_rd256_cbc_b192		413
+#define LN_personalSignature		"personalSignature"
+#define NID_personalSignature		476
+#define OBJ_personalSignature		OBJ_pilotAttributeType,53L
 
-#define SN_rd128_cbc_b256		"RD128-CBC-B256"
-#define LN_rd128_cbc_b256		"rd128-cbc-b256"
-#define NID_rd128_cbc_b256		414
+#define LN_dITRedirect		"dITRedirect"
+#define NID_dITRedirect		477
+#define OBJ_dITRedirect		OBJ_pilotAttributeType,54L
 
-#define SN_rd192_cbc_b256		"RD192-CBC-B256"
-#define LN_rd192_cbc_b256		"rd192-cbc-b256"
-#define NID_rd192_cbc_b256		415
+#define SN_audio		"audio"
+#define NID_audio		478
+#define OBJ_audio		OBJ_pilotAttributeType,55L
 
-#define SN_rd256_cbc_b256		"RD256-CBC-B256"
-#define LN_rd256_cbc_b256		"rd256-cbc-b256"
-#define NID_rd256_cbc_b256		416
+#define LN_documentPublisher		"documentPublisher"
+#define NID_documentPublisher		479
+#define OBJ_documentPublisher		OBJ_pilotAttributeType,56L