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

Avoid contradictive error code assignments. 

"make error".
parent 8dc74500

crypto/asn1/asn1.h

+1 −1
Original line number Diff line number Diff line
@@ -1045,7 +1045,7 @@ void ERR_load_ASN1_strings(void); 
#define ASN1_F_ASN1_I2D_FP				 117

#define ASN1_F_ASN1_INTEGER_SET				 118

#define ASN1_F_ASN1_INTEGER_TO_BN			 119

#define ASN1_F_ASN1_ITEM_D2I_FP				 190

#define ASN1_F_ASN1_ITEM_D2I_FP				 206

#define ASN1_F_ASN1_ITEM_DUP				 191

#define ASN1_F_ASN1_ITEM_EX_COMBINE_NEW			 121

#define ASN1_F_ASN1_ITEM_EX_D2I				 120

crypto/asn1/asn1_err.c

+4 −4
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ static ERR_STRING_DATA ASN1_str_functs[]= 
{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_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"},

{ERR_FUNC(ASN1_F_ASN1_UNPACK_STRING),	"ASN1_unpack_string"},
@@ -168,10 +168,10 @@ static ERR_STRING_DATA ASN1_str_functs[]= 
{ERR_FUNC(ASN1_F_OID_MODULE_INIT),	"OID_MODULE_INIT"},

{ERR_FUNC(ASN1_F_PARSE_TAGGING),	"PARSE_TAGGING"},

{ERR_FUNC(ASN1_F_PKCS5_PBE2_SET),	"PKCS5_pbe2_set"},

{ERR_FUNC(ASN1_F_PKCS5_PBE_SET),	"PKCS5_pbe_set"},

{ERR_FUNC(ASN1_F_PKCS5_PBE_SET),	"PKCS5_PBE_SET"},

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

{ERR_FUNC(ASN1_F_X509_INFO_NEW),	"X509_INFO_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"},

crypto/ec/ec.h

+0 −1
Original line number Diff line number Diff line
@@ -429,7 +429,6 @@ void ERR_load_EC_strings(void); 
#define EC_F_EC_GROUP_GET_ORDER				 141

#define EC_F_EC_GROUP_GET_PENTANOMIAL_BASIS		 193

#define EC_F_EC_GROUP_GET_TRINOMIAL_BASIS		 194

#define EC_F_EC_GROUP_GROUP2NID				 147

#define EC_F_EC_GROUP_NEW				 108

#define EC_F_EC_GROUP_NEW_BY_CURVE_NAME			 174

#define EC_F_EC_GROUP_NEW_FROM_DATA			 175

crypto/x509v3/v3err.c

+4 −4
Original line number Diff line number Diff line
@@ -94,12 +94,12 @@ static ERR_STRING_DATA X509V3_str_functs[]= 
{ERR_FUNC(X509V3_F_S2I_ASN1_SKEY_ID),	"S2I_ASN1_SKEY_ID"},

{ERR_FUNC(X509V3_F_S2I_SKEY_ID),	"S2I_SKEY_ID"},

{ERR_FUNC(X509V3_F_STRING_TO_HEX),	"string_to_hex"},

{ERR_FUNC(X509V3_F_SXNET_ADD_ID_ASC),	"SXNET_add_id_asc"},

{ERR_FUNC(X509V3_F_SXNET_ADD_ID_ASC),	"SXNET_ADD_ID_ASC"},

{ERR_FUNC(X509V3_F_SXNET_ADD_ID_INTEGER),	"SXNET_add_id_INTEGER"},

{ERR_FUNC(X509V3_F_SXNET_ADD_ID_ULONG),	"SXNET_add_id_ulong"},

{ERR_FUNC(X509V3_F_SXNET_GET_ID_ASC),	"SXNET_get_id_asc"},

{ERR_FUNC(X509V3_F_SXNET_GET_ID_ULONG),	"SXNET_get_id_ulong"},

{ERR_FUNC(X509V3_F_V2I_ASN1_BIT_STRING),	"v2i_ASN1_BIT_STRING"},

{ERR_FUNC(X509V3_F_V2I_ASN1_BIT_STRING),	"V2I_ASN1_BIT_STRING"},

{ERR_FUNC(X509V3_F_V2I_AUTHORITY_INFO_ACCESS),	"V2I_AUTHORITY_INFO_ACCESS"},

{ERR_FUNC(X509V3_F_V2I_AUTHORITY_KEYID),	"V2I_AUTHORITY_KEYID"},

{ERR_FUNC(X509V3_F_V2I_BASIC_CONSTRAINTS),	"V2I_BASIC_CONSTRAINTS"},
@@ -120,10 +120,10 @@ static ERR_STRING_DATA X509V3_str_functs[]= 
{ERR_FUNC(X509V3_F_X509V3_EXT_CONF),	"X509V3_EXT_conf"},

{ERR_FUNC(X509V3_F_X509V3_EXT_I2D),	"X509V3_EXT_i2d"},

{ERR_FUNC(X509V3_F_X509V3_EXT_NCONF),	"X509V3_EXT_nconf"},

{ERR_FUNC(X509V3_F_X509V3_GET_SECTION),	"X509V3_get_section"},

{ERR_FUNC(X509V3_F_X509V3_GET_SECTION),	"X509V3_GET_SECTION"},

{ERR_FUNC(X509V3_F_X509V3_GET_STRING),	"X509V3_get_string"},

{ERR_FUNC(X509V3_F_X509V3_GET_VALUE_BOOL),	"X509V3_get_value_bool"},

{ERR_FUNC(X509V3_F_X509V3_PARSE_LIST),	"X509V3_parse_list"},

{ERR_FUNC(X509V3_F_X509V3_PARSE_LIST),	"X509V3_PARSE_LIST"},

{ERR_FUNC(X509V3_F_X509_PURPOSE_ADD),	"X509_PURPOSE_add"},

{ERR_FUNC(X509V3_F_X509_PURPOSE_SET),	"X509_PURPOSE_set"},

{0,NULL}

crypto/x509v3/x509v3.h

+1 −1
Original line number Diff line number Diff line
@@ -651,7 +651,7 @@ void ERR_load_X509V3_strings(void); 
#define X509V3_F_POLICY_SECTION				 131

#define X509V3_F_PROCESS_PCI_VALUE			 150

#define X509V3_F_R2I_CERTPOL				 130

#define X509V3_F_R2I_PCI				 149

#define X509V3_F_R2I_PCI				 155

#define X509V3_F_S2I_ASN1_IA5STRING			 100

#define X509V3_F_S2I_ASN1_INTEGER			 108

#define X509V3_F_S2I_ASN1_OCTET_STRING			 112