X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fobjects%2Fobj_mac.h;h=308528f9cc76943247b90dcdbbfaafd4540fb5d7;hp=1da4949bc971d566c4803c195cc1cfd5e766d34c;hb=f1a6a0d4ddbeb9470d2b03e447466997729c2aac;hpb=27d7260075ba525c69e5b8e8ccb1b98010b56dd3

diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h
index 1da4949bc9..308528f9cc 100644
--- a/crypto/objects/obj_mac.h
+++ b/crypto/objects/obj_mac.h
@@ -1290,13 +1290,13 @@
 #define NID_ad_ca_issuers		179
 #define OBJ_ad_ca_issuers		OBJ_id_ad,2L
 
-#define SN_ad_timeStamping		"timestamping"
-#define LN_ad_timeStamping		"Time Stamping"
+#define SN_ad_timeStamping		"ad_timestamping"
+#define LN_ad_timeStamping		"AD Time Stamping"
 #define NID_ad_timeStamping		363
 #define OBJ_ad_timeStamping		OBJ_id_ad,3L
 
-#define SN_ad_dvcs		"DVCS"
-#define LN_ad_dvcs		"dvcs"
+#define SN_ad_dvcs		"AD_DVCS"
+#define LN_ad_dvcs		"ad dvcs"
 #define NID_ad_dvcs		364
 #define OBJ_ad_dvcs		OBJ_id_ad,4L
 
@@ -1323,6 +1323,7 @@
 #define OBJ_id_pkix_OCSP_acceptableResponses		OBJ_id_pkix_OCSP,4L
 
 #define SN_id_pkix_OCSP_noCheck		"noCheck"
+#define LN_id_pkix_OCSP_noCheck		"OCSP No Check"
 #define NID_id_pkix_OCSP_noCheck		369
 #define OBJ_id_pkix_OCSP_noCheck		OBJ_id_pkix_OCSP,5L
 
@@ -1714,6 +1715,78 @@
 #define NID_ns_sgc		139
 #define OBJ_ns_sgc		OBJ_netscape,4L,1L
 
+#define SN_org		"ORG"
+#define LN_org		"org"
+#define NID_org		379
+#define OBJ_org		OBJ_iso,3L
+
+#define SN_dod		"DOD"
+#define LN_dod		"dod"
+#define NID_dod		380
+#define OBJ_dod		OBJ_org,6L
+
+#define SN_iana		"IANA"
+#define LN_iana		"iana"
+#define NID_iana		381
+#define OBJ_iana		OBJ_dod,1L
+
+#define OBJ_internet		OBJ_iana
+
+#define SN_Directory		"directory"
+#define LN_Directory		"Directory"
+#define NID_Directory		382
+#define OBJ_Directory		OBJ_internet,1L
+
+#define SN_Management		"mgmt"
+#define LN_Management		"Management"
+#define NID_Management		383
+#define OBJ_Management		OBJ_internet,2L
+
+#define SN_Experimental		"experimental"
+#define LN_Experimental		"Experimental"
+#define NID_Experimental		384
+#define OBJ_Experimental		OBJ_internet,3L
+
+#define SN_Private		"private"
+#define LN_Private		"Private"
+#define NID_Private		385
+#define OBJ_Private		OBJ_internet,4L
+
+#define SN_Security		"security"
+#define LN_Security		"Security"
+#define NID_Security		386
+#define OBJ_Security		OBJ_internet,5L
+
+#define SN_SNMPv2		"snmpv2"
+#define LN_SNMPv2		"SNMPv2"
+#define NID_SNMPv2		387
+#define OBJ_SNMPv2		OBJ_internet,6L
+
+#define SN_Mail		"mail"
+#define LN_Mail		"Mail"
+#define NID_Mail		388
+#define OBJ_Mail		OBJ_internet,7L
+
+#define SN_Enterprises		"enterprises"
+#define LN_Enterprises		"Enterprises"
+#define NID_Enterprises		389
+#define OBJ_Enterprises		OBJ_private,1L
+
+#define SN_dcObject		"dcobject"
+#define LN_dcObject		"dcObject"
+#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
@@ -1724,3 +1797,39 @@
 #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 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 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 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 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 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 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 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 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
+