Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(481)

Side by Side Diff: openssl/crypto/dso/dso_err.c

Issue 9254031: Upgrade chrome's OpenSSL to same version Android ships with. (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/openssl/
Patch Set: '' Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « openssl/crypto/dso/dso_dlfcn.c ('k') | openssl/crypto/dso/dso_lib.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* crypto/dso/dso_err.c */ 1 /* crypto/dso/dso_err.c */
2 /* ==================================================================== 2 /* ====================================================================
3 * Copyright (c) 1999-2005 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 1999-2006 The OpenSSL Project. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
11 * 11 *
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in 13 * notice, this list of conditions and the following disclaimer in
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 #include <openssl/dso.h> 63 #include <openssl/dso.h>
64 64
65 /* BEGIN ERROR CODES */ 65 /* BEGIN ERROR CODES */
66 #ifndef OPENSSL_NO_ERR 66 #ifndef OPENSSL_NO_ERR
67 67
68 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_DSO,func,0) 68 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_DSO,func,0)
69 #define ERR_REASON(reason) ERR_PACK(ERR_LIB_DSO,0,reason) 69 #define ERR_REASON(reason) ERR_PACK(ERR_LIB_DSO,0,reason)
70 70
71 static ERR_STRING_DATA DSO_str_functs[]= 71 static ERR_STRING_DATA DSO_str_functs[]=
72 { 72 {
73 {ERR_FUNC(DSO_F_BEOS_BIND_FUNC), "BEOS_BIND_FUNC"},
74 {ERR_FUNC(DSO_F_BEOS_BIND_VAR), "BEOS_BIND_VAR"},
75 {ERR_FUNC(DSO_F_BEOS_LOAD), "BEOS_LOAD"},
76 {ERR_FUNC(DSO_F_BEOS_NAME_CONVERTER), "BEOS_NAME_CONVERTER"},
77 {ERR_FUNC(DSO_F_BEOS_UNLOAD), "BEOS_UNLOAD"},
73 {ERR_FUNC(DSO_F_DLFCN_BIND_FUNC), "DLFCN_BIND_FUNC"}, 78 {ERR_FUNC(DSO_F_DLFCN_BIND_FUNC), "DLFCN_BIND_FUNC"},
74 {ERR_FUNC(DSO_F_DLFCN_BIND_VAR), "DLFCN_BIND_VAR"}, 79 {ERR_FUNC(DSO_F_DLFCN_BIND_VAR), "DLFCN_BIND_VAR"},
75 {ERR_FUNC(DSO_F_DLFCN_LOAD), "DLFCN_LOAD"}, 80 {ERR_FUNC(DSO_F_DLFCN_LOAD), "DLFCN_LOAD"},
76 {ERR_FUNC(DSO_F_DLFCN_MERGER), "DLFCN_MERGER"}, 81 {ERR_FUNC(DSO_F_DLFCN_MERGER), "DLFCN_MERGER"},
77 {ERR_FUNC(DSO_F_DLFCN_NAME_CONVERTER), "DLFCN_NAME_CONVERTER"}, 82 {ERR_FUNC(DSO_F_DLFCN_NAME_CONVERTER), "DLFCN_NAME_CONVERTER"},
78 {ERR_FUNC(DSO_F_DLFCN_UNLOAD), "DLFCN_UNLOAD"}, 83 {ERR_FUNC(DSO_F_DLFCN_UNLOAD), "DLFCN_UNLOAD"},
79 {ERR_FUNC(DSO_F_DL_BIND_FUNC), "DL_BIND_FUNC"}, 84 {ERR_FUNC(DSO_F_DL_BIND_FUNC), "DL_BIND_FUNC"},
80 {ERR_FUNC(DSO_F_DL_BIND_VAR), "DL_BIND_VAR"}, 85 {ERR_FUNC(DSO_F_DL_BIND_VAR), "DL_BIND_VAR"},
81 {ERR_FUNC(DSO_F_DL_LOAD), "DL_LOAD"}, 86 {ERR_FUNC(DSO_F_DL_LOAD), "DL_LOAD"},
82 {ERR_FUNC(DSO_F_DL_MERGER), "DL_MERGER"}, 87 {ERR_FUNC(DSO_F_DL_MERGER), "DL_MERGER"},
83 {ERR_FUNC(DSO_F_DL_NAME_CONVERTER), "DL_NAME_CONVERTER"}, 88 {ERR_FUNC(DSO_F_DL_NAME_CONVERTER), "DL_NAME_CONVERTER"},
84 {ERR_FUNC(DSO_F_DL_UNLOAD), "DL_UNLOAD"}, 89 {ERR_FUNC(DSO_F_DL_UNLOAD), "DL_UNLOAD"},
85 {ERR_FUNC(DSO_F_DSO_BIND_FUNC), "DSO_bind_func"}, 90 {ERR_FUNC(DSO_F_DSO_BIND_FUNC), "DSO_bind_func"},
86 {ERR_FUNC(DSO_F_DSO_BIND_VAR), "DSO_bind_var"}, 91 {ERR_FUNC(DSO_F_DSO_BIND_VAR), "DSO_bind_var"},
87 {ERR_FUNC(DSO_F_DSO_CONVERT_FILENAME), "DSO_convert_filename"}, 92 {ERR_FUNC(DSO_F_DSO_CONVERT_FILENAME), "DSO_convert_filename"},
88 {ERR_FUNC(DSO_F_DSO_CTRL), "DSO_ctrl"}, 93 {ERR_FUNC(DSO_F_DSO_CTRL), "DSO_ctrl"},
89 {ERR_FUNC(DSO_F_DSO_FREE), "DSO_free"}, 94 {ERR_FUNC(DSO_F_DSO_FREE), "DSO_free"},
90 {ERR_FUNC(DSO_F_DSO_GET_FILENAME), "DSO_get_filename"}, 95 {ERR_FUNC(DSO_F_DSO_GET_FILENAME), "DSO_get_filename"},
91 {ERR_FUNC(DSO_F_DSO_GET_LOADED_FILENAME), "DSO_get_loaded_filename"}, 96 {ERR_FUNC(DSO_F_DSO_GET_LOADED_FILENAME), "DSO_get_loaded_filename"},
97 {ERR_FUNC(DSO_F_DSO_GLOBAL_LOOKUP), "DSO_global_lookup"},
92 {ERR_FUNC(DSO_F_DSO_LOAD), "DSO_load"}, 98 {ERR_FUNC(DSO_F_DSO_LOAD), "DSO_load"},
93 {ERR_FUNC(DSO_F_DSO_MERGE), "DSO_merge"}, 99 {ERR_FUNC(DSO_F_DSO_MERGE), "DSO_merge"},
94 {ERR_FUNC(DSO_F_DSO_NEW_METHOD), "DSO_new_method"}, 100 {ERR_FUNC(DSO_F_DSO_NEW_METHOD), "DSO_new_method"},
101 {ERR_FUNC(DSO_F_DSO_PATHBYADDR), "DSO_pathbyaddr"},
95 {ERR_FUNC(DSO_F_DSO_SET_FILENAME), "DSO_set_filename"}, 102 {ERR_FUNC(DSO_F_DSO_SET_FILENAME), "DSO_set_filename"},
96 {ERR_FUNC(DSO_F_DSO_SET_NAME_CONVERTER), "DSO_set_name_converter"}, 103 {ERR_FUNC(DSO_F_DSO_SET_NAME_CONVERTER), "DSO_set_name_converter"},
97 {ERR_FUNC(DSO_F_DSO_UP_REF), "DSO_up_ref"}, 104 {ERR_FUNC(DSO_F_DSO_UP_REF), "DSO_up_ref"},
105 {ERR_FUNC(DSO_F_GLOBAL_LOOKUP_FUNC), "GLOBAL_LOOKUP_FUNC"},
106 {ERR_FUNC(DSO_F_PATHBYADDR), "PATHBYADDR"},
98 {ERR_FUNC(DSO_F_VMS_BIND_SYM), "VMS_BIND_SYM"}, 107 {ERR_FUNC(DSO_F_VMS_BIND_SYM), "VMS_BIND_SYM"},
99 {ERR_FUNC(DSO_F_VMS_LOAD), "VMS_LOAD"}, 108 {ERR_FUNC(DSO_F_VMS_LOAD), "VMS_LOAD"},
100 {ERR_FUNC(DSO_F_VMS_MERGER), "VMS_MERGER"}, 109 {ERR_FUNC(DSO_F_VMS_MERGER), "VMS_MERGER"},
101 {ERR_FUNC(DSO_F_VMS_UNLOAD), "VMS_UNLOAD"}, 110 {ERR_FUNC(DSO_F_VMS_UNLOAD), "VMS_UNLOAD"},
102 {ERR_FUNC(DSO_F_WIN32_BIND_FUNC), "WIN32_BIND_FUNC"}, 111 {ERR_FUNC(DSO_F_WIN32_BIND_FUNC), "WIN32_BIND_FUNC"},
103 {ERR_FUNC(DSO_F_WIN32_BIND_VAR), "WIN32_BIND_VAR"}, 112 {ERR_FUNC(DSO_F_WIN32_BIND_VAR), "WIN32_BIND_VAR"},
113 {ERR_FUNC(DSO_F_WIN32_GLOBALLOOKUP), "WIN32_GLOBALLOOKUP"},
114 {ERR_FUNC(DSO_F_WIN32_GLOBALLOOKUP_FUNC), "WIN32_GLOBALLOOKUP_FUNC"},
104 {ERR_FUNC(DSO_F_WIN32_JOINER), "WIN32_JOINER"}, 115 {ERR_FUNC(DSO_F_WIN32_JOINER), "WIN32_JOINER"},
105 {ERR_FUNC(DSO_F_WIN32_LOAD), "WIN32_LOAD"}, 116 {ERR_FUNC(DSO_F_WIN32_LOAD), "WIN32_LOAD"},
106 {ERR_FUNC(DSO_F_WIN32_MERGER), "WIN32_MERGER"}, 117 {ERR_FUNC(DSO_F_WIN32_MERGER), "WIN32_MERGER"},
107 {ERR_FUNC(DSO_F_WIN32_NAME_CONVERTER), "WIN32_NAME_CONVERTER"}, 118 {ERR_FUNC(DSO_F_WIN32_NAME_CONVERTER), "WIN32_NAME_CONVERTER"},
119 {ERR_FUNC(DSO_F_WIN32_PATHBYADDR), "WIN32_PATHBYADDR"},
108 {ERR_FUNC(DSO_F_WIN32_SPLITTER), "WIN32_SPLITTER"}, 120 {ERR_FUNC(DSO_F_WIN32_SPLITTER), "WIN32_SPLITTER"},
109 {ERR_FUNC(DSO_F_WIN32_UNLOAD), "WIN32_UNLOAD"}, 121 {ERR_FUNC(DSO_F_WIN32_UNLOAD), "WIN32_UNLOAD"},
110 {0,NULL} 122 {0,NULL}
111 }; 123 };
112 124
113 static ERR_STRING_DATA DSO_str_reasons[]= 125 static ERR_STRING_DATA DSO_str_reasons[]=
114 { 126 {
115 {ERR_REASON(DSO_R_CTRL_FAILED) ,"control command failed"}, 127 {ERR_REASON(DSO_R_CTRL_FAILED) ,"control command failed"},
116 {ERR_REASON(DSO_R_DSO_ALREADY_LOADED) ,"dso already loaded"}, 128 {ERR_REASON(DSO_R_DSO_ALREADY_LOADED) ,"dso already loaded"},
117 {ERR_REASON(DSO_R_EMPTY_FILE_STRUCTURE) ,"empty file structure"}, 129 {ERR_REASON(DSO_R_EMPTY_FILE_STRUCTURE) ,"empty file structure"},
(...skipping 20 matching lines...) Expand all
138 { 150 {
139 #ifndef OPENSSL_NO_ERR 151 #ifndef OPENSSL_NO_ERR
140 152
141 if (ERR_func_error_string(DSO_str_functs[0].error) == NULL) 153 if (ERR_func_error_string(DSO_str_functs[0].error) == NULL)
142 { 154 {
143 ERR_load_strings(0,DSO_str_functs); 155 ERR_load_strings(0,DSO_str_functs);
144 ERR_load_strings(0,DSO_str_reasons); 156 ERR_load_strings(0,DSO_str_reasons);
145 } 157 }
146 #endif 158 #endif
147 } 159 }
OLDNEW
« no previous file with comments | « openssl/crypto/dso/dso_dlfcn.c ('k') | openssl/crypto/dso/dso_lib.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698