From 7e76e5638777e8b8a3ec180c89511acd7b9aabb1 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 12 May 2006 15:27:52 +0000 Subject: [PATCH] Someone made a mistake, and some function and reason codes got duplicate numbers. Renumbering. --- crypto/dso/dso.h | 10 +++++----- crypto/dso/dso_err.c | 9 +++++++-- crypto/ec/ec.h | 14 +++++++------- ssl/ssl.h | 2 +- 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/crypto/dso/dso.h b/crypto/dso/dso.h index 3aa4f7aee5..d1d5facb8b 100644 --- a/crypto/dso/dso.h +++ b/crypto/dso/dso.h @@ -334,11 +334,11 @@ void ERR_load_DSO_strings(void); /* Error codes for the DSO functions. */ /* Function codes. */ -#define DSO_F_BEOS_BIND_FUNC 130 -#define DSO_F_BEOS_BIND_VAR 131 -#define DSO_F_BEOS_LOAD 132 -#define DSO_F_BEOS_NAME_CONVERTER 133 -#define DSO_F_BEOS_UNLOAD 134 +#define DSO_F_BEOS_BIND_FUNC 144 +#define DSO_F_BEOS_BIND_VAR 145 +#define DSO_F_BEOS_LOAD 146 +#define DSO_F_BEOS_NAME_CONVERTER 147 +#define DSO_F_BEOS_UNLOAD 148 #define DSO_F_DLFCN_BIND_FUNC 100 #define DSO_F_DLFCN_BIND_VAR 101 #define DSO_F_DLFCN_LOAD 102 diff --git a/crypto/dso/dso_err.c b/crypto/dso/dso_err.c index d7c6087a9d..7b6cf4eb0a 100644 --- a/crypto/dso/dso_err.c +++ b/crypto/dso/dso_err.c @@ -94,26 +94,31 @@ static ERR_STRING_DATA DSO_str_functs[]= {ERR_FUNC(DSO_F_DSO_FREE), "DSO_free"}, {ERR_FUNC(DSO_F_DSO_GET_FILENAME), "DSO_get_filename"}, {ERR_FUNC(DSO_F_DSO_GET_LOADED_FILENAME), "DSO_get_loaded_filename"}, +{ERR_FUNC(DSO_F_DSO_GLOBAL_LOOKUP), "DSO_global_lookup"}, {ERR_FUNC(DSO_F_DSO_LOAD), "DSO_load"}, {ERR_FUNC(DSO_F_DSO_MERGE), "DSO_merge"}, {ERR_FUNC(DSO_F_DSO_NEW_METHOD), "DSO_new_method"}, +{ERR_FUNC(DSO_F_DSO_PATHBYADDR), "DSO_pathbyaddr"}, {ERR_FUNC(DSO_F_DSO_SET_FILENAME), "DSO_set_filename"}, {ERR_FUNC(DSO_F_DSO_SET_NAME_CONVERTER), "DSO_set_name_converter"}, {ERR_FUNC(DSO_F_DSO_UP_REF), "DSO_up_ref"}, +{ERR_FUNC(DSO_F_GLOBAL_LOOKUP_FUNC), "GLOBAL_LOOKUP_FUNC"}, +{ERR_FUNC(DSO_F_PATHBYADDR), "PATHBYADDR"}, {ERR_FUNC(DSO_F_VMS_BIND_SYM), "VMS_BIND_SYM"}, {ERR_FUNC(DSO_F_VMS_LOAD), "VMS_LOAD"}, {ERR_FUNC(DSO_F_VMS_MERGER), "VMS_MERGER"}, {ERR_FUNC(DSO_F_VMS_UNLOAD), "VMS_UNLOAD"}, {ERR_FUNC(DSO_F_WIN32_BIND_FUNC), "WIN32_BIND_FUNC"}, {ERR_FUNC(DSO_F_WIN32_BIND_VAR), "WIN32_BIND_VAR"}, +{ERR_FUNC(DSO_F_WIN32_GLOBALLOOKUP), "WIN32_GLOBALLOOKUP"}, +{ERR_FUNC(DSO_F_WIN32_GLOBALLOOKUP_FUNC), "WIN32_GLOBALLOOKUP_FUNC"}, {ERR_FUNC(DSO_F_WIN32_JOINER), "WIN32_JOINER"}, {ERR_FUNC(DSO_F_WIN32_LOAD), "WIN32_LOAD"}, {ERR_FUNC(DSO_F_WIN32_MERGER), "WIN32_MERGER"}, {ERR_FUNC(DSO_F_WIN32_NAME_CONVERTER), "WIN32_NAME_CONVERTER"}, +{ERR_FUNC(DSO_F_WIN32_PATHBYADDR), "WIN32_PATHBYADDR"}, {ERR_FUNC(DSO_F_WIN32_SPLITTER), "WIN32_SPLITTER"}, {ERR_FUNC(DSO_F_WIN32_UNLOAD), "WIN32_UNLOAD"}, -{ERR_FUNC(DSO_F_PATHBYADDR), "DSO_pathbyaddr"}, -{ERR_FUNC(DSO_F_GLOBAL_LOOKUP_FUNC), "DSO_global_lookup_func"}, {0,NULL} }; diff --git a/crypto/ec/ec.h b/crypto/ec/ec.h index 2852d65c2e..2e575ac6af 100644 --- a/crypto/ec/ec.h +++ b/crypto/ec/ec.h @@ -925,13 +925,13 @@ void ERR_load_EC_strings(void); #define EC_F_D2I_ECPARAMETERS 144 #define EC_F_D2I_ECPKPARAMETERS 145 #define EC_F_D2I_ECPRIVATEKEY 146 -#define EC_F_ECKEY_PARAM2TYPE 211 -#define EC_F_ECKEY_PARAM_DECODE 196 -#define EC_F_ECKEY_PRIV_DECODE 212 -#define EC_F_ECKEY_PRIV_ENCODE 213 -#define EC_F_ECKEY_PUB_DECODE 214 -#define EC_F_ECKEY_PUB_ENCODE 215 -#define EC_F_ECKEY_TYPE2PARAM 216 +#define EC_F_ECKEY_PARAM2TYPE 196 +#define EC_F_ECKEY_PARAM_DECODE 212 +#define EC_F_ECKEY_PRIV_DECODE 213 +#define EC_F_ECKEY_PRIV_ENCODE 214 +#define EC_F_ECKEY_PUB_DECODE 215 +#define EC_F_ECKEY_PUB_ENCODE 216 +#define EC_F_ECKEY_TYPE2PARAM 220 #define EC_F_ECPARAMETERS_PRINT 147 #define EC_F_ECPARAMETERS_PRINT_FP 148 #define EC_F_ECPKPARAMETERS_PRINT 149 diff --git a/ssl/ssl.h b/ssl/ssl.h index f0ed4f105c..7e89b0a9a2 100644 --- a/ssl/ssl.h +++ b/ssl/ssl.h @@ -1875,7 +1875,7 @@ void ERR_load_SSL_strings(void); #define SSL_R_BAD_MESSAGE_TYPE 114 #define SSL_R_BAD_PACKET_LENGTH 115 #define SSL_R_BAD_PROTOCOL_VERSION_NUMBER 116 -#define SSL_R_BAD_PSK_IDENTITY_HINT_LENGTH 157 +#define SSL_R_BAD_PSK_IDENTITY_HINT_LENGTH 316 #define SSL_R_BAD_RESPONSE_ARGUMENT 117 #define SSL_R_BAD_RSA_DECRYPT 118 #define SSL_R_BAD_RSA_ENCRYPT 119 -- 2.25.1