Commit 41b731f2 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Initial support for Certificate Policies extension: print out works but setting 

isn't fully implemented (yet).
parent 8de421b6

CHANGES

+5 −0
Original line number Diff line number Diff line
@@ -5,6 +5,11 @@ 


 Changes between 0.9.2b and 0.9.3



  *) Initial support for Certificate Policies extension: print works but

     setting doesn't work fully (yet). Also various additions to support

     the r2i method this extension will use.

     [Steve Henson]



  *) A lot of constification, and fix a bug in X509_NAME_oneline() that could

     return a const string when you are expecting an allocated buffer.

     [Ben Laurie]

apps/ca.c

+8 −2
Original line number Diff line number Diff line
@@ -712,7 +712,10 @@ bad: 
		extensions=CONF_get_string(conf,section,ENV_EXTENSIONS);

		if(extensions) {

			/* Check syntax of file */

			if(!X509V3_EXT_check_conf(conf, extensions)) {

			X509V3_CTX ctx;

			X509V3_set_ctx_test(&ctx);

			X509V3_set_conf_lhash(&ctx, conf);

			if(!X509V3_EXT_add_conf(conf, &ctx, extensions, NULL)) {

				BIO_printf(bio_err,

				 "Error Loading extension section %s\n",

								 extensions);
@@ -984,7 +987,10 @@ bad: 
		crl_ext=CONF_get_string(conf,section,ENV_CRLEXT);

		if(crl_ext) {

			/* Check syntax of file */

			if(!X509V3_EXT_check_conf(conf, crl_ext)) {

			X509V3_CTX ctx;

			X509V3_set_ctx_test(&ctx);

			X509V3_set_conf_lhash(&ctx, conf);

			if(!X509V3_EXT_add_conf(conf, &ctx, crl_ext, NULL)) {

				BIO_printf(bio_err,

				 "Error Loading CRL extension section %s\n",

								 crl_ext);

apps/req.c

+4 −1
Original line number Diff line number Diff line
@@ -438,7 +438,10 @@ bad: 
	extensions = CONF_get_string(req_conf, SECTION, V3_EXTENSIONS);

	if(extensions) {

		/* Check syntax of file */

		if(!X509V3_EXT_check_conf(req_conf, extensions)) {

		X509V3_CTX ctx;

		X509V3_set_ctx_test(&ctx);

		X509V3_set_conf_lhash(&ctx, req_conf);

		if(!X509V3_EXT_add_conf(req_conf, &ctx, extensions, NULL)) {

			BIO_printf(bio_err,

			 "Error Loading extension section %s\n", extensions);

			goto end;

crypto/asn1/asn1.err

+8 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ 
#define ASN1_F_D2I_NETSCAPE_RSA_2			 142

#define ASN1_F_D2I_NETSCAPE_SPKAC			 143

#define ASN1_F_D2I_NETSCAPE_SPKI			 144

#define ASN1_F_D2I_NOTICEREF				 268

#define ASN1_F_D2I_PBE2PARAM				 262

#define ASN1_F_D2I_PBEPARAM				 249

#define ASN1_F_D2I_PBKDF2PARAM				 263
@@ -86,12 +87,15 @@ 
#define ASN1_F_D2I_PKCS7_SIGN_ENVELOPE			 154

#define ASN1_F_D2I_PKCS8_PRIV_KEY_INFO			 250

#define ASN1_F_D2I_PKEY_USAGE_PERIOD			 239

#define ASN1_F_D2I_POLICYINFO				 269

#define ASN1_F_D2I_POLICYQUALINFO			 270

#define ASN1_F_D2I_PRIVATEKEY				 155

#define ASN1_F_D2I_PUBLICKEY				 156

#define ASN1_F_D2I_RSAPRIVATEKEY			 157

#define ASN1_F_D2I_RSAPUBLICKEY				 158

#define ASN1_F_D2I_SXNET				 241

#define ASN1_F_D2I_SXNETID				 243

#define ASN1_F_D2I_USERNOTICE				 271

#define ASN1_F_D2I_X509					 159

#define ASN1_F_D2I_X509_ALGOR				 160

#define ASN1_F_D2I_X509_ATTRIBUTE			 161
@@ -128,6 +132,7 @@ 
#define ASN1_F_NETSCAPE_PKEY_NEW			 189

#define ASN1_F_NETSCAPE_SPKAC_NEW			 190

#define ASN1_F_NETSCAPE_SPKI_NEW			 191

#define ASN1_F_NOTICEREF_NEW				 272

#define ASN1_F_PBE2PARAM_NEW				 264

#define ASN1_F_PBEPARAM_NEW				 251

#define ASN1_F_PBKDF2PARAM_NEW				 265
@@ -147,8 +152,11 @@ 
#define ASN1_F_PKCS7_SIGN_ENVELOPE_NEW			 201

#define ASN1_F_PKCS8_PRIV_KEY_INFO_NEW			 252

#define ASN1_F_PKEY_USAGE_PERIOD_NEW			 240

#define ASN1_F_POLICYINFO_NEW				 273

#define ASN1_F_POLICYQUALINFO_NEW			 274

#define ASN1_F_SXNETID_NEW				 244

#define ASN1_F_SXNET_NEW				 242

#define ASN1_F_USERNOTICE_NEW				 275

#define ASN1_F_X509_ALGOR_NEW				 202

#define ASN1_F_X509_ATTRIBUTE_NEW			 203

#define ASN1_F_X509_CINF_NEW				 204

crypto/asn1/asn1.h

+8 −0
Original line number Diff line number Diff line
@@ -874,6 +874,7 @@ ASN1_STRING *ASN1_pack_string(); 
#define ASN1_F_D2I_NETSCAPE_RSA_2			 142

#define ASN1_F_D2I_NETSCAPE_SPKAC			 143

#define ASN1_F_D2I_NETSCAPE_SPKI			 144

#define ASN1_F_D2I_NOTICEREF				 268

#define ASN1_F_D2I_PBE2PARAM				 262

#define ASN1_F_D2I_PBEPARAM				 249

#define ASN1_F_D2I_PBKDF2PARAM				 263
@@ -893,12 +894,15 @@ ASN1_STRING *ASN1_pack_string(); 
#define ASN1_F_D2I_PKCS7_SIGN_ENVELOPE			 154

#define ASN1_F_D2I_PKCS8_PRIV_KEY_INFO			 250

#define ASN1_F_D2I_PKEY_USAGE_PERIOD			 239

#define ASN1_F_D2I_POLICYINFO				 269

#define ASN1_F_D2I_POLICYQUALINFO			 270

#define ASN1_F_D2I_PRIVATEKEY				 155

#define ASN1_F_D2I_PUBLICKEY				 156

#define ASN1_F_D2I_RSAPRIVATEKEY			 157

#define ASN1_F_D2I_RSAPUBLICKEY				 158

#define ASN1_F_D2I_SXNET				 241

#define ASN1_F_D2I_SXNETID				 243

#define ASN1_F_D2I_USERNOTICE				 271

#define ASN1_F_D2I_X509					 159

#define ASN1_F_D2I_X509_ALGOR				 160

#define ASN1_F_D2I_X509_ATTRIBUTE			 161
@@ -935,6 +939,7 @@ ASN1_STRING *ASN1_pack_string(); 
#define ASN1_F_NETSCAPE_PKEY_NEW			 189

#define ASN1_F_NETSCAPE_SPKAC_NEW			 190

#define ASN1_F_NETSCAPE_SPKI_NEW			 191

#define ASN1_F_NOTICEREF_NEW				 272

#define ASN1_F_PBE2PARAM_NEW				 264

#define ASN1_F_PBEPARAM_NEW				 251

#define ASN1_F_PBKDF2PARAM_NEW				 265
@@ -954,8 +959,11 @@ ASN1_STRING *ASN1_pack_string(); 
#define ASN1_F_PKCS7_SIGN_ENVELOPE_NEW			 201

#define ASN1_F_PKCS8_PRIV_KEY_INFO_NEW			 252

#define ASN1_F_PKEY_USAGE_PERIOD_NEW			 240

#define ASN1_F_POLICYINFO_NEW				 273

#define ASN1_F_POLICYQUALINFO_NEW			 274

#define ASN1_F_SXNETID_NEW				 244

#define ASN1_F_SXNET_NEW				 242

#define ASN1_F_USERNOTICE_NEW				 275

#define ASN1_F_X509_ALGOR_NEW				 202

#define ASN1_F_X509_ATTRIBUTE_NEW			 203

#define ASN1_F_X509_CINF_NEW				 204