add "Certificate Issuer", "Issuing Distribution Point" and (e5cce6d3) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

crypto/objects/obj_dat.h

+23 −5

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

		#define NUM_NID 769
		#define NUM_SN 765
		#define NUM_LN 765
		#define NUM_OBJ 721
		#define NUM_NID 772
		#define NUM_SN 768
		#define NUM_LN 768
		#define NUM_OBJ 724

		static unsigned char lvalues[5107]={
		static unsigned char lvalues[5116]={
		0x00, /* [ 0] OBJ_undef */
		0x2A,0x86,0x48,0x86,0xF7,0x0D, /* [ 1] OBJ_rsadsi */
		0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01, /* [ 7] OBJ_pkcs */
		@@ -789,6 +789,9 @@ static unsigned char lvalues[5107]={
		0x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x03, /* [5082] OBJ_camellia_128_ofb128 */
		0x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x17, /* [5090] OBJ_camellia_192_ofb128 */
		0x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x2B, /* [5098] OBJ_camellia_256_ofb128 */
		0x55,0x1D,0x09, /* [5106] OBJ_subject_directory_attributes */
		0x55,0x1D,0x1C, /* [5109] OBJ_issuing_distribution_point */
		0x55,0x1D,0x1D, /* [5112] OBJ_certificate_issuer */
		};

		static ASN1_OBJECT nid_objs[NUM_NID]={
		@@ -1987,6 +1990,12 @@ static ASN1_OBJECT nid_objs[NUM_NID]={
		&(lvalues[5090]),0},
		{"CAMELLIA-256-OFB","camellia-256-ofb",NID_camellia_256_ofb128,8,
		&(lvalues[5098]),0},
		{"subjectDirectoryAttributes","X509v3 Subject Directory Attributes",
		NID_subject_directory_attributes,3,&(lvalues[5106]),0},
		{"issuingDistributionPoint","X509v3 Issuing Distrubution Point",
		NID_issuing_distribution_point,3,&(lvalues[5109]),0},
		{"certificateIssuer","X509v3 Certificate Issuer",
		NID_certificate_issuer,3,&(lvalues[5112]),0},
		};

		static ASN1_OBJECT *sn_objs[NUM_SN]={
		@@ -2203,6 +2212,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
		&(nid_objs[443]),/* "caseIgnoreIA5StringSyntax" */
		&(nid_objs[152]),/* "certBag" */
		&(nid_objs[677]),/* "certicom-arc" */
		&(nid_objs[771]),/* "certificateIssuer" */
		&(nid_objs[89]),/* "certificatePolicies" */
		&(nid_objs[54]),/* "challengePassword" */
		&(nid_objs[407]),/* "characteristic-two-field" */
		@@ -2442,6 +2452,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
		&(nid_objs[295]),/* "ipsecTunnel" */
		&(nid_objs[296]),/* "ipsecUser" */
		&(nid_objs[86]),/* "issuerAltName" */
		&(nid_objs[770]),/* "issuingDistributionPoint" */
		&(nid_objs[492]),/* "janetMailbox" */
		&(nid_objs[150]),/* "keyBag" */
		&(nid_objs[83]),/* "keyUsage" */
		@@ -2723,6 +2734,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
		&(nid_objs[387]),/* "snmpv2" */
		&(nid_objs[660]),/* "streetAddress" */
		&(nid_objs[85]),/* "subjectAltName" */
		&(nid_objs[769]),/* "subjectDirectoryAttributes" */
		&(nid_objs[398]),/* "subjectInfoAccess" */
		&(nid_objs[82]),/* "subjectKeyIdentifier" */
		&(nid_objs[498]),/* "subtreeMaximumQuality" */
		@@ -2852,11 +2864,13 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
		&(nid_objs[103]),/* "X509v3 CRL Distribution Points" */
		&(nid_objs[88]),/* "X509v3 CRL Number" */
		&(nid_objs[141]),/* "X509v3 CRL Reason Code" */
		&(nid_objs[771]),/* "X509v3 Certificate Issuer" */
		&(nid_objs[89]),/* "X509v3 Certificate Policies" */
		&(nid_objs[140]),/* "X509v3 Delta CRL Indicator" */
		&(nid_objs[126]),/* "X509v3 Extended Key Usage" */
		&(nid_objs[748]),/* "X509v3 Inhibit Any Policy" */
		&(nid_objs[86]),/* "X509v3 Issuer Alternative Name" */
		&(nid_objs[770]),/* "X509v3 Issuing Distrubution Point" */
		&(nid_objs[83]),/* "X509v3 Key Usage" */
		&(nid_objs[666]),/* "X509v3 Name Constraints" */
		&(nid_objs[403]),/* "X509v3 No Revocation Available" */
		@@ -2864,6 +2878,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
		&(nid_objs[747]),/* "X509v3 Policy Mappings" */
		&(nid_objs[84]),/* "X509v3 Private Key Usage Period" */
		&(nid_objs[85]),/* "X509v3 Subject Alternative Name" */
		&(nid_objs[769]),/* "X509v3 Subject Directory Attributes" */
		&(nid_objs[82]),/* "X509v3 Subject Key Identifier" */
		&(nid_objs[184]),/* "X9.57" */
		&(nid_objs[185]),/* "X9.57 CM ?" */
		@@ -3569,6 +3584,7 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
		&(nid_objs[174]),/* OBJ_dnQualifier 2 5 4 46 */
		&(nid_objs[510]),/* OBJ_pseudonym 2 5 4 65 */
		&(nid_objs[400]),/* OBJ_role 2 5 4 72 */
		&(nid_objs[769]),/* OBJ_subject_directory_attributes 2 5 29 9 */
		&(nid_objs[82]),/* OBJ_subject_key_identifier 2 5 29 14 */
		&(nid_objs[83]),/* OBJ_key_usage 2 5 29 15 */
		&(nid_objs[84]),/* OBJ_private_key_usage_period 2 5 29 16 */
		@@ -3580,6 +3596,8 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
		&(nid_objs[430]),/* OBJ_hold_instruction_code 2 5 29 23 */
		&(nid_objs[142]),/* OBJ_invalidity_date 2 5 29 24 */
		&(nid_objs[140]),/* OBJ_delta_crl 2 5 29 27 */
		&(nid_objs[770]),/* OBJ_issuing_distribution_point 2 5 29 28 */
		&(nid_objs[771]),/* OBJ_certificate_issuer 2 5 29 29 */
		&(nid_objs[666]),/* OBJ_name_constraints 2 5 29 30 */
		&(nid_objs[103]),/* OBJ_crl_distribution_points 2 5 29 31 */
		&(nid_objs[89]),/* OBJ_certificate_policies 2 5 29 32 */

crypto/objects/obj_mac.h

+15 −0

Original line number	Diff line number	Diff line
		@@ -2044,6 +2044,11 @@
		#define NID_id_ce 81
		#define OBJ_id_ce OBJ_X500,29L

		#define SN_subject_directory_attributes "subjectDirectoryAttributes"
		#define LN_subject_directory_attributes "X509v3 Subject Directory Attributes"
		#define NID_subject_directory_attributes 769
		#define OBJ_subject_directory_attributes OBJ_id_ce,9L

		#define SN_subject_key_identifier "subjectKeyIdentifier"
		#define LN_subject_key_identifier "X509v3 Subject Key Identifier"
		#define NID_subject_key_identifier 82
		@@ -2094,6 +2099,16 @@
		#define NID_delta_crl 140
		#define OBJ_delta_crl OBJ_id_ce,27L

		#define SN_issuing_distribution_point "issuingDistributionPoint"
		#define LN_issuing_distribution_point "X509v3 Issuing Distrubution Point"
		#define NID_issuing_distribution_point 770
		#define OBJ_issuing_distribution_point OBJ_id_ce,28L

		#define SN_certificate_issuer "certificateIssuer"
		#define LN_certificate_issuer "X509v3 Certificate Issuer"
		#define NID_certificate_issuer 771
		#define OBJ_certificate_issuer OBJ_id_ce,29L

		#define SN_name_constraints "nameConstraints"
		#define LN_name_constraints "X509v3 Name Constraints"
		#define NID_name_constraints 666

crypto/objects/obj_mac.num

+3 −0

Original line number	Diff line number	Diff line
		@@ -766,3 +766,6 @@ camellia_256_cfb8 765
		camellia_128_ofb128 766
		camellia_192_ofb128 767
		camellia_256_ofb128 768
		subject_directory_attributes 769
		issuing_distribution_point 770
		certificate_issuer 771

crypto/objects/objects.txt

+6 −0

Original line number	Diff line number	Diff line
		@@ -657,6 +657,8 @@ X500algorithms 3 100 : RSA-MDC2 : mdc2WithRSA
		X500algorithms 3 101 : MDC2 : mdc2

		X500 29 : id-ce
		!Cname subject-directory-attributes
		id-ce 9 : subjectDirectoryAttributes : X509v3 Subject Directory Attributes
		!Cname subject-key-identifier
		id-ce 14 : subjectKeyIdentifier : X509v3 Subject Key Identifier
		!Cname key-usage
		@@ -677,6 +679,10 @@ id-ce 21 : CRLReason : X509v3 CRL Reason Code
		id-ce 24 : invalidityDate : Invalidity Date
		!Cname delta-crl
		id-ce 27 : deltaCRL : X509v3 Delta CRL Indicator
		!Cname issuing-distribution-point
		id-ce 28 : issuingDistributionPoint : X509v3 Issuing Distrubution Point
		!Cname certificate-issuer
		id-ce 29 : certificateIssuer : X509v3 Certificate Issuer
		!Cname name-constraints
		id-ce 30 : nameConstraints : X509v3 Name Constraints
		!Cname crl-distribution-points