Commit c74ce24c authored by Rob Stradling's avatar Rob Stradling Committed by Dr. Stephen Henson
Browse files

Show the contents of the RFC6962 Signed Certificate Timestamp List Certificate/OCSP Extensions. 

Add the RFC6962 OIDs to the objects table.
(backport from master branch)
parent 612566e7

crypto/bio/b_dump.c

+22 −0
Original line number Diff line number Diff line
@@ -185,3 +185,25 @@ int BIO_dump_indent(BIO *bp, const char *s, int len, int indent) 
	return BIO_dump_indent_cb(write_bio, bp, s, len, indent);

	}



int BIO_hex_string(BIO *out, int indent, int width, unsigned char *data,

		   int datalen)

	{

	int i, j = 0;



	if (datalen < 1)

		return 1;



	for (i = 0; i < datalen - 1; i++)

		{

		if (i && !j) BIO_printf(out, "%*s", indent, "");



		BIO_printf(out, "%02X:", data[i]);



		j = (j + 1) % width;

		if (!j) BIO_printf(out, "\n");

		}



	if (i && !j) BIO_printf(out, "%*s", indent, "");

	BIO_printf(out, "%02X", data[datalen - 1]);

	return 1;

	}

crypto/bio/bio.h

+3 −0
Original line number Diff line number Diff line
@@ -707,6 +707,9 @@ int BIO_dump_indent(BIO *b,const char *bytes,int len,int indent); 
int BIO_dump_fp(FILE *fp, const char *s, int len);

int BIO_dump_indent_fp(FILE *fp, const char *s, int len, int indent);

#endif

int BIO_hex_string(BIO *out, int indent, int width, unsigned char *data,

		   int datalen);



struct hostent *BIO_gethostbyname(const char *name);

/* We might want a thread-safe interface too:

 * struct hostent *BIO_gethostbyname_r(const char *name,

crypto/crypto-lib.com

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ $ LIB_X509V3 = "v3_bcons,v3_bitst,v3_conf,v3_extku,v3_ia5,v3_lib,"+ - 
	"v3_int,v3_enum,v3_sxnet,v3_cpols,v3_crld,v3_purp,v3_info,"+ -

	"v3_ocsp,v3_akeya,v3_pmaps,v3_pcons,v3_ncons,v3_pcia,v3_pci,"+ -

	"pcy_cache,pcy_node,pcy_data,pcy_map,pcy_tree,pcy_lib,"+ -

	"v3_asid,v3_addr"

	"v3_asid,v3_addr,v3_scts"

$ LIB_CONF = "conf_err,conf_lib,conf_api,conf_def,conf_mod,conf_mall,conf_sap"

$ LIB_TXT_DB = "txt_db"

$ LIB_PKCS7 = "pk7_asn1,pk7_lib,pkcs7err,pk7_doit,pk7_smime,pk7_attr,"+ -

crypto/objects/obj_dat.h

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

 */



#define NUM_NID 951

#define NUM_SN 944

#define NUM_LN 944

#define NUM_OBJ 883

#define NUM_NID 955

#define NUM_SN 948

#define NUM_LN 948

#define NUM_OBJ 887



static const unsigned char lvalues[6188]={

static const unsigned char lvalues[6228]={

0x00,                                        /* [  0] OBJ_undef */

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

0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,          /* [  7] OBJ_pkcs */
@@ -951,6 +951,10 @@ static const unsigned char lvalues[6188]={ 
0x2B,0x81,0x04,0x01,0x0E,0x01,               /* [6169] OBJ_dhSinglePass_cofactorDH_sha256kdf_scheme */

0x2B,0x81,0x04,0x01,0x0E,0x02,               /* [6175] OBJ_dhSinglePass_cofactorDH_sha384kdf_scheme */

0x2B,0x81,0x04,0x01,0x0E,0x03,               /* [6181] OBJ_dhSinglePass_cofactorDH_sha512kdf_scheme */

0x2B,0x06,0x01,0x04,0x01,0xD6,0x79,0x02,0x04,0x02,/* [6187] OBJ_ct_precert_scts */

0x2B,0x06,0x01,0x04,0x01,0xD6,0x79,0x02,0x04,0x03,/* [6197] OBJ_ct_precert_poison */

0x2B,0x06,0x01,0x04,0x01,0xD6,0x79,0x02,0x04,0x04,/* [6207] OBJ_ct_precert_signer */

0x2B,0x06,0x01,0x04,0x01,0xD6,0x79,0x02,0x04,0x05,/* [6217] OBJ_ct_cert_scts */

};



static const ASN1_OBJECT nid_objs[NUM_NID]={
@@ -2500,6 +2504,14 @@ static const ASN1_OBJECT nid_objs[NUM_NID]={ 
	NID_aes_192_cbc_hmac_sha256,0,NULL,0},

{"AES-256-CBC-HMAC-SHA256","aes-256-cbc-hmac-sha256",

	NID_aes_256_cbc_hmac_sha256,0,NULL,0},

{"ct_precert_scts","CT Precertificate SCTs",NID_ct_precert_scts,10,

	&(lvalues[6187]),0},

{"ct_precert_poison","CT Precertificate Poison",NID_ct_precert_poison,

	10,&(lvalues[6197]),0},

{"ct_precert_signer","CT Precertificate Signer",NID_ct_precert_signer,

	10,&(lvalues[6207]),0},

{"ct_cert_scts","CT Certificate SCTs",NID_ct_cert_scts,10,

	&(lvalues[6217]),0},

};



static const unsigned int sn_objs[NUM_SN]={
@@ -2777,6 +2789,10 @@ static const unsigned int sn_objs[NUM_SN]={ 
884,	/* "crossCertificatePair" */

806,	/* "cryptocom" */

805,	/* "cryptopro" */

954,	/* "ct_cert_scts" */

952,	/* "ct_precert_poison" */

951,	/* "ct_precert_scts" */

953,	/* "ct_precert_signer" */

500,	/* "dITRedirect" */

451,	/* "dNSDomain" */

495,	/* "dSAQuality" */
@@ -3460,6 +3476,10 @@ static const unsigned int ln_objs[NUM_LN]={ 
285,	/* "Biometric Info" */

179,	/* "CA Issuers" */

785,	/* "CA Repository" */

954,	/* "CT Certificate SCTs" */

952,	/* "CT Precertificate Poison" */

951,	/* "CT Precertificate SCTs" */

953,	/* "CT Precertificate Signer" */

131,	/* "Code Signing" */

783,	/* "Diffie-Hellman based MAC" */

382,	/* "Directory" */
@@ -5202,6 +5222,10 @@ static const unsigned int obj_objs[NUM_OBJ]={ 
138,	/* OBJ_ms_efs                       1 3 6 1 4 1 311 10 3 4 */

648,	/* OBJ_ms_smartcard_login           1 3 6 1 4 1 311 20 2 2 */

649,	/* OBJ_ms_upn                       1 3 6 1 4 1 311 20 2 3 */

951,	/* OBJ_ct_precert_scts              1 3 6 1 4 1 11129 2 4 2 */

952,	/* OBJ_ct_precert_poison            1 3 6 1 4 1 11129 2 4 3 */

953,	/* OBJ_ct_precert_signer            1 3 6 1 4 1 11129 2 4 4 */

954,	/* OBJ_ct_cert_scts                 1 3 6 1 4 1 11129 2 4 5 */

751,	/* OBJ_camellia_128_cbc             1 2 392 200011 61 1 1 1 2 */

752,	/* OBJ_camellia_192_cbc             1 2 392 200011 61 1 1 1 3 */

753,	/* OBJ_camellia_256_cbc             1 2 392 200011 61 1 1 1 4 */

crypto/objects/obj_mac.h

+20 −0
Original line number Diff line number Diff line
@@ -4158,3 +4158,23 @@ 
#define SN_dh_cofactor_kdf		"dh-cofactor-kdf"

#define NID_dh_cofactor_kdf		947



#define SN_ct_precert_scts		"ct_precert_scts"

#define LN_ct_precert_scts		"CT Precertificate SCTs"

#define NID_ct_precert_scts		951

#define OBJ_ct_precert_scts		1L,3L,6L,1L,4L,1L,11129L,2L,4L,2L



#define SN_ct_precert_poison		"ct_precert_poison"

#define LN_ct_precert_poison		"CT Precertificate Poison"

#define NID_ct_precert_poison		952

#define OBJ_ct_precert_poison		1L,3L,6L,1L,4L,1L,11129L,2L,4L,3L



#define SN_ct_precert_signer		"ct_precert_signer"

#define LN_ct_precert_signer		"CT Precertificate Signer"

#define NID_ct_precert_signer		953

#define OBJ_ct_precert_signer		1L,3L,6L,1L,4L,1L,11129L,2L,4L,4L



#define SN_ct_cert_scts		"ct_cert_scts"

#define LN_ct_cert_scts		"CT Certificate SCTs"

#define NID_ct_cert_scts		954

#define OBJ_ct_cert_scts		1L,3L,6L,1L,4L,1L,11129L,2L,4L,5L