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

Support for authority information access extension. 

Fix so EVP_PKEY_rset_*() check return codes.
parent 52664f50

CHANGES

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


 Changes between 0.9.4 and 0.9.5  [xx XXX 1999]



  *) Support for the authority information access extension. Not

     very well tested yet.

     [Steve Henson]



  *) Modify RSA and DSA PEM read routines to transparently handle

     PKCS#8 format private keys. New *_PUBKEY_* functions that handle

     public keys in a format compatible with certificate

crypto/asn1/asn1.h

+2 −0
Original line number Diff line number Diff line
@@ -789,6 +789,7 @@ void ASN1_STRING_TABLE_cleanup(void); 
#define ASN1_F_A2I_ASN1_ENUMERATED			 236

#define ASN1_F_A2I_ASN1_INTEGER				 101

#define ASN1_F_A2I_ASN1_STRING				 102

#define ASN1_F_ACCESS_DESCRIPTION_NEW			 291

#define ASN1_F_ASN1_COLLATE_PRIMITIVE			 103

#define ASN1_F_ASN1_D2I_BIO				 104

#define ASN1_F_ASN1_D2I_FP				 105
@@ -823,6 +824,7 @@ void ASN1_STRING_TABLE_cleanup(void); 
#define ASN1_F_BASIC_CONSTRAINTS_NEW			 226

#define ASN1_F_BN_TO_ASN1_ENUMERATED			 234

#define ASN1_F_BN_TO_ASN1_INTEGER			 122

#define ASN1_F_D2I_ACCESS_DESCRIPTION			 292

#define ASN1_F_D2I_ASN1_BIT_STRING			 123

#define ASN1_F_D2I_ASN1_BMPSTRING			 124

#define ASN1_F_D2I_ASN1_BOOLEAN				 125

crypto/asn1/asn1_err.c

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

{ERR_PACK(0,ASN1_F_A2I_ASN1_INTEGER,0),	"a2i_ASN1_INTEGER"},

{ERR_PACK(0,ASN1_F_A2I_ASN1_STRING,0),	"a2i_ASN1_STRING"},

{ERR_PACK(0,ASN1_F_ACCESS_DESCRIPTION_NEW,0),	"ACCESS_DESCRIPTION_new"},

{ERR_PACK(0,ASN1_F_ASN1_COLLATE_PRIMITIVE,0),	"ASN1_COLLATE_PRIMITIVE"},

{ERR_PACK(0,ASN1_F_ASN1_D2I_BIO,0),	"ASN1_d2i_bio"},

{ERR_PACK(0,ASN1_F_ASN1_D2I_FP,0),	"ASN1_d2i_fp"},
@@ -103,6 +104,7 @@ static ERR_STRING_DATA ASN1_str_functs[]= 
{ERR_PACK(0,ASN1_F_BASIC_CONSTRAINTS_NEW,0),	"BASIC_CONSTRAINTS_new"},

{ERR_PACK(0,ASN1_F_BN_TO_ASN1_ENUMERATED,0),	"BN_to_ASN1_ENUMERATED"},

{ERR_PACK(0,ASN1_F_BN_TO_ASN1_INTEGER,0),	"BN_to_ASN1_INTEGER"},

{ERR_PACK(0,ASN1_F_D2I_ACCESS_DESCRIPTION,0),	"d2i_ACCESS_DESCRIPTION"},

{ERR_PACK(0,ASN1_F_D2I_ASN1_BIT_STRING,0),	"d2i_ASN1_BIT_STRING"},

{ERR_PACK(0,ASN1_F_D2I_ASN1_BMPSTRING,0),	"d2i_ASN1_BMPSTRING"},

{ERR_PACK(0,ASN1_F_D2I_ASN1_BOOLEAN,0),	"d2i_ASN1_BOOLEAN"},

crypto/evp/evp.h

+3 −3
Original line number Diff line number Diff line
@@ -682,10 +682,10 @@ void EVP_PBE_cleanup(void); 
#define EVP_F_EVP_PKEY_COPY_PARAMETERS			 103

#define EVP_F_EVP_PKEY_DECRYPT				 104

#define EVP_F_EVP_PKEY_ENCRYPT				 105

#define EVP_F_EVP_PKEY_GET_DH				 119

#define EVP_F_EVP_PKEY_GET_DSA				 120

#define EVP_F_EVP_PKEY_GET_RSA				 121

#define EVP_F_EVP_PKEY_NEW				 106

#define EVP_F_EVP_PKEY_RGET_DH				 119

#define EVP_F_EVP_PKEY_RGET_DSA				 120

#define EVP_F_EVP_PKEY_RGET_RSA				 121

#define EVP_F_EVP_SIGNFINAL				 107

#define EVP_F_EVP_VERIFYFINAL				 108

#define EVP_F_PKCS5_PBE_KEYIVGEN			 117

crypto/evp/evp_err.c

+3 −3
Original line number Diff line number Diff line
@@ -77,10 +77,10 @@ static ERR_STRING_DATA EVP_str_functs[]= 
{ERR_PACK(0,EVP_F_EVP_PKEY_COPY_PARAMETERS,0),	"EVP_PKEY_copy_parameters"},

{ERR_PACK(0,EVP_F_EVP_PKEY_DECRYPT,0),	"EVP_PKEY_decrypt"},

{ERR_PACK(0,EVP_F_EVP_PKEY_ENCRYPT,0),	"EVP_PKEY_encrypt"},

{ERR_PACK(0,EVP_F_EVP_PKEY_GET_DH,0),	"EVP_PKEY_get_DH"},

{ERR_PACK(0,EVP_F_EVP_PKEY_GET_DSA,0),	"EVP_PKEY_get_DSA"},

{ERR_PACK(0,EVP_F_EVP_PKEY_GET_RSA,0),	"EVP_PKEY_get_RSA"},

{ERR_PACK(0,EVP_F_EVP_PKEY_NEW,0),	"EVP_PKEY_new"},

{ERR_PACK(0,EVP_F_EVP_PKEY_RGET_DH,0),	"EVP_PKEY_rget_DH"},

{ERR_PACK(0,EVP_F_EVP_PKEY_RGET_DSA,0),	"EVP_PKEY_rget_DSA"},

{ERR_PACK(0,EVP_F_EVP_PKEY_RGET_RSA,0),	"EVP_PKEY_rget_RSA"},

{ERR_PACK(0,EVP_F_EVP_SIGNFINAL,0),	"EVP_SignFinal"},

{ERR_PACK(0,EVP_F_EVP_VERIFYFINAL,0),	"EVP_VerifyFinal"},

{ERR_PACK(0,EVP_F_PKCS5_PBE_KEYIVGEN,0),	"PKCS5_PBE_keyivgen"},