Add couple of OIDs. Resync NIDs for consistency with 0.9.7.
[openssl.git] / crypto / objects / obj_mac.h
index 66bdf65..e53aadb 100644 (file)
@@ -69,7 +69,7 @@
 
 #define SN_itu_t               "ITU-T"
 #define LN_itu_t               "itu-t"
-#define NID_itu_t              721
+#define NID_itu_t              645
 #define OBJ_itu_t              0L
 
 #define NID_ccitt              404
@@ -82,7 +82,7 @@
 
 #define SN_joint_iso_itu_t             "JOINT-ISO-ITU-T"
 #define LN_joint_iso_itu_t             "joint-iso-itu-t"
-#define NID_joint_iso_itu_t            722
+#define NID_joint_iso_itu_t            646
 #define OBJ_joint_iso_itu_t            2L
 
 #define NID_joint_iso_ccitt            393
 #define OBJ_member_body                OBJ_iso,2L
 
 #define SN_identified_organization             "identified-organization"
-#define NID_identified_organization            527
+#define NID_identified_organization            662
 #define OBJ_identified_organization            OBJ_iso,3L
 
 #define SN_certicom_arc                "certicom-arc"
-#define NID_certicom_arc               528
+#define NID_certicom_arc               663
 #define OBJ_certicom_arc               OBJ_identified_organization,132L
 
 #define SN_international_organizations         "international-organizations"
 #define LN_international_organizations         "International Organizations"
-#define NID_international_organizations                723
+#define NID_international_organizations                647
 #define OBJ_international_organizations                OBJ_joint_iso_itu_t,23L
 
 #define SN_wap         "wap"
-#define NID_wap                562
+#define NID_wap                664
 #define OBJ_wap                OBJ_international_organizations,43L
 
 #define SN_wap_wsg             "wap-wsg"
-#define NID_wap_wsg            563
+#define NID_wap_wsg            665
 #define OBJ_wap_wsg            OBJ_wap,13L
 
 #define SN_selected_attribute_types            "selected-attribute-types"
 #define OBJ_X9_62_characteristic_two_field             OBJ_X9_62_id_fieldType,2L
 
 #define SN_X9_62_id_characteristic_two_basis           "id-characteristic-two-basis"
-#define NID_X9_62_id_characteristic_two_basis          503
+#define NID_X9_62_id_characteristic_two_basis          666
 #define OBJ_X9_62_id_characteristic_two_basis          OBJ_X9_62_characteristic_two_field,3L
 
 #define SN_X9_62_onBasis               "onBasis"
-#define NID_X9_62_onBasis              504
+#define NID_X9_62_onBasis              667
 #define OBJ_X9_62_onBasis              OBJ_X9_62_id_characteristic_two_basis,1L
 
 #define SN_X9_62_tpBasis               "tpBasis"
-#define NID_X9_62_tpBasis              505
+#define NID_X9_62_tpBasis              668
 #define OBJ_X9_62_tpBasis              OBJ_X9_62_id_characteristic_two_basis,2L
 
 #define SN_X9_62_ppBasis               "ppBasis"
-#define NID_X9_62_ppBasis              506
+#define NID_X9_62_ppBasis              669
 #define OBJ_X9_62_ppBasis              OBJ_X9_62_id_characteristic_two_basis,3L
 
 #define OBJ_X9_62_id_publicKeyType             OBJ_ansi_X9_62,2L
 #define OBJ_X9_62_c_TwoCurve           OBJ_X9_62_ellipticCurve,0L
 
 #define SN_X9_62_c2pnb163v1            "c2pnb163v1"
-#define NID_X9_62_c2pnb163v1           507
+#define NID_X9_62_c2pnb163v1           670
 #define OBJ_X9_62_c2pnb163v1           OBJ_X9_62_c_TwoCurve,1L
 
 #define SN_X9_62_c2pnb163v2            "c2pnb163v2"
-#define NID_X9_62_c2pnb163v2           508
+#define NID_X9_62_c2pnb163v2           671
 #define OBJ_X9_62_c2pnb163v2           OBJ_X9_62_c_TwoCurve,2L
 
 #define SN_X9_62_c2pnb163v3            "c2pnb163v3"
-#define NID_X9_62_c2pnb163v3           509
+#define NID_X9_62_c2pnb163v3           672
 #define OBJ_X9_62_c2pnb163v3           OBJ_X9_62_c_TwoCurve,3L
 
 #define SN_X9_62_c2pnb176v1            "c2pnb176v1"
-#define NID_X9_62_c2pnb176v1           510
+#define NID_X9_62_c2pnb176v1           673
 #define OBJ_X9_62_c2pnb176v1           OBJ_X9_62_c_TwoCurve,4L
 
 #define SN_X9_62_c2tnb191v1            "c2tnb191v1"
-#define NID_X9_62_c2tnb191v1           511
+#define NID_X9_62_c2tnb191v1           674
 #define OBJ_X9_62_c2tnb191v1           OBJ_X9_62_c_TwoCurve,5L
 
 #define SN_X9_62_c2tnb191v2            "c2tnb191v2"
-#define NID_X9_62_c2tnb191v2           512
+#define NID_X9_62_c2tnb191v2           675
 #define OBJ_X9_62_c2tnb191v2           OBJ_X9_62_c_TwoCurve,6L
 
 #define SN_X9_62_c2tnb191v3            "c2tnb191v3"
-#define NID_X9_62_c2tnb191v3           513
+#define NID_X9_62_c2tnb191v3           676
 #define OBJ_X9_62_c2tnb191v3           OBJ_X9_62_c_TwoCurve,7L
 
 #define SN_X9_62_c2onb191v4            "c2onb191v4"
-#define NID_X9_62_c2onb191v4           514
+#define NID_X9_62_c2onb191v4           677
 #define OBJ_X9_62_c2onb191v4           OBJ_X9_62_c_TwoCurve,8L
 
 #define SN_X9_62_c2onb191v5            "c2onb191v5"
-#define NID_X9_62_c2onb191v5           515
+#define NID_X9_62_c2onb191v5           678
 #define OBJ_X9_62_c2onb191v5           OBJ_X9_62_c_TwoCurve,9L
 
 #define SN_X9_62_c2pnb208w1            "c2pnb208w1"
-#define NID_X9_62_c2pnb208w1           516
+#define NID_X9_62_c2pnb208w1           679
 #define OBJ_X9_62_c2pnb208w1           OBJ_X9_62_c_TwoCurve,10L
 
 #define SN_X9_62_c2tnb239v1            "c2tnb239v1"
-#define NID_X9_62_c2tnb239v1           517
+#define NID_X9_62_c2tnb239v1           680
 #define OBJ_X9_62_c2tnb239v1           OBJ_X9_62_c_TwoCurve,11L
 
 #define SN_X9_62_c2tnb239v2            "c2tnb239v2"
-#define NID_X9_62_c2tnb239v2           518
+#define NID_X9_62_c2tnb239v2           681
 #define OBJ_X9_62_c2tnb239v2           OBJ_X9_62_c_TwoCurve,12L
 
 #define SN_X9_62_c2tnb239v3            "c2tnb239v3"
-#define NID_X9_62_c2tnb239v3           519
+#define NID_X9_62_c2tnb239v3           682
 #define OBJ_X9_62_c2tnb239v3           OBJ_X9_62_c_TwoCurve,13L
 
 #define SN_X9_62_c2onb239v4            "c2onb239v4"
-#define NID_X9_62_c2onb239v4           520
+#define NID_X9_62_c2onb239v4           683
 #define OBJ_X9_62_c2onb239v4           OBJ_X9_62_c_TwoCurve,14L
 
 #define SN_X9_62_c2onb239v5            "c2onb239v5"
-#define NID_X9_62_c2onb239v5           521
+#define NID_X9_62_c2onb239v5           684
 #define OBJ_X9_62_c2onb239v5           OBJ_X9_62_c_TwoCurve,15L
 
 #define SN_X9_62_c2pnb272w1            "c2pnb272w1"
-#define NID_X9_62_c2pnb272w1           522
+#define NID_X9_62_c2pnb272w1           685
 #define OBJ_X9_62_c2pnb272w1           OBJ_X9_62_c_TwoCurve,16L
 
 #define SN_X9_62_c2pnb304w1            "c2pnb304w1"
-#define NID_X9_62_c2pnb304w1           523
+#define NID_X9_62_c2pnb304w1           686
 #define OBJ_X9_62_c2pnb304w1           OBJ_X9_62_c_TwoCurve,17L
 
 #define SN_X9_62_c2tnb359v1            "c2tnb359v1"
-#define NID_X9_62_c2tnb359v1           524
+#define NID_X9_62_c2tnb359v1           687
 #define OBJ_X9_62_c2tnb359v1           OBJ_X9_62_c_TwoCurve,18L
 
 #define SN_X9_62_c2pnb368w1            "c2pnb368w1"
-#define NID_X9_62_c2pnb368w1           525
+#define NID_X9_62_c2pnb368w1           688
 #define OBJ_X9_62_c2pnb368w1           OBJ_X9_62_c_TwoCurve,19L
 
 #define SN_X9_62_c2tnb431r1            "c2tnb431r1"
-#define NID_X9_62_c2tnb431r1           526
+#define NID_X9_62_c2tnb431r1           689
 #define OBJ_X9_62_c2tnb431r1           OBJ_X9_62_c_TwoCurve,20L
 
 #define OBJ_X9_62_primeCurve           OBJ_X9_62_ellipticCurve,1L
 #define OBJ_secg_ellipticCurve         OBJ_certicom_arc,0L
 
 #define SN_secp112r1           "secp112r1"
-#define NID_secp112r1          529
+#define NID_secp112r1          690
 #define OBJ_secp112r1          OBJ_secg_ellipticCurve,6L
 
 #define SN_secp112r2           "secp112r2"
-#define NID_secp112r2          530
+#define NID_secp112r2          691
 #define OBJ_secp112r2          OBJ_secg_ellipticCurve,7L
 
 #define SN_secp128r1           "secp128r1"
-#define NID_secp128r1          531
+#define NID_secp128r1          692
 #define OBJ_secp128r1          OBJ_secg_ellipticCurve,28L
 
 #define SN_secp128r2           "secp128r2"
-#define NID_secp128r2          532
+#define NID_secp128r2          693
 #define OBJ_secp128r2          OBJ_secg_ellipticCurve,29L
 
 #define SN_secp160k1           "secp160k1"
-#define NID_secp160k1          533
+#define NID_secp160k1          694
 #define OBJ_secp160k1          OBJ_secg_ellipticCurve,9L
 
 #define SN_secp160r1           "secp160r1"
-#define NID_secp160r1          534
+#define NID_secp160r1          695
 #define OBJ_secp160r1          OBJ_secg_ellipticCurve,8L
 
 #define SN_secp160r2           "secp160r2"
-#define NID_secp160r2          535
+#define NID_secp160r2          696
 #define OBJ_secp160r2          OBJ_secg_ellipticCurve,30L
 
 #define SN_secp192k1           "secp192k1"
-#define NID_secp192k1          536
+#define NID_secp192k1          697
 #define OBJ_secp192k1          OBJ_secg_ellipticCurve,31L
 
 #define SN_secp224k1           "secp224k1"
-#define NID_secp224k1          538
+#define NID_secp224k1          698
 #define OBJ_secp224k1          OBJ_secg_ellipticCurve,32L
 
 #define SN_secp224r1           "secp224r1"
-#define NID_secp224r1          539
+#define NID_secp224r1          699
 #define OBJ_secp224r1          OBJ_secg_ellipticCurve,33L
 
 #define SN_secp256k1           "secp256k1"
-#define NID_secp256k1          540
+#define NID_secp256k1          700
 #define OBJ_secp256k1          OBJ_secg_ellipticCurve,10L
 
 #define SN_secp384r1           "secp384r1"
-#define NID_secp384r1          542
+#define NID_secp384r1          701
 #define OBJ_secp384r1          OBJ_secg_ellipticCurve,34L
 
 #define SN_secp521r1           "secp521r1"
-#define NID_secp521r1          543
+#define NID_secp521r1          702
 #define OBJ_secp521r1          OBJ_secg_ellipticCurve,35L
 
 #define SN_sect113r1           "sect113r1"
-#define NID_sect113r1          544
+#define NID_sect113r1          703
 #define OBJ_sect113r1          OBJ_secg_ellipticCurve,4L
 
 #define SN_sect113r2           "sect113r2"
-#define NID_sect113r2          545
+#define NID_sect113r2          704
 #define OBJ_sect113r2          OBJ_secg_ellipticCurve,5L
 
 #define SN_sect131r1           "sect131r1"
-#define NID_sect131r1          546
+#define NID_sect131r1          705
 #define OBJ_sect131r1          OBJ_secg_ellipticCurve,22L
 
 #define SN_sect131r2           "sect131r2"
-#define NID_sect131r2          547
+#define NID_sect131r2          706
 #define OBJ_sect131r2          OBJ_secg_ellipticCurve,23L
 
 #define SN_sect163k1           "sect163k1"
-#define NID_sect163k1          548
+#define NID_sect163k1          707
 #define OBJ_sect163k1          OBJ_secg_ellipticCurve,1L
 
 #define SN_sect163r1           "sect163r1"
-#define NID_sect163r1          549
+#define NID_sect163r1          708
 #define OBJ_sect163r1          OBJ_secg_ellipticCurve,2L
 
 #define SN_sect163r2           "sect163r2"
-#define NID_sect163r2          550
+#define NID_sect163r2          709
 #define OBJ_sect163r2          OBJ_secg_ellipticCurve,15L
 
 #define SN_sect193r1           "sect193r1"
-#define NID_sect193r1          551
+#define NID_sect193r1          710
 #define OBJ_sect193r1          OBJ_secg_ellipticCurve,24L
 
 #define SN_sect193r2           "sect193r2"
-#define NID_sect193r2          552
+#define NID_sect193r2          711
 #define OBJ_sect193r2          OBJ_secg_ellipticCurve,25L
 
 #define SN_sect233k1           "sect233k1"
-#define NID_sect233k1          553
+#define NID_sect233k1          712
 #define OBJ_sect233k1          OBJ_secg_ellipticCurve,26L
 
 #define SN_sect233r1           "sect233r1"
-#define NID_sect233r1          554
+#define NID_sect233r1          713
 #define OBJ_sect233r1          OBJ_secg_ellipticCurve,27L
 
 #define SN_sect239k1           "sect239k1"
-#define NID_sect239k1          555
+#define NID_sect239k1          714
 #define OBJ_sect239k1          OBJ_secg_ellipticCurve,3L
 
 #define SN_sect283k1           "sect283k1"
-#define NID_sect283k1          556
+#define NID_sect283k1          715
 #define OBJ_sect283k1          OBJ_secg_ellipticCurve,16L
 
 #define SN_sect283r1           "sect283r1"
-#define NID_sect283r1          557
+#define NID_sect283r1          716
 #define OBJ_sect283r1          OBJ_secg_ellipticCurve,17L
 
 #define SN_sect409k1           "sect409k1"
-#define NID_sect409k1          558
+#define NID_sect409k1          717
 #define OBJ_sect409k1          OBJ_secg_ellipticCurve,36L
 
 #define SN_sect409r1           "sect409r1"
-#define NID_sect409r1          559
+#define NID_sect409r1          718
 #define OBJ_sect409r1          OBJ_secg_ellipticCurve,37L
 
 #define SN_sect571k1           "sect571k1"
-#define NID_sect571k1          560
+#define NID_sect571k1          719
 #define OBJ_sect571k1          OBJ_secg_ellipticCurve,38L
 
 #define SN_sect571r1           "sect571r1"
-#define NID_sect571r1          561
+#define NID_sect571r1          720
 #define OBJ_sect571r1          OBJ_secg_ellipticCurve,39L
 
 #define OBJ_wap_wsg_idm_ecid           OBJ_wap_wsg,4L
 
 #define SN_wap_wsg_idm_ecid_wtls1              "wap-wsg-idm-ecid-wtls1"
-#define NID_wap_wsg_idm_ecid_wtls1             564
+#define NID_wap_wsg_idm_ecid_wtls1             721
 #define OBJ_wap_wsg_idm_ecid_wtls1             OBJ_wap_wsg_idm_ecid,1L
 
 #define SN_wap_wsg_idm_ecid_wtls3              "wap-wsg-idm-ecid-wtls3"
-#define NID_wap_wsg_idm_ecid_wtls3             709
+#define NID_wap_wsg_idm_ecid_wtls3             722
 #define OBJ_wap_wsg_idm_ecid_wtls3             OBJ_wap_wsg_idm_ecid,3L
 
 #define SN_wap_wsg_idm_ecid_wtls4              "wap-wsg-idm-ecid-wtls4"
-#define NID_wap_wsg_idm_ecid_wtls4             710
+#define NID_wap_wsg_idm_ecid_wtls4             723
 #define OBJ_wap_wsg_idm_ecid_wtls4             OBJ_wap_wsg_idm_ecid,4L
 
 #define SN_wap_wsg_idm_ecid_wtls5              "wap-wsg-idm-ecid-wtls5"
-#define NID_wap_wsg_idm_ecid_wtls5             711
+#define NID_wap_wsg_idm_ecid_wtls5             724
 #define OBJ_wap_wsg_idm_ecid_wtls5             OBJ_wap_wsg_idm_ecid,5L
 
 #define SN_wap_wsg_idm_ecid_wtls6              "wap-wsg-idm-ecid-wtls6"
-#define NID_wap_wsg_idm_ecid_wtls6             565
+#define NID_wap_wsg_idm_ecid_wtls6             725
 #define OBJ_wap_wsg_idm_ecid_wtls6             OBJ_wap_wsg_idm_ecid,6L
 
 #define SN_wap_wsg_idm_ecid_wtls7              "wap-wsg-idm-ecid-wtls7"
-#define NID_wap_wsg_idm_ecid_wtls7             712
+#define NID_wap_wsg_idm_ecid_wtls7             726
 #define OBJ_wap_wsg_idm_ecid_wtls7             OBJ_wap_wsg_idm_ecid,7L
 
 #define SN_wap_wsg_idm_ecid_wtls8              "wap-wsg-idm-ecid-wtls8"
-#define NID_wap_wsg_idm_ecid_wtls8             566
+#define NID_wap_wsg_idm_ecid_wtls8             727
 #define OBJ_wap_wsg_idm_ecid_wtls8             OBJ_wap_wsg_idm_ecid,8L
 
 #define SN_wap_wsg_idm_ecid_wtls9              "wap-wsg-idm-ecid-wtls9"
-#define NID_wap_wsg_idm_ecid_wtls9             567
+#define NID_wap_wsg_idm_ecid_wtls9             728
 #define OBJ_wap_wsg_idm_ecid_wtls9             OBJ_wap_wsg_idm_ecid,9L
 
 #define SN_wap_wsg_idm_ecid_wtls10             "wap-wsg-idm-ecid-wtls10"
-#define NID_wap_wsg_idm_ecid_wtls10            713
+#define NID_wap_wsg_idm_ecid_wtls10            729
 #define OBJ_wap_wsg_idm_ecid_wtls10            OBJ_wap_wsg_idm_ecid,10L
 
 #define SN_wap_wsg_idm_ecid_wtls11             "wap-wsg-idm-ecid-wtls11"
-#define NID_wap_wsg_idm_ecid_wtls11            714
+#define NID_wap_wsg_idm_ecid_wtls11            730
 #define OBJ_wap_wsg_idm_ecid_wtls11            OBJ_wap_wsg_idm_ecid,11L
 
 #define SN_wap_wsg_idm_ecid_wtls12             "wap-wsg-idm-ecid-wtls12"
-#define NID_wap_wsg_idm_ecid_wtls12            715
+#define NID_wap_wsg_idm_ecid_wtls12            731
 #define OBJ_wap_wsg_idm_ecid_wtls12            OBJ_wap_wsg_idm_ecid,12L
 
 #define SN_cast5_cbc           "CAST5-CBC"
 
 #define SN_sha256WithRSAEncryption             "RSA-SHA256"
 #define LN_sha256WithRSAEncryption             "sha256WithRSAEncryption"
-#define NID_sha256WithRSAEncryption            737
+#define NID_sha256WithRSAEncryption            732
 #define OBJ_sha256WithRSAEncryption            OBJ_pkcs1,11L
 
 #define SN_sha384WithRSAEncryption             "RSA-SHA384"
 #define LN_sha384WithRSAEncryption             "sha384WithRSAEncryption"
-#define NID_sha384WithRSAEncryption            738
+#define NID_sha384WithRSAEncryption            733
 #define OBJ_sha384WithRSAEncryption            OBJ_pkcs1,12L
 
 #define SN_sha512WithRSAEncryption             "RSA-SHA512"
 #define LN_sha512WithRSAEncryption             "sha512WithRSAEncryption"
-#define NID_sha512WithRSAEncryption            739
+#define NID_sha512WithRSAEncryption            734
 #define OBJ_sha512WithRSAEncryption            OBJ_pkcs1,13L
 
 #define SN_sha224WithRSAEncryption             "RSA-SHA224"
 #define LN_sha224WithRSAEncryption             "sha224WithRSAEncryption"
-#define NID_sha224WithRSAEncryption            740
+#define NID_sha224WithRSAEncryption            735
 #define OBJ_sha224WithRSAEncryption            OBJ_pkcs1,14L
 
 #define SN_pkcs3               "pkcs3"
 
 #define SN_ms_smartcard_login          "msSmartcardLogin"
 #define LN_ms_smartcard_login          "Microsoft Smartcardlogin"
-#define NID_ms_smartcard_login         716
+#define NID_ms_smartcard_login         648
 #define OBJ_ms_smartcard_login         1L,3L,6L,1L,4L,1L,311L,20L,2L,2L
 
 #define SN_ms_upn              "msUPN"
 #define LN_ms_upn              "Microsoft Universal Principal Name"
-#define NID_ms_upn             717
+#define NID_ms_upn             649
 #define OBJ_ms_upn             1L,3L,6L,1L,4L,1L,311L,20L,2L,3L
 
 #define SN_idea_cbc            "IDEA-CBC"
 #define NID_stateOrProvinceName                16
 #define OBJ_stateOrProvinceName                OBJ_X509,8L
 
+#define LN_streetAddress               "streetAddress"
+#define NID_streetAddress              660
+#define OBJ_streetAddress              OBJ_X509,9L
+
 #define SN_organizationName            "O"
 #define LN_organizationName            "organizationName"
 #define NID_organizationName           17
 #define NID_description                107
 #define OBJ_description                OBJ_X509,13L
 
+#define LN_postalCode          "postalCode"
+#define NID_postalCode         661
+#define OBJ_postalCode         OBJ_X509,17L
+
 #define SN_name                "name"
 #define LN_name                "name"
 #define NID_name               173
 #define OBJ_initials           OBJ_X509,43L
 
 #define LN_generationQualifier         "generationQualifier"
-#define NID_generationQualifier                574
+#define NID_generationQualifier                509
 #define OBJ_generationQualifier                OBJ_X509,44L
 
 #define LN_x500UniqueIdentifier                "x500UniqueIdentifier"
-#define NID_x500UniqueIdentifier               568
+#define NID_x500UniqueIdentifier               503
 #define OBJ_x500UniqueIdentifier               OBJ_X509,45L
 
 #define SN_dnQualifier         "dnQualifier"
 #define OBJ_dnQualifier                OBJ_X509,46L
 
 #define LN_pseudonym           "pseudonym"
-#define NID_pseudonym          575
+#define NID_pseudonym          510
 #define OBJ_pseudonym          OBJ_X509,65L
 
 #define SN_role                "role"
 
 #define SN_name_constraints            "nameConstraints"
 #define LN_name_constraints            "X509v3 Name Constraints"
-#define NID_name_constraints           720
+#define NID_name_constraints           736
 #define OBJ_name_constraints           OBJ_id_ce,30L
 
 #define SN_crl_distribution_points             "crlDistributionPoints"
 
 #define SN_any_policy          "anyPolicy"
 #define LN_any_policy          "X509v3 Any Policy"
-#define NID_any_policy         718
+#define NID_any_policy         737
 #define OBJ_any_policy         OBJ_certificate_policies,0L
 
 #define SN_policy_mappings             "policyMappings"
 #define LN_policy_mappings             "X509v3 Policy Mappings"
-#define NID_policy_mappings            719
+#define NID_policy_mappings            738
 #define OBJ_policy_mappings            OBJ_id_ce,33L
 
 #define SN_authority_key_identifier            "authorityKeyIdentifier"
 
 #define SN_inhibit_any_policy          "inhibitAnyPolicy"
 #define LN_inhibit_any_policy          "X509v3 Inhibit Any Policy"
-#define NID_inhibit_any_policy         736
+#define NID_inhibit_any_policy         739
 #define OBJ_inhibit_any_policy         OBJ_id_ce,54L
 
 #define SN_target_information          "targetInformation"
 
 #define SN_mime_mhs            "mime-mhs"
 #define LN_mime_mhs            "MIME MHS"
-#define NID_mime_mhs           569
+#define NID_mime_mhs           504
 #define OBJ_mime_mhs           OBJ_Mail,1L
 
 #define SN_mime_mhs_headings           "mime-mhs-headings"
 #define LN_mime_mhs_headings           "mime-mhs-headings"
-#define NID_mime_mhs_headings          570
+#define NID_mime_mhs_headings          505
 #define OBJ_mime_mhs_headings          OBJ_mime_mhs,1L
 
 #define SN_mime_mhs_bodies             "mime-mhs-bodies"
 #define LN_mime_mhs_bodies             "mime-mhs-bodies"
-#define NID_mime_mhs_bodies            571
+#define NID_mime_mhs_bodies            506
 #define OBJ_mime_mhs_bodies            OBJ_mime_mhs,2L
 
 #define SN_id_hex_partial_message              "id-hex-partial-message"
 #define LN_id_hex_partial_message              "id-hex-partial-message"
-#define NID_id_hex_partial_message             572
+#define NID_id_hex_partial_message             507
 #define OBJ_id_hex_partial_message             OBJ_mime_mhs_headings,1L
 
 #define SN_id_hex_multipart_message            "id-hex-multipart-message"
 #define LN_id_hex_multipart_message            "id-hex-multipart-message"
-#define NID_id_hex_multipart_message           573
+#define NID_id_hex_multipart_message           508
 #define OBJ_id_hex_multipart_message           OBJ_mime_mhs_headings,2L
 
 #define SN_rle_compression             "RLE"
 
 #define SN_aes_128_cfb1                "AES-128-CFB1"
 #define LN_aes_128_cfb1                "aes-128-cfb1"
-#define NID_aes_128_cfb1               726
+#define NID_aes_128_cfb1               650
 
 #define SN_aes_192_cfb1                "AES-192-CFB1"
 #define LN_aes_192_cfb1                "aes-192-cfb1"
-#define NID_aes_192_cfb1               727
+#define NID_aes_192_cfb1               651
 
 #define SN_aes_256_cfb1                "AES-256-CFB1"
 #define LN_aes_256_cfb1                "aes-256-cfb1"
-#define NID_aes_256_cfb1               728
+#define NID_aes_256_cfb1               652
 
 #define SN_aes_128_cfb8                "AES-128-CFB8"
 #define LN_aes_128_cfb8                "aes-128-cfb8"
-#define NID_aes_128_cfb8               729
+#define NID_aes_128_cfb8               653
 
 #define SN_aes_192_cfb8                "AES-192-CFB8"
 #define LN_aes_192_cfb8                "aes-192-cfb8"
-#define NID_aes_192_cfb8               730
+#define NID_aes_192_cfb8               654
 
 #define SN_aes_256_cfb8                "AES-256-CFB8"
 #define LN_aes_256_cfb8                "aes-256-cfb8"
-#define NID_aes_256_cfb8               731
+#define NID_aes_256_cfb8               655
 
 #define SN_des_cfb1            "DES-CFB1"
 #define LN_des_cfb1            "des-cfb1"
-#define NID_des_cfb1           732
+#define NID_des_cfb1           656
 
 #define SN_des_cfb8            "DES-CFB8"
 #define LN_des_cfb8            "des-cfb8"
-#define NID_des_cfb8           733
+#define NID_des_cfb8           657
 
 #define SN_des_ede3_cfb1               "DES-EDE3-CFB1"
 #define LN_des_ede3_cfb1               "des-ede3-cfb1"
-#define NID_des_ede3_cfb1              734
+#define NID_des_ede3_cfb1              658
 
 #define SN_des_ede3_cfb8               "DES-EDE3-CFB8"
 #define LN_des_ede3_cfb8               "des-ede3-cfb8"
-#define NID_des_ede3_cfb8              735
+#define NID_des_ede3_cfb8              659
 
 #define OBJ_nist_hashalgs              OBJ_nistAlgorithms,2L
 
 #define SN_sha256              "SHA256"
 #define LN_sha256              "sha256"
-#define NID_sha256             741
+#define NID_sha256             740
 #define OBJ_sha256             OBJ_nist_hashalgs,1L
 
 #define SN_sha384              "SHA384"
 #define LN_sha384              "sha384"
-#define NID_sha384             742
+#define NID_sha384             741
 #define OBJ_sha384             OBJ_nist_hashalgs,2L
 
 #define SN_sha512              "SHA512"
 #define LN_sha512              "sha512"
-#define NID_sha512             743
+#define NID_sha512             742
 #define OBJ_sha512             OBJ_nist_hashalgs,3L
 
 #define SN_sha224              "SHA224"
 #define LN_sha224              "sha224"
-#define NID_sha224             744
+#define NID_sha224             743
 #define OBJ_sha224             OBJ_nist_hashalgs,4L
 
 #define SN_hold_instruction_code               "holdInstructionCode"
 
 #define SN_id_set              "id-set"
 #define LN_id_set              "Secure Electronic Transactions"
-#define NID_id_set             576
+#define NID_id_set             512
 #define OBJ_id_set             OBJ_international_organizations,42L
 
 #define SN_set_ctype           "set-ctype"
 #define LN_set_ctype           "content types"
-#define NID_set_ctype          577
+#define NID_set_ctype          513
 #define OBJ_set_ctype          OBJ_id_set,0L
 
 #define SN_set_msgExt          "set-msgExt"
 #define LN_set_msgExt          "message extensions"
-#define NID_set_msgExt         578
+#define NID_set_msgExt         514
 #define OBJ_set_msgExt         OBJ_id_set,1L
 
 #define SN_set_attr            "set-attr"
-#define NID_set_attr           579
+#define NID_set_attr           515
 #define OBJ_set_attr           OBJ_id_set,3L
 
 #define SN_set_policy          "set-policy"
-#define NID_set_policy         580
+#define NID_set_policy         516
 #define OBJ_set_policy         OBJ_id_set,5L
 
 #define SN_set_certExt         "set-certExt"
 #define LN_set_certExt         "certificate extensions"
-#define NID_set_certExt                581
+#define NID_set_certExt                517
 #define OBJ_set_certExt                OBJ_id_set,7L
 
 #define SN_set_brand           "set-brand"
-#define NID_set_brand          582
+#define NID_set_brand          518
 #define OBJ_set_brand          OBJ_id_set,8L
 
 #define SN_setct_PANData               "setct-PANData"
-#define NID_setct_PANData              583
+#define NID_setct_PANData              519
 #define OBJ_setct_PANData              OBJ_set_ctype,0L
 
 #define SN_setct_PANToken              "setct-PANToken"
-#define NID_setct_PANToken             584
+#define NID_setct_PANToken             520
 #define OBJ_setct_PANToken             OBJ_set_ctype,1L
 
 #define SN_setct_PANOnly               "setct-PANOnly"
-#define NID_setct_PANOnly              585
+#define NID_setct_PANOnly              521
 #define OBJ_setct_PANOnly              OBJ_set_ctype,2L
 
 #define SN_setct_OIData                "setct-OIData"
-#define NID_setct_OIData               586
+#define NID_setct_OIData               522
 #define OBJ_setct_OIData               OBJ_set_ctype,3L
 
 #define SN_setct_PI            "setct-PI"
-#define NID_setct_PI           587
+#define NID_setct_PI           523
 #define OBJ_setct_PI           OBJ_set_ctype,4L
 
 #define SN_setct_PIData                "setct-PIData"
-#define NID_setct_PIData               588
+#define NID_setct_PIData               524
 #define OBJ_setct_PIData               OBJ_set_ctype,5L
 
 #define SN_setct_PIDataUnsigned                "setct-PIDataUnsigned"
-#define NID_setct_PIDataUnsigned               589
+#define NID_setct_PIDataUnsigned               525
 #define OBJ_setct_PIDataUnsigned               OBJ_set_ctype,6L
 
 #define SN_setct_HODInput              "setct-HODInput"
-#define NID_setct_HODInput             590
+#define NID_setct_HODInput             526
 #define OBJ_setct_HODInput             OBJ_set_ctype,7L
 
 #define SN_setct_AuthResBaggage                "setct-AuthResBaggage"
-#define NID_setct_AuthResBaggage               591
+#define NID_setct_AuthResBaggage               527
 #define OBJ_setct_AuthResBaggage               OBJ_set_ctype,8L
 
 #define SN_setct_AuthRevReqBaggage             "setct-AuthRevReqBaggage"
-#define NID_setct_AuthRevReqBaggage            592
+#define NID_setct_AuthRevReqBaggage            528
 #define OBJ_setct_AuthRevReqBaggage            OBJ_set_ctype,9L
 
 #define SN_setct_AuthRevResBaggage             "setct-AuthRevResBaggage"
-#define NID_setct_AuthRevResBaggage            593
+#define NID_setct_AuthRevResBaggage            529
 #define OBJ_setct_AuthRevResBaggage            OBJ_set_ctype,10L
 
 #define SN_setct_CapTokenSeq           "setct-CapTokenSeq"
-#define NID_setct_CapTokenSeq          594
+#define NID_setct_CapTokenSeq          530
 #define OBJ_setct_CapTokenSeq          OBJ_set_ctype,11L
 
 #define SN_setct_PInitResData          "setct-PInitResData"
-#define NID_setct_PInitResData         595
+#define NID_setct_PInitResData         531
 #define OBJ_setct_PInitResData         OBJ_set_ctype,12L
 
 #define SN_setct_PI_TBS                "setct-PI-TBS"
-#define NID_setct_PI_TBS               596
+#define NID_setct_PI_TBS               532
 #define OBJ_setct_PI_TBS               OBJ_set_ctype,13L
 
 #define SN_setct_PResData              "setct-PResData"
-#define NID_setct_PResData             597
+#define NID_setct_PResData             533
 #define OBJ_setct_PResData             OBJ_set_ctype,14L
 
 #define SN_setct_AuthReqTBS            "setct-AuthReqTBS"
-#define NID_setct_AuthReqTBS           598
+#define NID_setct_AuthReqTBS           534
 #define OBJ_setct_AuthReqTBS           OBJ_set_ctype,16L
 
 #define SN_setct_AuthResTBS            "setct-AuthResTBS"
-#define NID_setct_AuthResTBS           599
+#define NID_setct_AuthResTBS           535
 #define OBJ_setct_AuthResTBS           OBJ_set_ctype,17L
 
 #define SN_setct_AuthResTBSX           "setct-AuthResTBSX"
-#define NID_setct_AuthResTBSX          600
+#define NID_setct_AuthResTBSX          536
 #define OBJ_setct_AuthResTBSX          OBJ_set_ctype,18L
 
 #define SN_setct_AuthTokenTBS          "setct-AuthTokenTBS"
-#define NID_setct_AuthTokenTBS         601
+#define NID_setct_AuthTokenTBS         537
 #define OBJ_setct_AuthTokenTBS         OBJ_set_ctype,19L
 
 #define SN_setct_CapTokenData          "setct-CapTokenData"
-#define NID_setct_CapTokenData         602
+#define NID_setct_CapTokenData         538
 #define OBJ_setct_CapTokenData         OBJ_set_ctype,20L
 
 #define SN_setct_CapTokenTBS           "setct-CapTokenTBS"
-#define NID_setct_CapTokenTBS          603
+#define NID_setct_CapTokenTBS          539
 #define OBJ_setct_CapTokenTBS          OBJ_set_ctype,21L
 
 #define SN_setct_AcqCardCodeMsg                "setct-AcqCardCodeMsg"
-#define NID_setct_AcqCardCodeMsg               604
+#define NID_setct_AcqCardCodeMsg               540
 #define OBJ_setct_AcqCardCodeMsg               OBJ_set_ctype,22L
 
 #define SN_setct_AuthRevReqTBS         "setct-AuthRevReqTBS"
-#define NID_setct_AuthRevReqTBS                605
+#define NID_setct_AuthRevReqTBS                541
 #define OBJ_setct_AuthRevReqTBS                OBJ_set_ctype,23L
 
 #define SN_setct_AuthRevResData                "setct-AuthRevResData"
-#define NID_setct_AuthRevResData               606
+#define NID_setct_AuthRevResData               542
 #define OBJ_setct_AuthRevResData               OBJ_set_ctype,24L
 
 #define SN_setct_AuthRevResTBS         "setct-AuthRevResTBS"
-#define NID_setct_AuthRevResTBS                607
+#define NID_setct_AuthRevResTBS                543
 #define OBJ_setct_AuthRevResTBS                OBJ_set_ctype,25L
 
 #define SN_setct_CapReqTBS             "setct-CapReqTBS"
-#define NID_setct_CapReqTBS            608
+#define NID_setct_CapReqTBS            544
 #define OBJ_setct_CapReqTBS            OBJ_set_ctype,26L
 
 #define SN_setct_CapReqTBSX            "setct-CapReqTBSX"
-#define NID_setct_CapReqTBSX           609
+#define NID_setct_CapReqTBSX           545
 #define OBJ_setct_CapReqTBSX           OBJ_set_ctype,27L
 
 #define SN_setct_CapResData            "setct-CapResData"
-#define NID_setct_CapResData           610
+#define NID_setct_CapResData           546
 #define OBJ_setct_CapResData           OBJ_set_ctype,28L
 
 #define SN_setct_CapRevReqTBS          "setct-CapRevReqTBS"
-#define NID_setct_CapRevReqTBS         611
+#define NID_setct_CapRevReqTBS         547
 #define OBJ_setct_CapRevReqTBS         OBJ_set_ctype,29L
 
 #define SN_setct_CapRevReqTBSX         "setct-CapRevReqTBSX"
-#define NID_setct_CapRevReqTBSX                612
+#define NID_setct_CapRevReqTBSX                548
 #define OBJ_setct_CapRevReqTBSX                OBJ_set_ctype,30L
 
 #define SN_setct_CapRevResData         "setct-CapRevResData"
-#define NID_setct_CapRevResData                613
+#define NID_setct_CapRevResData                549
 #define OBJ_setct_CapRevResData                OBJ_set_ctype,31L
 
 #define SN_setct_CredReqTBS            "setct-CredReqTBS"
-#define NID_setct_CredReqTBS           614
+#define NID_setct_CredReqTBS           550
 #define OBJ_setct_CredReqTBS           OBJ_set_ctype,32L
 
 #define SN_setct_CredReqTBSX           "setct-CredReqTBSX"
-#define NID_setct_CredReqTBSX          615
+#define NID_setct_CredReqTBSX          551
 #define OBJ_setct_CredReqTBSX          OBJ_set_ctype,33L
 
 #define SN_setct_CredResData           "setct-CredResData"
-#define NID_setct_CredResData          616
+#define NID_setct_CredResData          552
 #define OBJ_setct_CredResData          OBJ_set_ctype,34L
 
 #define SN_setct_CredRevReqTBS         "setct-CredRevReqTBS"
-#define NID_setct_CredRevReqTBS                617
+#define NID_setct_CredRevReqTBS                553
 #define OBJ_setct_CredRevReqTBS                OBJ_set_ctype,35L
 
 #define SN_setct_CredRevReqTBSX                "setct-CredRevReqTBSX"
-#define NID_setct_CredRevReqTBSX               618
+#define NID_setct_CredRevReqTBSX               554
 #define OBJ_setct_CredRevReqTBSX               OBJ_set_ctype,36L
 
 #define SN_setct_CredRevResData                "setct-CredRevResData"
-#define NID_setct_CredRevResData               619
+#define NID_setct_CredRevResData               555
 #define OBJ_setct_CredRevResData               OBJ_set_ctype,37L
 
 #define SN_setct_PCertReqData          "setct-PCertReqData"
-#define NID_setct_PCertReqData         620
+#define NID_setct_PCertReqData         556
 #define OBJ_setct_PCertReqData         OBJ_set_ctype,38L
 
 #define SN_setct_PCertResTBS           "setct-PCertResTBS"
-#define NID_setct_PCertResTBS          621
+#define NID_setct_PCertResTBS          557
 #define OBJ_setct_PCertResTBS          OBJ_set_ctype,39L
 
 #define SN_setct_BatchAdminReqData             "setct-BatchAdminReqData"
-#define NID_setct_BatchAdminReqData            622
+#define NID_setct_BatchAdminReqData            558
 #define OBJ_setct_BatchAdminReqData            OBJ_set_ctype,40L
 
 #define SN_setct_BatchAdminResData             "setct-BatchAdminResData"
-#define NID_setct_BatchAdminResData            623
+#define NID_setct_BatchAdminResData            559
 #define OBJ_setct_BatchAdminResData            OBJ_set_ctype,41L
 
 #define SN_setct_CardCInitResTBS               "setct-CardCInitResTBS"
-#define NID_setct_CardCInitResTBS              624
+#define NID_setct_CardCInitResTBS              560
 #define OBJ_setct_CardCInitResTBS              OBJ_set_ctype,42L
 
 #define SN_setct_MeAqCInitResTBS               "setct-MeAqCInitResTBS"
-#define NID_setct_MeAqCInitResTBS              625
+#define NID_setct_MeAqCInitResTBS              561
 #define OBJ_setct_MeAqCInitResTBS              OBJ_set_ctype,43L
 
 #define SN_setct_RegFormResTBS         "setct-RegFormResTBS"
-#define NID_setct_RegFormResTBS                626
+#define NID_setct_RegFormResTBS                562
 #define OBJ_setct_RegFormResTBS                OBJ_set_ctype,44L
 
 #define SN_setct_CertReqData           "setct-CertReqData"
-#define NID_setct_CertReqData          627
+#define NID_setct_CertReqData          563
 #define OBJ_setct_CertReqData          OBJ_set_ctype,45L
 
 #define SN_setct_CertReqTBS            "setct-CertReqTBS"
-#define NID_setct_CertReqTBS           628
+#define NID_setct_CertReqTBS           564
 #define OBJ_setct_CertReqTBS           OBJ_set_ctype,46L
 
 #define SN_setct_CertResData           "setct-CertResData"
-#define NID_setct_CertResData          629
+#define NID_setct_CertResData          565
 #define OBJ_setct_CertResData          OBJ_set_ctype,47L
 
 #define SN_setct_CertInqReqTBS         "setct-CertInqReqTBS"
-#define NID_setct_CertInqReqTBS                630
+#define NID_setct_CertInqReqTBS                566
 #define OBJ_setct_CertInqReqTBS                OBJ_set_ctype,48L
 
 #define SN_setct_ErrorTBS              "setct-ErrorTBS"
-#define NID_setct_ErrorTBS             631
+#define NID_setct_ErrorTBS             567
 #define OBJ_setct_ErrorTBS             OBJ_set_ctype,49L
 
 #define SN_setct_PIDualSignedTBE               "setct-PIDualSignedTBE"
-#define NID_setct_PIDualSignedTBE              632
+#define NID_setct_PIDualSignedTBE              568
 #define OBJ_setct_PIDualSignedTBE              OBJ_set_ctype,50L
 
 #define SN_setct_PIUnsignedTBE         "setct-PIUnsignedTBE"
-#define NID_setct_PIUnsignedTBE                633
+#define NID_setct_PIUnsignedTBE                569
 #define OBJ_setct_PIUnsignedTBE                OBJ_set_ctype,51L
 
 #define SN_setct_AuthReqTBE            "setct-AuthReqTBE"
-#define NID_setct_AuthReqTBE           634
+#define NID_setct_AuthReqTBE           570
 #define OBJ_setct_AuthReqTBE           OBJ_set_ctype,52L
 
 #define SN_setct_AuthResTBE            "setct-AuthResTBE"
-#define NID_setct_AuthResTBE           635
+#define NID_setct_AuthResTBE           571
 #define OBJ_setct_AuthResTBE           OBJ_set_ctype,53L
 
 #define SN_setct_AuthResTBEX           "setct-AuthResTBEX"
-#define NID_setct_AuthResTBEX          636
+#define NID_setct_AuthResTBEX          572
 #define OBJ_setct_AuthResTBEX          OBJ_set_ctype,54L
 
 #define SN_setct_AuthTokenTBE          "setct-AuthTokenTBE"
-#define NID_setct_AuthTokenTBE         637
+#define NID_setct_AuthTokenTBE         573
 #define OBJ_setct_AuthTokenTBE         OBJ_set_ctype,55L
 
 #define SN_setct_CapTokenTBE           "setct-CapTokenTBE"
-#define NID_setct_CapTokenTBE          638
+#define NID_setct_CapTokenTBE          574
 #define OBJ_setct_CapTokenTBE          OBJ_set_ctype,56L
 
 #define SN_setct_CapTokenTBEX          "setct-CapTokenTBEX"
-#define NID_setct_CapTokenTBEX         639
+#define NID_setct_CapTokenTBEX         575
 #define OBJ_setct_CapTokenTBEX         OBJ_set_ctype,57L
 
 #define SN_setct_AcqCardCodeMsgTBE             "setct-AcqCardCodeMsgTBE"
-#define NID_setct_AcqCardCodeMsgTBE            640
+#define NID_setct_AcqCardCodeMsgTBE            576
 #define OBJ_setct_AcqCardCodeMsgTBE            OBJ_set_ctype,58L
 
 #define SN_setct_AuthRevReqTBE         "setct-AuthRevReqTBE"
-#define NID_setct_AuthRevReqTBE                641
+#define NID_setct_AuthRevReqTBE                577
 #define OBJ_setct_AuthRevReqTBE                OBJ_set_ctype,59L
 
 #define SN_setct_AuthRevResTBE         "setct-AuthRevResTBE"
-#define NID_setct_AuthRevResTBE                642
+#define NID_setct_AuthRevResTBE                578
 #define OBJ_setct_AuthRevResTBE                OBJ_set_ctype,60L
 
 #define SN_setct_AuthRevResTBEB                "setct-AuthRevResTBEB"
-#define NID_setct_AuthRevResTBEB               643
+#define NID_setct_AuthRevResTBEB               579
 #define OBJ_setct_AuthRevResTBEB               OBJ_set_ctype,61L
 
 #define SN_setct_CapReqTBE             "setct-CapReqTBE"
-#define NID_setct_CapReqTBE            644
+#define NID_setct_CapReqTBE            580
 #define OBJ_setct_CapReqTBE            OBJ_set_ctype,62L
 
 #define SN_setct_CapReqTBEX            "setct-CapReqTBEX"
-#define NID_setct_CapReqTBEX           645
+#define NID_setct_CapReqTBEX           581
 #define OBJ_setct_CapReqTBEX           OBJ_set_ctype,63L
 
 #define SN_setct_CapResTBE             "setct-CapResTBE"
-#define NID_setct_CapResTBE            646
+#define NID_setct_CapResTBE            582
 #define OBJ_setct_CapResTBE            OBJ_set_ctype,64L
 
 #define SN_setct_CapRevReqTBE          "setct-CapRevReqTBE"
-#define NID_setct_CapRevReqTBE         647
+#define NID_setct_CapRevReqTBE         583
 #define OBJ_setct_CapRevReqTBE         OBJ_set_ctype,65L
 
 #define SN_setct_CapRevReqTBEX         "setct-CapRevReqTBEX"
-#define NID_setct_CapRevReqTBEX                648
+#define NID_setct_CapRevReqTBEX                584
 #define OBJ_setct_CapRevReqTBEX                OBJ_set_ctype,66L
 
 #define SN_setct_CapRevResTBE          "setct-CapRevResTBE"
-#define NID_setct_CapRevResTBE         649
+#define NID_setct_CapRevResTBE         585
 #define OBJ_setct_CapRevResTBE         OBJ_set_ctype,67L
 
 #define SN_setct_CredReqTBE            "setct-CredReqTBE"
-#define NID_setct_CredReqTBE           650
+#define NID_setct_CredReqTBE           586
 #define OBJ_setct_CredReqTBE           OBJ_set_ctype,68L
 
 #define SN_setct_CredReqTBEX           "setct-CredReqTBEX"
-#define NID_setct_CredReqTBEX          651
+#define NID_setct_CredReqTBEX          587
 #define OBJ_setct_CredReqTBEX          OBJ_set_ctype,69L
 
 #define SN_setct_CredResTBE            "setct-CredResTBE"
-#define NID_setct_CredResTBE           652
+#define NID_setct_CredResTBE           588
 #define OBJ_setct_CredResTBE           OBJ_set_ctype,70L
 
 #define SN_setct_CredRevReqTBE         "setct-CredRevReqTBE"
-#define NID_setct_CredRevReqTBE                653
+#define NID_setct_CredRevReqTBE                589
 #define OBJ_setct_CredRevReqTBE                OBJ_set_ctype,71L
 
 #define SN_setct_CredRevReqTBEX                "setct-CredRevReqTBEX"
-#define NID_setct_CredRevReqTBEX               654
+#define NID_setct_CredRevReqTBEX               590
 #define OBJ_setct_CredRevReqTBEX               OBJ_set_ctype,72L
 
 #define SN_setct_CredRevResTBE         "setct-CredRevResTBE"
-#define NID_setct_CredRevResTBE                655
+#define NID_setct_CredRevResTBE                591
 #define OBJ_setct_CredRevResTBE                OBJ_set_ctype,73L
 
 #define SN_setct_BatchAdminReqTBE              "setct-BatchAdminReqTBE"
-#define NID_setct_BatchAdminReqTBE             656
+#define NID_setct_BatchAdminReqTBE             592
 #define OBJ_setct_BatchAdminReqTBE             OBJ_set_ctype,74L
 
 #define SN_setct_BatchAdminResTBE              "setct-BatchAdminResTBE"
-#define NID_setct_BatchAdminResTBE             657
+#define NID_setct_BatchAdminResTBE             593
 #define OBJ_setct_BatchAdminResTBE             OBJ_set_ctype,75L
 
 #define SN_setct_RegFormReqTBE         "setct-RegFormReqTBE"
-#define NID_setct_RegFormReqTBE                658
+#define NID_setct_RegFormReqTBE                594
 #define OBJ_setct_RegFormReqTBE                OBJ_set_ctype,76L
 
 #define SN_setct_CertReqTBE            "setct-CertReqTBE"
-#define NID_setct_CertReqTBE           659
+#define NID_setct_CertReqTBE           595
 #define OBJ_setct_CertReqTBE           OBJ_set_ctype,77L
 
 #define SN_setct_CertReqTBEX           "setct-CertReqTBEX"
-#define NID_setct_CertReqTBEX          660
+#define NID_setct_CertReqTBEX          596
 #define OBJ_setct_CertReqTBEX          OBJ_set_ctype,78L
 
 #define SN_setct_CertResTBE            "setct-CertResTBE"
-#define NID_setct_CertResTBE           661
+#define NID_setct_CertResTBE           597
 #define OBJ_setct_CertResTBE           OBJ_set_ctype,79L
 
 #define SN_setct_CRLNotificationTBS            "setct-CRLNotificationTBS"
-#define NID_setct_CRLNotificationTBS           662
+#define NID_setct_CRLNotificationTBS           598
 #define OBJ_setct_CRLNotificationTBS           OBJ_set_ctype,80L
 
 #define SN_setct_CRLNotificationResTBS         "setct-CRLNotificationResTBS"
-#define NID_setct_CRLNotificationResTBS                663
+#define NID_setct_CRLNotificationResTBS                599
 #define OBJ_setct_CRLNotificationResTBS                OBJ_set_ctype,81L
 
 #define SN_setct_BCIDistributionTBS            "setct-BCIDistributionTBS"
-#define NID_setct_BCIDistributionTBS           664
+#define NID_setct_BCIDistributionTBS           600
 #define OBJ_setct_BCIDistributionTBS           OBJ_set_ctype,82L
 
 #define SN_setext_genCrypt             "setext-genCrypt"
 #define LN_setext_genCrypt             "generic cryptogram"
-#define NID_setext_genCrypt            665
+#define NID_setext_genCrypt            601
 #define OBJ_setext_genCrypt            OBJ_set_msgExt,1L
 
 #define SN_setext_miAuth               "setext-miAuth"
 #define LN_setext_miAuth               "merchant initiated auth"
-#define NID_setext_miAuth              666
+#define NID_setext_miAuth              602
 #define OBJ_setext_miAuth              OBJ_set_msgExt,3L
 
 #define SN_setext_pinSecure            "setext-pinSecure"
-#define NID_setext_pinSecure           667
+#define NID_setext_pinSecure           603
 #define OBJ_setext_pinSecure           OBJ_set_msgExt,4L
 
 #define SN_setext_pinAny               "setext-pinAny"
-#define NID_setext_pinAny              668
+#define NID_setext_pinAny              604
 #define OBJ_setext_pinAny              OBJ_set_msgExt,5L
 
 #define SN_setext_track2               "setext-track2"
-#define NID_setext_track2              669
+#define NID_setext_track2              605
 #define OBJ_setext_track2              OBJ_set_msgExt,7L
 
 #define SN_setext_cv           "setext-cv"
 #define LN_setext_cv           "additional verification"
-#define NID_setext_cv          670
+#define NID_setext_cv          606
 #define OBJ_setext_cv          OBJ_set_msgExt,8L
 
 #define SN_set_policy_root             "set-policy-root"
-#define NID_set_policy_root            671
+#define NID_set_policy_root            607
 #define OBJ_set_policy_root            OBJ_set_policy,0L
 
 #define SN_setCext_hashedRoot          "setCext-hashedRoot"
-#define NID_setCext_hashedRoot         672
+#define NID_setCext_hashedRoot         608
 #define OBJ_setCext_hashedRoot         OBJ_set_certExt,0L
 
 #define SN_setCext_certType            "setCext-certType"
-#define NID_setCext_certType           673
+#define NID_setCext_certType           609
 #define OBJ_setCext_certType           OBJ_set_certExt,1L
 
 #define SN_setCext_merchData           "setCext-merchData"
-#define NID_setCext_merchData          674
+#define NID_setCext_merchData          610
 #define OBJ_setCext_merchData          OBJ_set_certExt,2L
 
 #define SN_setCext_cCertRequired               "setCext-cCertRequired"
-#define NID_setCext_cCertRequired              675
+#define NID_setCext_cCertRequired              611
 #define OBJ_setCext_cCertRequired              OBJ_set_certExt,3L
 
 #define SN_setCext_tunneling           "setCext-tunneling"
-#define NID_setCext_tunneling          676
+#define NID_setCext_tunneling          612
 #define OBJ_setCext_tunneling          OBJ_set_certExt,4L
 
 #define SN_setCext_setExt              "setCext-setExt"
-#define NID_setCext_setExt             677
+#define NID_setCext_setExt             613
 #define OBJ_setCext_setExt             OBJ_set_certExt,5L
 
 #define SN_setCext_setQualf            "setCext-setQualf"
-#define NID_setCext_setQualf           678
+#define NID_setCext_setQualf           614
 #define OBJ_setCext_setQualf           OBJ_set_certExt,6L
 
 #define SN_setCext_PGWYcapabilities            "setCext-PGWYcapabilities"
-#define NID_setCext_PGWYcapabilities           679
+#define NID_setCext_PGWYcapabilities           615
 #define OBJ_setCext_PGWYcapabilities           OBJ_set_certExt,7L
 
 #define SN_setCext_TokenIdentifier             "setCext-TokenIdentifier"
-#define NID_setCext_TokenIdentifier            680
+#define NID_setCext_TokenIdentifier            616
 #define OBJ_setCext_TokenIdentifier            OBJ_set_certExt,8L
 
 #define SN_setCext_Track2Data          "setCext-Track2Data"
-#define NID_setCext_Track2Data         681
+#define NID_setCext_Track2Data         617
 #define OBJ_setCext_Track2Data         OBJ_set_certExt,9L
 
 #define SN_setCext_TokenType           "setCext-TokenType"
-#define NID_setCext_TokenType          682
+#define NID_setCext_TokenType          618
 #define OBJ_setCext_TokenType          OBJ_set_certExt,10L
 
 #define SN_setCext_IssuerCapabilities          "setCext-IssuerCapabilities"
-#define NID_setCext_IssuerCapabilities         683
+#define NID_setCext_IssuerCapabilities         619
 #define OBJ_setCext_IssuerCapabilities         OBJ_set_certExt,11L
 
 #define SN_setAttr_Cert                "setAttr-Cert"
-#define NID_setAttr_Cert               684
+#define NID_setAttr_Cert               620
 #define OBJ_setAttr_Cert               OBJ_set_attr,0L
 
 #define SN_setAttr_PGWYcap             "setAttr-PGWYcap"
 #define LN_setAttr_PGWYcap             "payment gateway capabilities"
-#define NID_setAttr_PGWYcap            685
+#define NID_setAttr_PGWYcap            621
 #define OBJ_setAttr_PGWYcap            OBJ_set_attr,1L
 
 #define SN_setAttr_TokenType           "setAttr-TokenType"
-#define NID_setAttr_TokenType          686
+#define NID_setAttr_TokenType          622
 #define OBJ_setAttr_TokenType          OBJ_set_attr,2L
 
 #define SN_setAttr_IssCap              "setAttr-IssCap"
 #define LN_setAttr_IssCap              "issuer capabilities"
-#define NID_setAttr_IssCap             687
+#define NID_setAttr_IssCap             623
 #define OBJ_setAttr_IssCap             OBJ_set_attr,3L
 
 #define SN_set_rootKeyThumb            "set-rootKeyThumb"
-#define NID_set_rootKeyThumb           688
+#define NID_set_rootKeyThumb           624
 #define OBJ_set_rootKeyThumb           OBJ_setAttr_Cert,0L
 
 #define SN_set_addPolicy               "set-addPolicy"
-#define NID_set_addPolicy              689
+#define NID_set_addPolicy              625
 #define OBJ_set_addPolicy              OBJ_setAttr_Cert,1L
 
 #define SN_setAttr_Token_EMV           "setAttr-Token-EMV"
-#define NID_setAttr_Token_EMV          690
+#define NID_setAttr_Token_EMV          626
 #define OBJ_setAttr_Token_EMV          OBJ_setAttr_TokenType,1L
 
 #define SN_setAttr_Token_B0Prime               "setAttr-Token-B0Prime"
-#define NID_setAttr_Token_B0Prime              691
+#define NID_setAttr_Token_B0Prime              627
 #define OBJ_setAttr_Token_B0Prime              OBJ_setAttr_TokenType,2L
 
 #define SN_setAttr_IssCap_CVM          "setAttr-IssCap-CVM"
-#define NID_setAttr_IssCap_CVM         692
+#define NID_setAttr_IssCap_CVM         628
 #define OBJ_setAttr_IssCap_CVM         OBJ_setAttr_IssCap,3L
 
 #define SN_setAttr_IssCap_T2           "setAttr-IssCap-T2"
-#define NID_setAttr_IssCap_T2          693
+#define NID_setAttr_IssCap_T2          629
 #define OBJ_setAttr_IssCap_T2          OBJ_setAttr_IssCap,4L
 
 #define SN_setAttr_IssCap_Sig          "setAttr-IssCap-Sig"
-#define NID_setAttr_IssCap_Sig         694
+#define NID_setAttr_IssCap_Sig         630
 #define OBJ_setAttr_IssCap_Sig         OBJ_setAttr_IssCap,5L
 
 #define SN_setAttr_GenCryptgrm         "setAttr-GenCryptgrm"
 #define LN_setAttr_GenCryptgrm         "generate cryptogram"
-#define NID_setAttr_GenCryptgrm                695
+#define NID_setAttr_GenCryptgrm                631
 #define OBJ_setAttr_GenCryptgrm                OBJ_setAttr_IssCap_CVM,1L
 
 #define SN_setAttr_T2Enc               "setAttr-T2Enc"
 #define LN_setAttr_T2Enc               "encrypted track 2"
-#define NID_setAttr_T2Enc              696
+#define NID_setAttr_T2Enc              632
 #define OBJ_setAttr_T2Enc              OBJ_setAttr_IssCap_T2,1L
 
 #define SN_setAttr_T2cleartxt          "setAttr-T2cleartxt"
 #define LN_setAttr_T2cleartxt          "cleartext track 2"
-#define NID_setAttr_T2cleartxt         697
+#define NID_setAttr_T2cleartxt         633
 #define OBJ_setAttr_T2cleartxt         OBJ_setAttr_IssCap_T2,2L
 
 #define SN_setAttr_TokICCsig           "setAttr-TokICCsig"
 #define LN_setAttr_TokICCsig           "ICC or token signature"
-#define NID_setAttr_TokICCsig          698
+#define NID_setAttr_TokICCsig          634
 #define OBJ_setAttr_TokICCsig          OBJ_setAttr_IssCap_Sig,1L
 
 #define SN_setAttr_SecDevSig           "setAttr-SecDevSig"
 #define LN_setAttr_SecDevSig           "secure device signature"
-#define NID_setAttr_SecDevSig          699
+#define NID_setAttr_SecDevSig          635
 #define OBJ_setAttr_SecDevSig          OBJ_setAttr_IssCap_Sig,2L
 
 #define SN_set_brand_IATA_ATA          "set-brand-IATA-ATA"
-#define NID_set_brand_IATA_ATA         700
+#define NID_set_brand_IATA_ATA         636
 #define OBJ_set_brand_IATA_ATA         OBJ_set_brand,1L
 
 #define SN_set_brand_Diners            "set-brand-Diners"
-#define NID_set_brand_Diners           701
+#define NID_set_brand_Diners           637
 #define OBJ_set_brand_Diners           OBJ_set_brand,30L
 
 #define SN_set_brand_AmericanExpress           "set-brand-AmericanExpress"
-#define NID_set_brand_AmericanExpress          702
+#define NID_set_brand_AmericanExpress          638
 #define OBJ_set_brand_AmericanExpress          OBJ_set_brand,34L
 
 #define SN_set_brand_JCB               "set-brand-JCB"
-#define NID_set_brand_JCB              703
+#define NID_set_brand_JCB              639
 #define OBJ_set_brand_JCB              OBJ_set_brand,35L
 
 #define SN_set_brand_Visa              "set-brand-Visa"
-#define NID_set_brand_Visa             704
+#define NID_set_brand_Visa             640
 #define OBJ_set_brand_Visa             OBJ_set_brand,4L
 
 #define SN_set_brand_MasterCard                "set-brand-MasterCard"
-#define NID_set_brand_MasterCard               705
+#define NID_set_brand_MasterCard               641
 #define OBJ_set_brand_MasterCard               OBJ_set_brand,5L
 
 #define SN_set_brand_Novus             "set-brand-Novus"
-#define NID_set_brand_Novus            706
+#define NID_set_brand_Novus            642
 #define OBJ_set_brand_Novus            OBJ_set_brand,6011L
 
 #define SN_des_cdmf            "DES-CDMF"
 #define LN_des_cdmf            "des-cdmf"
-#define NID_des_cdmf           707
+#define NID_des_cdmf           643
 #define OBJ_des_cdmf           OBJ_rsadsi,3L,10L
 
 #define SN_rsaOAEPEncryptionSET                "rsaOAEPEncryptionSET"
-#define NID_rsaOAEPEncryptionSET               708
+#define NID_rsaOAEPEncryptionSET               644
 #define OBJ_rsaOAEPEncryptionSET               OBJ_rsadsi,1L,1L,6L
 
 #define SN_ipsec3              "Oakley-EC2N-3"
 #define LN_ipsec3              "ipsec3"
-#define NID_ipsec3             724
+#define NID_ipsec3             744
 
 #define SN_ipsec4              "Oakley-EC2N-4"
 #define LN_ipsec4              "ipsec4"
-#define NID_ipsec4             725
+#define NID_ipsec4             745