diff options
| author | Rich Salz <rsalz@akamai.com> | 2019-07-11 14:01:56 -0400 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-07-16 05:26:28 +0200 |
| commit | cbfa5b03989ee6b8f5c13c4284d5bae02c562f20 (patch) | |
| tree | 3310c99c9e47c0fa88a276e789cad33136663185 /include/internal/dsoerr.h | |
| parent | aac96e2797c34a6b2a839eb58c30ab3328a0cee8 (diff) | |
| download | openssl-cbfa5b03989ee6b8f5c13c4284d5bae02c562f20.tar.gz | |
Regenerate mkerr files
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9058)
Diffstat (limited to 'include/internal/dsoerr.h')
| -rw-r--r-- | include/internal/dsoerr.h | 110 |
1 files changed, 55 insertions, 55 deletions
diff --git a/include/internal/dsoerr.h b/include/internal/dsoerr.h index 8347d854e3..da51e5f6fd 100644 --- a/include/internal/dsoerr.h +++ b/include/internal/dsoerr.h @@ -11,11 +11,9 @@ #ifndef HEADER_DSOERR_H # define HEADER_DSOERR_H -# ifndef HEADER_SYMHACKS_H -# include <openssl/symhacks.h> -# endif - # include <openssl/opensslconf.h> +# include <openssl/symhacks.h> + # ifdef __cplusplus extern "C" @@ -25,60 +23,62 @@ int ERR_load_DSO_strings(void); /* * DSO function codes. */ -# define DSO_F_DLFCN_BIND_FUNC 100 -# define DSO_F_DLFCN_LOAD 102 -# define DSO_F_DLFCN_MERGER 130 -# define DSO_F_DLFCN_NAME_CONVERTER 123 -# define DSO_F_DLFCN_UNLOAD 103 -# define DSO_F_DL_BIND_FUNC 104 -# define DSO_F_DL_LOAD 106 -# define DSO_F_DL_MERGER 131 -# define DSO_F_DL_NAME_CONVERTER 124 -# define DSO_F_DL_UNLOAD 107 -# define DSO_F_DSO_BIND_FUNC 108 -# define DSO_F_DSO_CONVERT_FILENAME 126 -# define DSO_F_DSO_CTRL 110 -# define DSO_F_DSO_FREE 111 -# define DSO_F_DSO_GET_FILENAME 127 -# define DSO_F_DSO_GLOBAL_LOOKUP 139 -# define DSO_F_DSO_LOAD 112 -# define DSO_F_DSO_MERGE 132 -# define DSO_F_DSO_NEW_METHOD 113 -# define DSO_F_DSO_PATHBYADDR 105 -# define DSO_F_DSO_SET_FILENAME 129 -# define DSO_F_DSO_UP_REF 114 -# define DSO_F_VMS_BIND_SYM 115 -# define DSO_F_VMS_LOAD 116 -# define DSO_F_VMS_MERGER 133 -# define DSO_F_VMS_UNLOAD 117 -# define DSO_F_WIN32_BIND_FUNC 101 -# define DSO_F_WIN32_GLOBALLOOKUP 142 -# define DSO_F_WIN32_JOINER 135 -# define DSO_F_WIN32_LOAD 120 -# define DSO_F_WIN32_MERGER 134 -# define DSO_F_WIN32_NAME_CONVERTER 125 -# define DSO_F_WIN32_PATHBYADDR 109 -# define DSO_F_WIN32_SPLITTER 136 -# define DSO_F_WIN32_UNLOAD 121 +# if !OPENSSL_API_3 +# define DSO_F_DLFCN_BIND_FUNC 0 +# define DSO_F_DLFCN_LOAD 0 +# define DSO_F_DLFCN_MERGER 0 +# define DSO_F_DLFCN_NAME_CONVERTER 0 +# define DSO_F_DLFCN_UNLOAD 0 +# define DSO_F_DL_BIND_FUNC 0 +# define DSO_F_DL_LOAD 0 +# define DSO_F_DL_MERGER 0 +# define DSO_F_DL_NAME_CONVERTER 0 +# define DSO_F_DL_UNLOAD 0 +# define DSO_F_DSO_BIND_FUNC 0 +# define DSO_F_DSO_CONVERT_FILENAME 0 +# define DSO_F_DSO_CTRL 0 +# define DSO_F_DSO_FREE 0 +# define DSO_F_DSO_GET_FILENAME 0 +# define DSO_F_DSO_GLOBAL_LOOKUP 0 +# define DSO_F_DSO_LOAD 0 +# define DSO_F_DSO_MERGE 0 +# define DSO_F_DSO_NEW_METHOD 0 +# define DSO_F_DSO_PATHBYADDR 0 +# define DSO_F_DSO_SET_FILENAME 0 +# define DSO_F_DSO_UP_REF 0 +# define DSO_F_VMS_BIND_SYM 0 +# define DSO_F_VMS_LOAD 0 +# define DSO_F_VMS_MERGER 0 +# define DSO_F_VMS_UNLOAD 0 +# define DSO_F_WIN32_BIND_FUNC 0 +# define DSO_F_WIN32_GLOBALLOOKUP 0 +# define DSO_F_WIN32_JOINER 0 +# define DSO_F_WIN32_LOAD 0 +# define DSO_F_WIN32_MERGER 0 +# define DSO_F_WIN32_NAME_CONVERTER 0 +# define DSO_F_WIN32_PATHBYADDR 0 +# define DSO_F_WIN32_SPLITTER 0 +# define DSO_F_WIN32_UNLOAD 0 +# endif /* * DSO reason codes. */ -# define DSO_R_CTRL_FAILED 100 -# define DSO_R_DSO_ALREADY_LOADED 110 -# define DSO_R_EMPTY_FILE_STRUCTURE 113 -# define DSO_R_FAILURE 114 -# define DSO_R_FILENAME_TOO_BIG 101 -# define DSO_R_FINISH_FAILED 102 -# define DSO_R_INCORRECT_FILE_SYNTAX 115 -# define DSO_R_LOAD_FAILED 103 -# define DSO_R_NAME_TRANSLATION_FAILED 109 -# define DSO_R_NO_FILENAME 111 -# define DSO_R_NULL_HANDLE 104 -# define DSO_R_SET_FILENAME_FAILED 112 -# define DSO_R_STACK_ERROR 105 -# define DSO_R_SYM_FAILURE 106 -# define DSO_R_UNLOAD_FAILED 107 -# define DSO_R_UNSUPPORTED 108 +# define DSO_R_CTRL_FAILED 100 +# define DSO_R_DSO_ALREADY_LOADED 110 +# define DSO_R_EMPTY_FILE_STRUCTURE 113 +# define DSO_R_FAILURE 114 +# define DSO_R_FILENAME_TOO_BIG 101 +# define DSO_R_FINISH_FAILED 102 +# define DSO_R_INCORRECT_FILE_SYNTAX 115 +# define DSO_R_LOAD_FAILED 103 +# define DSO_R_NAME_TRANSLATION_FAILED 109 +# define DSO_R_NO_FILENAME 111 +# define DSO_R_NULL_HANDLE 104 +# define DSO_R_SET_FILENAME_FAILED 112 +# define DSO_R_STACK_ERROR 105 +# define DSO_R_SYM_FAILURE 106 +# define DSO_R_UNLOAD_FAILED 107 +# define DSO_R_UNSUPPORTED 108 #endif |