Commit 92c046ca authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Add ASN1 code for netscape certificate sequences.

parent a27598bf

CHANGES

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


 Changes between 0.9.1c and 0.9.2



  *) Add ASN1 and PEM code to support netscape certificate sequences.

     [Steve Henson]



  *) Add several PKIX and private extended key usage OIDs.

     [Steve Henson]

crypto/asn1/Makefile.ssl

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ LIBSRC= a_object.c a_bitstr.c a_utctm.c a_gentm.c a_time.c a_int.c a_octet.c \ 
	a_print.c a_type.c a_set.c a_dup.c a_d2i_fp.c a_i2d_fp.c a_bmp.c \

	a_sign.c a_digest.c a_verify.c \

	x_algor.c x_val.c x_pubkey.c x_sig.c x_req.c x_attrib.c \

	x_name.c x_cinf.c x_x509.c x_crl.c x_info.c x_spki.c \

	x_name.c x_cinf.c x_x509.c x_crl.c x_info.c x_spki.c nsseq.c \

	d2i_r_pr.c i2d_r_pr.c d2i_r_pu.c i2d_r_pu.c \

	d2i_s_pr.c i2d_s_pr.c d2i_s_pu.c i2d_s_pu.c \

	d2i_pu.c d2i_pr.c i2d_pu.c i2d_pr.c\
@@ -41,7 +41,7 @@ LIBOBJ= a_object.o a_bitstr.o a_utctm.o a_gentm.o a_time.o a_int.o a_octet.o \ 
	a_print.o a_type.o a_set.o a_dup.o a_d2i_fp.o a_i2d_fp.o a_bmp.o \

	a_sign.o a_digest.o a_verify.o \

	x_algor.o x_val.o x_pubkey.o x_sig.o x_req.o x_attrib.o \

	x_name.o x_cinf.o x_x509.o x_crl.o x_info.o x_spki.o \

	x_name.o x_cinf.o x_x509.o x_crl.o x_info.o x_spki.o nsseq.o \

	d2i_r_pr.o i2d_r_pr.o d2i_r_pu.o i2d_r_pu.o \

	d2i_s_pr.o i2d_s_pr.o d2i_s_pu.o i2d_s_pu.o \

	d2i_pu.o d2i_pr.o i2d_pu.o i2d_pr.o \

crypto/asn1/asn1.err

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#define ASN1_F_D2I_DSAPARAMS				 137

#define ASN1_F_D2I_DSAPRIVATEKEY			 138

#define ASN1_F_D2I_DSAPUBLICKEY				 139

#define ASN1_F_D2I_NETSCAPE_CERT_SEQUENCE		 228

#define ASN1_F_D2I_NETSCAPE_PKEY			 140

#define ASN1_F_D2I_NETSCAPE_RSA				 141

#define ASN1_F_D2I_NETSCAPE_RSA_2			 142
@@ -96,6 +97,7 @@ 
#define ASN1_F_I2D_RSAPUBLICKEY				 186

#define ASN1_F_I2D_X509_ATTRIBUTE			 187

#define ASN1_F_I2T_ASN1_OBJECT				 188

#define ASN1_F_NETSCAPE_CERT_SEQUENCE_NEW		 229

#define ASN1_F_NETSCAPE_PKEY_NEW			 189

#define ASN1_F_NETSCAPE_SPKAC_NEW			 190

#define ASN1_F_NETSCAPE_SPKI_NEW			 191

crypto/asn1/asn1.h

+2 −0
Original line number Diff line number Diff line
@@ -700,6 +700,7 @@ ASN1_BMPSTRING *d2i_ASN1_BMPSTRING(); 
#define ASN1_F_D2I_DSAPARAMS				 137

#define ASN1_F_D2I_DSAPRIVATEKEY			 138

#define ASN1_F_D2I_DSAPUBLICKEY				 139

#define ASN1_F_D2I_NETSCAPE_CERT_SEQUENCE		 228

#define ASN1_F_D2I_NETSCAPE_PKEY			 140

#define ASN1_F_D2I_NETSCAPE_RSA				 141

#define ASN1_F_D2I_NETSCAPE_RSA_2			 142
@@ -750,6 +751,7 @@ ASN1_BMPSTRING *d2i_ASN1_BMPSTRING(); 
#define ASN1_F_I2D_RSAPUBLICKEY				 186

#define ASN1_F_I2D_X509_ATTRIBUTE			 187

#define ASN1_F_I2T_ASN1_OBJECT				 188

#define ASN1_F_NETSCAPE_CERT_SEQUENCE_NEW		 229

#define ASN1_F_NETSCAPE_PKEY_NEW			 189

#define ASN1_F_NETSCAPE_SPKAC_NEW			 190

#define ASN1_F_NETSCAPE_SPKI_NEW			 191

crypto/asn1/asn1_err.c

+2 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ static ERR_STRING_DATA ASN1_str_functs[]= 
{ERR_PACK(0,ASN1_F_D2I_DSAPARAMS,0),	"D2I_DSAPARAMS"},

{ERR_PACK(0,ASN1_F_D2I_DSAPRIVATEKEY,0),	"D2I_DSAPRIVATEKEY"},

{ERR_PACK(0,ASN1_F_D2I_DSAPUBLICKEY,0),	"D2I_DSAPUBLICKEY"},

{ERR_PACK(0,ASN1_F_D2I_NETSCAPE_CERT_SEQUENCE,0),	"D2I_NETSCAPE_CERT_SEQUENCE"},

{ERR_PACK(0,ASN1_F_D2I_NETSCAPE_PKEY,0),	"D2I_NETSCAPE_PKEY"},

{ERR_PACK(0,ASN1_F_D2I_NETSCAPE_RSA,0),	"D2I_NETSCAPE_RSA"},

{ERR_PACK(0,ASN1_F_D2I_NETSCAPE_RSA_2,0),	"D2I_NETSCAPE_RSA_2"},
@@ -158,6 +159,7 @@ static ERR_STRING_DATA ASN1_str_functs[]= 
{ERR_PACK(0,ASN1_F_I2D_RSAPUBLICKEY,0),	"I2D_RSAPUBLICKEY"},

{ERR_PACK(0,ASN1_F_I2D_X509_ATTRIBUTE,0),	"I2D_X509_ATTRIBUTE"},

{ERR_PACK(0,ASN1_F_I2T_ASN1_OBJECT,0),	"i2t_ASN1_OBJECT"},

{ERR_PACK(0,ASN1_F_NETSCAPE_CERT_SEQUENCE_NEW,0),	"NETSCAPE_CERT_SEQUENCE_NEW"},

{ERR_PACK(0,ASN1_F_NETSCAPE_PKEY_NEW,0),	"NETSCAPE_PKEY_NEW"},

{ERR_PACK(0,ASN1_F_NETSCAPE_SPKAC_NEW,0),	"NETSCAPE_SPKAC_NEW"},

{ERR_PACK(0,ASN1_F_NETSCAPE_SPKI_NEW,0),	"NETSCAPE_SPKI_NEW"},