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

Avoid contradictive error code assignments. 

"make errors".
parent 2adc42e4

crypto/asn1/asn1.h

+1 −1
Original line number Diff line number Diff line
@@ -1070,7 +1070,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/ec/ec.h

+0 −1
Original line number Diff line number Diff line
@@ -976,7 +976,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
@@ -96,12 +96,12 @@ static ERR_STRING_DATA X509V3_str_functs[]= 
{ERR_FUNC(X509V3_F_S2I_SKEY_ID),	"S2I_SKEY_ID"},

{ERR_FUNC(X509V3_F_SET_DIST_POINT_NAME),	"SET_DIST_POINT_NAME"},

{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"},
@@ -123,10 +123,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

+2 −2
Original line number Diff line number Diff line
@@ -662,13 +662,13 @@ 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

#define X509V3_F_S2I_ASN1_SKEY_ID			 114

#define X509V3_F_S2I_SKEY_ID				 115

#define X509V3_F_SET_DIST_POINT_NAME			 155

#define X509V3_F_SET_DIST_POINT_NAME			 158

#define X509V3_F_STRING_TO_HEX				 113

#define X509V3_F_SXNET_ADD_ID_ASC			 125

#define X509V3_F_SXNET_ADD_ID_INTEGER			 126

ssl/ssl.h

+1 −1
Original line number Diff line number Diff line
@@ -1592,7 +1592,7 @@ void ERR_load_SSL_strings(void); 


/* Function codes. */

#define SSL_F_CLIENT_CERTIFICATE			 100

#define SSL_F_CLIENT_FINISHED				 238

#define SSL_F_CLIENT_FINISHED				 167

#define SSL_F_CLIENT_HELLO				 101

#define SSL_F_CLIENT_MASTER_KEY				 102

#define SSL_F_D2I_SSL_SESSION				 103