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

Add PKCS#5 v2.0 ASN1 structures.

parent acafc0b4

CHANGES

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


 Changes between 0.9.2b and 0.9.3



  *) Add support for PKCS#5 v2.0 ASN1 PBES2 structures. No other support,

     yet...

     [Steve Henson]



  *) New variables $(RANLIB) and $(PERL) in the Makefiles.

     [Ulf Möller]

crypto/asn1/Makefile.ssl

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ LIBSRC= a_object.c a_bitstr.c a_utctm.c a_gentm.c a_time.c a_int.c a_octet.c \ 
	f_int.c f_string.c i2d_dhp.c i2d_dsap.c d2i_dhp.c d2i_dsap.c n_pkey.c \

	f_enum.c a_hdr.c x_pkey.c a_bool.c x_exten.c \

	asn1_par.c asn1_lib.c $(ERRC).c a_meth.c a_bytes.c \

	evp_asn1.c asn_pack.c p5_pbe.c p8_pkey.c

	evp_asn1.c asn_pack.c p5_pbe.c p5_pbev2.c p8_pkey.c

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_enum.o a_sign.o a_digest.o a_verify.o \
@@ -51,7 +51,7 @@ LIBOBJ= a_object.o a_bitstr.o a_utctm.o a_gentm.o a_time.o a_int.o a_octet.o \ 
	f_int.o f_string.o i2d_dhp.o i2d_dsap.o d2i_dhp.o d2i_dsap.o n_pkey.o \

	f_enum.o a_hdr.o x_pkey.o a_bool.o x_exten.o \

	asn1_par.o asn1_lib.o $(ERRC).o a_meth.o a_bytes.o \

	evp_asn1.o asn_pack.o p5_pbe.o p8_pkey.o

	evp_asn1.o asn_pack.o p5_pbe.o p5_pbev2.o p8_pkey.o



SRC= $(LIBSRC)

crypto/asn1/asn1.err

+4 −0
Original line number Diff line number Diff line
@@ -65,7 +65,9 @@ 
#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_PBE2PARAM				 262

#define ASN1_F_D2I_PBEPARAM				 249

#define ASN1_F_D2I_PBKDF2PARAM				 263

#define ASN1_F_D2I_PKCS12				 254

#define ASN1_F_D2I_PKCS12_BAGS				 255

#define ASN1_F_D2I_PKCS12_MAC_DATA			 256
@@ -124,7 +126,9 @@ 
#define ASN1_F_NETSCAPE_PKEY_NEW			 189

#define ASN1_F_NETSCAPE_SPKAC_NEW			 190

#define ASN1_F_NETSCAPE_SPKI_NEW			 191

#define ASN1_F_PBE2PARAM_NEW				 264

#define ASN1_F_PBEPARAM_NEW				 251

#define ASN1_F_PBKDF2PARAM_NEW				 265

#define ASN1_F_PKCS12_BAGS_NEW				 258

#define ASN1_F_PKCS12_MAC_DATA_NEW			 259

#define ASN1_F_PKCS12_NEW				 260

crypto/asn1/asn1.h

+4 −0
Original line number Diff line number Diff line
@@ -770,7 +770,9 @@ 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_PBE2PARAM				 262

#define ASN1_F_D2I_PBEPARAM				 249

#define ASN1_F_D2I_PBKDF2PARAM				 263

#define ASN1_F_D2I_PKCS12				 254

#define ASN1_F_D2I_PKCS12_BAGS				 255

#define ASN1_F_D2I_PKCS12_MAC_DATA			 256
@@ -829,7 +831,9 @@ 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_PBE2PARAM_NEW				 264

#define ASN1_F_PBEPARAM_NEW				 251

#define ASN1_F_PBKDF2PARAM_NEW				 265

#define ASN1_F_PKCS12_BAGS_NEW				 258

#define ASN1_F_PKCS12_MAC_DATA_NEW			 259

#define ASN1_F_PKCS12_NEW				 260

crypto/asn1/asn1_err.c

+4 −0
Original line number Diff line number Diff line
@@ -127,7 +127,9 @@ static ERR_STRING_DATA ASN1_str_functs[]= 
{ERR_PACK(0,ASN1_F_D2I_NETSCAPE_RSA_2,0),	"D2I_NETSCAPE_RSA_2"},

{ERR_PACK(0,ASN1_F_D2I_NETSCAPE_SPKAC,0),	"D2I_NETSCAPE_SPKAC"},

{ERR_PACK(0,ASN1_F_D2I_NETSCAPE_SPKI,0),	"D2I_NETSCAPE_SPKI"},

{ERR_PACK(0,ASN1_F_D2I_PBE2PARAM,0),	"D2I_PBE2PARAM"},

{ERR_PACK(0,ASN1_F_D2I_PBEPARAM,0),	"D2I_PBEPARAM"},

{ERR_PACK(0,ASN1_F_D2I_PBKDF2PARAM,0),	"D2I_PBKDF2PARAM"},

{ERR_PACK(0,ASN1_F_D2I_PKCS12,0),	"D2I_PKCS12"},

{ERR_PACK(0,ASN1_F_D2I_PKCS12_BAGS,0),	"D2I_PKCS12_BAGS"},

{ERR_PACK(0,ASN1_F_D2I_PKCS12_MAC_DATA,0),	"D2I_PKCS12_MAC_DATA"},
@@ -186,7 +188,9 @@ static ERR_STRING_DATA ASN1_str_functs[]= 
{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"},

{ERR_PACK(0,ASN1_F_PBE2PARAM_NEW,0),	"PBE2PARAM_NEW"},

{ERR_PACK(0,ASN1_F_PBEPARAM_NEW,0),	"PBEPARAM_NEW"},

{ERR_PACK(0,ASN1_F_PBKDF2PARAM_NEW,0),	"PBKDF2PARAM_NEW"},

{ERR_PACK(0,ASN1_F_PKCS12_BAGS_NEW,0),	"PKCS12_BAGS_NEW"},

{ERR_PACK(0,ASN1_F_PKCS12_MAC_DATA_NEW,0),	"PKCS12_MAC_DATA_NEW"},

{ERR_PACK(0,ASN1_F_PKCS12_NEW,0),	"PKCS12_NEW"},