Commit 8afca8d9 authored by Bodo Möller's avatar Bodo Möller
Browse files

Fix more error codes. 

(Also improve util/ck_errf.pl script, and occasionally
fix source code formatting.)
parent 35e8510e

crypto/asn1/asn1.h

+6 −4
Original line number Diff line number Diff line
@@ -1035,6 +1035,7 @@ void ERR_load_ASN1_strings(void); 
#define ASN1_F_ASN1_DUP					 111

#define ASN1_F_ASN1_ENUMERATED_SET			 112

#define ASN1_F_ASN1_ENUMERATED_TO_BN			 113

#define ASN1_F_ASN1_EX_C2I				 204

#define ASN1_F_ASN1_FIND_END				 190

#define ASN1_F_ASN1_GENERALIZEDTIME_SET			 185

#define ASN1_F_ASN1_GENERATE_V3				 178
@@ -1046,10 +1047,10 @@ void ERR_load_ASN1_strings(void); 
#define ASN1_F_ASN1_INTEGER_TO_BN			 119

#define ASN1_F_ASN1_ITEM_D2I_FP				 190

#define ASN1_F_ASN1_ITEM_DUP				 191

#define ASN1_F_ASN1_ITEM_EX_COMBINE_NEW			 121

#define ASN1_F_ASN1_ITEM_EX_D2I				 120

#define ASN1_F_ASN1_ITEM_I2D_BIO			 192

#define ASN1_F_ASN1_ITEM_I2D_FP				 193

#define ASN1_F_ASN1_ITEM_NEW				 121

#define ASN1_F_ASN1_ITEM_PACK				 198

#define ASN1_F_ASN1_ITEM_SIGN				 195

#define ASN1_F_ASN1_ITEM_UNPACK				 199
@@ -1065,9 +1066,9 @@ void ERR_load_ASN1_strings(void); 
#define ASN1_F_ASN1_STRING_SET				 186

#define ASN1_F_ASN1_STRING_TABLE_ADD			 129

#define ASN1_F_ASN1_STRING_TYPE_NEW			 130

#define ASN1_F_ASN1_TEMPLATE_D2I			 131

#define ASN1_F_ASN1_TEMPLATE_EX_D2I			 132

#define ASN1_F_ASN1_TEMPLATE_NEW			 133

#define ASN1_F_ASN1_TEMPLATE_NOEXP_D2I			 131

#define ASN1_F_ASN1_TIME_SET				 175

#define ASN1_F_ASN1_TYPE_GET_INT_OCTETSTRING		 134

#define ASN1_F_ASN1_TYPE_GET_OCTETSTRING		 135
@@ -1100,7 +1101,6 @@ void ERR_load_ASN1_strings(void); 
#define ASN1_F_D2I_RSA_NET_2				 201

#define ASN1_F_D2I_X509					 156

#define ASN1_F_D2I_X509_CINF				 157

#define ASN1_F_D2I_X509_NAME				 158

#define ASN1_F_D2I_X509_PKEY				 159

#define ASN1_F_I2D_ASN1_SET				 188

#define ASN1_F_I2D_ASN1_TIME				 160
@@ -1118,7 +1118,9 @@ void ERR_load_ASN1_strings(void); 
#define ASN1_F_X509_CINF_NEW				 168

#define ASN1_F_X509_CRL_ADD0_REVOKED			 169

#define ASN1_F_X509_INFO_NEW				 170

#define ASN1_F_X509_NAME_NEW				 171

#define ASN1_F_X509_NAME_ENCODE				 203

#define ASN1_F_X509_NAME_EX_D2I				 158

#define ASN1_F_X509_NAME_EX_NEW				 171

#define ASN1_F_X509_NEW					 172

#define ASN1_F_X509_PKEY_NEW				 173

crypto/asn1/asn1_err.c

+6 −4
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ static ERR_STRING_DATA ASN1_str_functs[]= 
{ERR_FUNC(ASN1_F_ASN1_DUP),	"ASN1_dup"},

{ERR_FUNC(ASN1_F_ASN1_ENUMERATED_SET),	"ASN1_ENUMERATED_set"},

{ERR_FUNC(ASN1_F_ASN1_ENUMERATED_TO_BN),	"ASN1_ENUMERATED_to_BN"},

{ERR_FUNC(ASN1_F_ASN1_EX_C2I),	"ASN1_EX_C2I"},

{ERR_FUNC(ASN1_F_ASN1_FIND_END),	"ASN1_FIND_END"},

{ERR_FUNC(ASN1_F_ASN1_GENERALIZEDTIME_SET),	"ASN1_GENERALIZEDTIME_set"},

{ERR_FUNC(ASN1_F_ASN1_GENERATE_V3),	"ASN1_generate_v3"},
@@ -99,10 +100,10 @@ static ERR_STRING_DATA ASN1_str_functs[]= 
{ERR_FUNC(ASN1_F_ASN1_INTEGER_TO_BN),	"ASN1_INTEGER_to_BN"},

{ERR_FUNC(ASN1_F_ASN1_ITEM_D2I_FP),	"ASN1_item_d2i_fp"},

{ERR_FUNC(ASN1_F_ASN1_ITEM_DUP),	"ASN1_item_dup"},

{ERR_FUNC(ASN1_F_ASN1_ITEM_EX_COMBINE_NEW),	"ASN1_ITEM_EX_COMBINE_NEW"},

{ERR_FUNC(ASN1_F_ASN1_ITEM_EX_D2I),	"ASN1_ITEM_EX_D2I"},

{ERR_FUNC(ASN1_F_ASN1_ITEM_I2D_BIO),	"ASN1_item_i2d_bio"},

{ERR_FUNC(ASN1_F_ASN1_ITEM_I2D_FP),	"ASN1_item_i2d_fp"},

{ERR_FUNC(ASN1_F_ASN1_ITEM_NEW),	"ASN1_item_new"},

{ERR_FUNC(ASN1_F_ASN1_ITEM_PACK),	"ASN1_item_pack"},

{ERR_FUNC(ASN1_F_ASN1_ITEM_SIGN),	"ASN1_item_sign"},

{ERR_FUNC(ASN1_F_ASN1_ITEM_UNPACK),	"ASN1_item_unpack"},
@@ -118,9 +119,9 @@ static ERR_STRING_DATA ASN1_str_functs[]= 
{ERR_FUNC(ASN1_F_ASN1_STRING_SET),	"ASN1_STRING_set"},

{ERR_FUNC(ASN1_F_ASN1_STRING_TABLE_ADD),	"ASN1_STRING_TABLE_add"},

{ERR_FUNC(ASN1_F_ASN1_STRING_TYPE_NEW),	"ASN1_STRING_type_new"},

{ERR_FUNC(ASN1_F_ASN1_TEMPLATE_D2I),	"ASN1_TEMPLATE_D2I"},

{ERR_FUNC(ASN1_F_ASN1_TEMPLATE_EX_D2I),	"ASN1_TEMPLATE_EX_D2I"},

{ERR_FUNC(ASN1_F_ASN1_TEMPLATE_NEW),	"ASN1_TEMPLATE_NEW"},

{ERR_FUNC(ASN1_F_ASN1_TEMPLATE_NOEXP_D2I),	"ASN1_TEMPLATE_NOEXP_D2I"},

{ERR_FUNC(ASN1_F_ASN1_TIME_SET),	"ASN1_TIME_set"},

{ERR_FUNC(ASN1_F_ASN1_TYPE_GET_INT_OCTETSTRING),	"ASN1_TYPE_get_int_octetstring"},

{ERR_FUNC(ASN1_F_ASN1_TYPE_GET_OCTETSTRING),	"ASN1_TYPE_get_octetstring"},
@@ -153,7 +154,6 @@ static ERR_STRING_DATA ASN1_str_functs[]= 
{ERR_FUNC(ASN1_F_D2I_RSA_NET_2),	"D2I_RSA_NET_2"},

{ERR_FUNC(ASN1_F_D2I_X509),	"D2I_X509"},

{ERR_FUNC(ASN1_F_D2I_X509_CINF),	"D2I_X509_CINF"},

{ERR_FUNC(ASN1_F_D2I_X509_NAME),	"D2I_X509_NAME"},

{ERR_FUNC(ASN1_F_D2I_X509_PKEY),	"d2i_X509_PKEY"},

{ERR_FUNC(ASN1_F_I2D_ASN1_SET),	"i2d_ASN1_SET"},

{ERR_FUNC(ASN1_F_I2D_ASN1_TIME),	"I2D_ASN1_TIME"},
@@ -171,7 +171,9 @@ static ERR_STRING_DATA ASN1_str_functs[]= 
{ERR_FUNC(ASN1_F_X509_CINF_NEW),	"X509_CINF_NEW"},

{ERR_FUNC(ASN1_F_X509_CRL_ADD0_REVOKED),	"X509_CRL_add0_revoked"},

{ERR_FUNC(ASN1_F_X509_INFO_NEW),	"X509_INFO_new"},

{ERR_FUNC(ASN1_F_X509_NAME_NEW),	"X509_NAME_NEW"},

{ERR_FUNC(ASN1_F_X509_NAME_ENCODE),	"X509_NAME_ENCODE"},

{ERR_FUNC(ASN1_F_X509_NAME_EX_D2I),	"X509_NAME_EX_D2I"},

{ERR_FUNC(ASN1_F_X509_NAME_EX_NEW),	"X509_NAME_EX_NEW"},

{ERR_FUNC(ASN1_F_X509_NEW),	"X509_NEW"},

{ERR_FUNC(ASN1_F_X509_PKEY_NEW),	"X509_PKEY_new"},

{0,NULL}

crypto/asn1/t_crl.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ int X509_CRL_print_fp(FILE *fp, X509_CRL *x) 


        if ((b=BIO_new(BIO_s_file())) == NULL)

		{

		X509err(X509_F_X509_PRINT_FP,ERR_R_BUF_LIB);

		X509err(X509_F_X509_CRL_PRINT_FP,ERR_R_BUF_LIB);

                return(0);

		}

        BIO_set_fp(b,fp,BIO_NOCLOSE);

crypto/asn1/t_req.c

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ get_next: 


	return(1);

err:

	X509err(X509_F_X509_REQ_PRINT,ERR_R_BUF_LIB);

	X509err(X509_F_X509_REQ_PRINT_EX,ERR_R_BUF_LIB);

	return(0);

	}

crypto/asn1/t_x509.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ int X509_print_ex_fp(FILE *fp, X509 *x, unsigned long nmflag, unsigned long cfla 


        if ((b=BIO_new(BIO_s_file())) == NULL)

		{

		X509err(X509_F_X509_PRINT_FP,ERR_R_BUF_LIB);

		X509err(X509_F_X509_PRINT_EX_FP,ERR_R_BUF_LIB);

                return(0);

		}

        BIO_set_fp(b,fp,BIO_NOCLOSE);