Commit 4cea95a5 authored by Lutz Jänicke's avatar Lutz Jänicke
Browse files

Added generationQualifier OID (proposed by Fiel Cabral). 

Submitted by:
Reviewed by:
PR:
parent b23b3272

crypto/objects/obj_dat.h

+11 −5
Original line number Diff line number Diff line
@@ -62,12 +62,12 @@ 
 * [including the GNU Public Licence.]

 */



#define NUM_NID 509

#define NUM_SN 506

#define NUM_LN 506

#define NUM_OBJ 480

#define NUM_NID 510

#define NUM_SN 507

#define NUM_LN 507

#define NUM_OBJ 481



static unsigned char lvalues[3878]={

static unsigned char lvalues[3881]={

0x00,                                        /* [  0] OBJ_undef */

0x2A,0x86,0x48,0x86,0xF7,0x0D,               /* [  1] OBJ_rsadsi */

0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,          /* [  7] OBJ_pkcs */
@@ -548,6 +548,7 @@ static unsigned char lvalues[3878]={ 
0x2B,0x06,0x01,0x07,0x01,0x02,               /* [3857] OBJ_mime_mhs_bodies */

0x2B,0x06,0x01,0x07,0x01,0x01,0x01,          /* [3863] OBJ_id_hex_partial_message */

0x2B,0x06,0x01,0x07,0x01,0x01,0x02,          /* [3870] OBJ_id_hex_multipart_message */

0x55,0x04,0x2C,                              /* [3877] OBJ_generationQualifier */

};



static ASN1_OBJECT nid_objs[NUM_NID]={
@@ -1331,6 +1332,8 @@ static ASN1_OBJECT nid_objs[NUM_NID]={ 
	NID_id_hex_partial_message,7,&(lvalues[3863]),0},

{"id-hex-multipart-message","id-hex-multipart-message",

	NID_id_hex_multipart_message,7,&(lvalues[3870]),0},

{"generationQualifier","generationQualifier",NID_generationQualifier,

	3,&(lvalues[3877]),0},

};



static ASN1_OBJECT *sn_objs[NUM_SN]={
@@ -1527,6 +1530,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ 
&(nid_objs[453]),/* "friendlyCountry" */

&(nid_objs[490]),/* "friendlyCountryName" */

&(nid_objs[156]),/* "friendlyName" */

&(nid_objs[509]),/* "generationQualifier" */

&(nid_objs[99]),/* "gn" */

&(nid_objs[163]),/* "hmacWithSHA1" */

&(nid_objs[432]),/* "holdInstructionCallIssuer" */
@@ -2028,6 +2032,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ 
&(nid_objs[453]),/* "friendlyCountry" */

&(nid_objs[490]),/* "friendlyCountryName" */

&(nid_objs[156]),/* "friendlyName" */

&(nid_objs[509]),/* "generationQualifier" */

&(nid_objs[99]),/* "givenName" */

&(nid_objs[163]),/* "hmacWithSHA1" */

&(nid_objs[486]),/* "homePostalAddress" */
@@ -2381,6 +2386,7 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={ 
&(nid_objs[173]),/* OBJ_name                         2 5 4 41 */

&(nid_objs[99]),/* OBJ_givenName                    2 5 4 42 */

&(nid_objs[101]),/* OBJ_initials                     2 5 4 43 */

&(nid_objs[509]),/* OBJ_generationQualifier          2 5 4 44 */

&(nid_objs[503]),/* OBJ_x500UniqueIdentifier         2 5 4 45 */

&(nid_objs[174]),/* OBJ_dnQualifier                  2 5 4 46 */

&(nid_objs[400]),/* OBJ_role                         2 5 4 72 */

crypto/objects/obj_mac.h

+4 −0
Original line number Diff line number Diff line
@@ -1641,6 +1641,10 @@ 
#define NID_initials		101

#define OBJ_initials		OBJ_X509,43L



#define LN_generationQualifier		"generationQualifier"

#define NID_generationQualifier		509

#define OBJ_generationQualifier		OBJ_X509,44L



#define LN_x500UniqueIdentifier		"x500UniqueIdentifier"

#define NID_x500UniqueIdentifier		503

#define OBJ_x500UniqueIdentifier		OBJ_X509,45L

crypto/objects/obj_mac.num

+1 −0
Original line number Diff line number Diff line
@@ -506,3 +506,4 @@ mime_mhs_headings 505 
mime_mhs_bodies		506

id_hex_partial_message		507

id_hex_multipart_message		508

generationQualifier		509

crypto/objects/objects.txt

+1 −0
Original line number Diff line number Diff line
@@ -539,6 +539,7 @@ X509 13 : : description 
X509 41			: name			: name

X509 42			: gn			: givenName

X509 43			: 			: initials

X509 44			: 			: generationQualifier

X509 45			: 			: x500UniqueIdentifier

X509 46			: dnQualifier		: dnQualifier

X509 72			: role			: role