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

Make ASN1 types real typedefs. 

Rebuild error files.
parent 63933136

CHANGES

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


 Changes between 0.9.4 and 0.9.5  [xx XXX 2000]



  *) Change the ASN1 types so they are typedefs by default. Before

     almost all types were #define'd to ASN1_STRING which was causing

     STACK_OF() problems: you couldn't declare STACK_OF(ASN1_UTF8STRING)

     for example.

     [Steve Henson]



  *) Change names of new functions to the new get1/get0 naming

     convention: After 'get1', the caller owns a reference count

     and has to call ..._free; 'get0' returns a pointer to some

crypto/asn1/asn1.h

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ DECLARE_STACK_OF(ASN1_STRING_TABLE) 
#define ub_title			64

#define ub_email_address		128



#ifndef DEBUG

#ifdef NO_ASN1_TYPEDEFS

#define ASN1_INTEGER		ASN1_STRING

#define ASN1_ENUMERATED		ASN1_STRING

#define ASN1_BIT_STRING		ASN1_STRING

crypto/asn1/asn1_err.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static ERR_STRING_DATA ASN1_str_functs[]= 
{ERR_PACK(0,ASN1_F_ASN1_SEQ_UNPACK,0),	"ASN1_seq_unpack"},

{ERR_PACK(0,ASN1_F_ASN1_SIGN,0),	"ASN1_sign"},

{ERR_PACK(0,ASN1_F_ASN1_STRING_NEW,0),	"ASN1_STRING_new"},

{ERR_PACK(0,ASN1_F_ASN1_STRING_TABLE_ADD,0),	"ASN1_STRING_TABLE_ADD"},

{ERR_PACK(0,ASN1_F_ASN1_STRING_TABLE_ADD,0),	"ASN1_STRING_TABLE_add"},

{ERR_PACK(0,ASN1_F_ASN1_STRING_TYPE_NEW,0),	"ASN1_STRING_type_new"},

{ERR_PACK(0,ASN1_F_ASN1_TYPE_GET_INT_OCTETSTRING,0),	"ASN1_TYPE_get_int_octetstring"},

{ERR_PACK(0,ASN1_F_ASN1_TYPE_GET_OCTETSTRING,0),	"ASN1_TYPE_get_octetstring"},

crypto/evp/evp.h

+1 −1
Original line number Diff line number Diff line
@@ -694,10 +694,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_NEW				 106

#define EVP_F_EVP_PKEY_GET1_DH				 119

#define EVP_F_EVP_PKEY_GET1_DSA				 120

#define EVP_F_EVP_PKEY_GET1_RSA				 121

#define EVP_F_EVP_PKEY_NEW				 106

#define EVP_F_EVP_SIGNFINAL				 107

#define EVP_F_EVP_VERIFYFINAL				 108

#define EVP_F_PKCS5_PBE_KEYIVGEN			 117

crypto/evp/evp_err.c

+1 −1
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_NEW,0),	"EVP_PKEY_new"},

{ERR_PACK(0,EVP_F_EVP_PKEY_GET1_DH,0),	"EVP_PKEY_get1_DH"},

{ERR_PACK(0,EVP_F_EVP_PKEY_GET1_DSA,0),	"EVP_PKEY_get1_DSA"},

{ERR_PACK(0,EVP_F_EVP_PKEY_GET1_RSA,0),	"EVP_PKEY_get1_RSA"},

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

{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"},