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

Side by Side Diff: openssl/crypto/engine/eng_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/engine/eng_dyn.c ('k') | openssl/crypto/engine/eng_fat.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/engine/eng_err.c */ 1 /* crypto/engine/eng_err.c */
2 /* ==================================================================== 2 /* ====================================================================
3 * Copyright (c) 1999-2010 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 1999-2010 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.
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 {ERR_FUNC(ENGINE_F_ENGINE_CMD_IS_EXECUTABLE), "ENGINE_cmd_is_executable"}, 79 {ERR_FUNC(ENGINE_F_ENGINE_CMD_IS_EXECUTABLE), "ENGINE_cmd_is_executable"},
80 {ERR_FUNC(ENGINE_F_ENGINE_CTRL), "ENGINE_ctrl"}, 80 {ERR_FUNC(ENGINE_F_ENGINE_CTRL), "ENGINE_ctrl"},
81 {ERR_FUNC(ENGINE_F_ENGINE_CTRL_CMD), "ENGINE_ctrl_cmd"}, 81 {ERR_FUNC(ENGINE_F_ENGINE_CTRL_CMD), "ENGINE_ctrl_cmd"},
82 {ERR_FUNC(ENGINE_F_ENGINE_CTRL_CMD_STRING), "ENGINE_ctrl_cmd_string"}, 82 {ERR_FUNC(ENGINE_F_ENGINE_CTRL_CMD_STRING), "ENGINE_ctrl_cmd_string"},
83 {ERR_FUNC(ENGINE_F_ENGINE_FINISH), "ENGINE_finish"}, 83 {ERR_FUNC(ENGINE_F_ENGINE_FINISH), "ENGINE_finish"},
84 {ERR_FUNC(ENGINE_F_ENGINE_FREE_UTIL), "ENGINE_FREE_UTIL"}, 84 {ERR_FUNC(ENGINE_F_ENGINE_FREE_UTIL), "ENGINE_FREE_UTIL"},
85 {ERR_FUNC(ENGINE_F_ENGINE_GET_CIPHER), "ENGINE_get_cipher"}, 85 {ERR_FUNC(ENGINE_F_ENGINE_GET_CIPHER), "ENGINE_get_cipher"},
86 {ERR_FUNC(ENGINE_F_ENGINE_GET_DEFAULT_TYPE), "ENGINE_GET_DEFAULT_TYPE"}, 86 {ERR_FUNC(ENGINE_F_ENGINE_GET_DEFAULT_TYPE), "ENGINE_GET_DEFAULT_TYPE"},
87 {ERR_FUNC(ENGINE_F_ENGINE_GET_DIGEST), "ENGINE_get_digest"}, 87 {ERR_FUNC(ENGINE_F_ENGINE_GET_DIGEST), "ENGINE_get_digest"},
88 {ERR_FUNC(ENGINE_F_ENGINE_GET_NEXT), "ENGINE_get_next"}, 88 {ERR_FUNC(ENGINE_F_ENGINE_GET_NEXT), "ENGINE_get_next"},
89 {ERR_FUNC(ENGINE_F_ENGINE_GET_PKEY_ASN1_METH), "ENGINE_get_pkey_asn1_meth"},
90 {ERR_FUNC(ENGINE_F_ENGINE_GET_PKEY_METH), "ENGINE_get_pkey_meth"},
89 {ERR_FUNC(ENGINE_F_ENGINE_GET_PREV), "ENGINE_get_prev"}, 91 {ERR_FUNC(ENGINE_F_ENGINE_GET_PREV), "ENGINE_get_prev"},
90 {ERR_FUNC(ENGINE_F_ENGINE_INIT), "ENGINE_init"}, 92 {ERR_FUNC(ENGINE_F_ENGINE_INIT), "ENGINE_init"},
91 {ERR_FUNC(ENGINE_F_ENGINE_LIST_ADD), "ENGINE_LIST_ADD"}, 93 {ERR_FUNC(ENGINE_F_ENGINE_LIST_ADD), "ENGINE_LIST_ADD"},
92 {ERR_FUNC(ENGINE_F_ENGINE_LIST_REMOVE), "ENGINE_LIST_REMOVE"}, 94 {ERR_FUNC(ENGINE_F_ENGINE_LIST_REMOVE), "ENGINE_LIST_REMOVE"},
93 {ERR_FUNC(ENGINE_F_ENGINE_LOAD_PRIVATE_KEY), "ENGINE_load_private_key"}, 95 {ERR_FUNC(ENGINE_F_ENGINE_LOAD_PRIVATE_KEY), "ENGINE_load_private_key"},
94 {ERR_FUNC(ENGINE_F_ENGINE_LOAD_PUBLIC_KEY), "ENGINE_load_public_key"}, 96 {ERR_FUNC(ENGINE_F_ENGINE_LOAD_PUBLIC_KEY), "ENGINE_load_public_key"},
95 {ERR_FUNC(ENGINE_F_ENGINE_LOAD_SSL_CLIENT_CERT), "ENGINE_load_ssl_client_ cert"}, 97 {ERR_FUNC(ENGINE_F_ENGINE_LOAD_SSL_CLIENT_CERT), "ENGINE_load_ssl_client_ cert"},
96 {ERR_FUNC(ENGINE_F_ENGINE_NEW), "ENGINE_new"}, 98 {ERR_FUNC(ENGINE_F_ENGINE_NEW), "ENGINE_new"},
97 {ERR_FUNC(ENGINE_F_ENGINE_REMOVE), "ENGINE_remove"}, 99 {ERR_FUNC(ENGINE_F_ENGINE_REMOVE), "ENGINE_remove"},
98 {ERR_FUNC(ENGINE_F_ENGINE_SET_DEFAULT_STRING), "ENGINE_set_default_string"}, 100 {ERR_FUNC(ENGINE_F_ENGINE_SET_DEFAULT_STRING), "ENGINE_set_default_string"},
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 {ERR_REASON(ENGINE_R_NO_CONTROL_FUNCTION),"no control function"}, 146 {ERR_REASON(ENGINE_R_NO_CONTROL_FUNCTION),"no control function"},
145 {ERR_REASON(ENGINE_R_NO_INDEX) ,"no index"}, 147 {ERR_REASON(ENGINE_R_NO_INDEX) ,"no index"},
146 {ERR_REASON(ENGINE_R_NO_LOAD_FUNCTION) ,"no load function"}, 148 {ERR_REASON(ENGINE_R_NO_LOAD_FUNCTION) ,"no load function"},
147 {ERR_REASON(ENGINE_R_NO_REFERENCE) ,"no reference"}, 149 {ERR_REASON(ENGINE_R_NO_REFERENCE) ,"no reference"},
148 {ERR_REASON(ENGINE_R_NO_SUCH_ENGINE) ,"no such engine"}, 150 {ERR_REASON(ENGINE_R_NO_SUCH_ENGINE) ,"no such engine"},
149 {ERR_REASON(ENGINE_R_NO_UNLOAD_FUNCTION) ,"no unload function"}, 151 {ERR_REASON(ENGINE_R_NO_UNLOAD_FUNCTION) ,"no unload function"},
150 {ERR_REASON(ENGINE_R_PROVIDE_PARAMETERS) ,"provide parameters"}, 152 {ERR_REASON(ENGINE_R_PROVIDE_PARAMETERS) ,"provide parameters"},
151 {ERR_REASON(ENGINE_R_RSA_NOT_IMPLEMENTED),"rsa not implemented"}, 153 {ERR_REASON(ENGINE_R_RSA_NOT_IMPLEMENTED),"rsa not implemented"},
152 {ERR_REASON(ENGINE_R_UNIMPLEMENTED_CIPHER),"unimplemented cipher"}, 154 {ERR_REASON(ENGINE_R_UNIMPLEMENTED_CIPHER),"unimplemented cipher"},
153 {ERR_REASON(ENGINE_R_UNIMPLEMENTED_DIGEST),"unimplemented digest"}, 155 {ERR_REASON(ENGINE_R_UNIMPLEMENTED_DIGEST),"unimplemented digest"},
156 {ERR_REASON(ENGINE_R_UNIMPLEMENTED_PUBLIC_KEY_METHOD),"unimplemented public key method"},
154 {ERR_REASON(ENGINE_R_VERSION_INCOMPATIBILITY),"version incompatibility"}, 157 {ERR_REASON(ENGINE_R_VERSION_INCOMPATIBILITY),"version incompatibility"},
155 {0,NULL} 158 {0,NULL}
156 }; 159 };
157 160
158 #endif 161 #endif
159 162
160 void ERR_load_ENGINE_strings(void) 163 void ERR_load_ENGINE_strings(void)
161 { 164 {
162 #ifndef OPENSSL_NO_ERR 165 #ifndef OPENSSL_NO_ERR
163 166
164 if (ERR_func_error_string(ENGINE_str_functs[0].error) == NULL) 167 if (ERR_func_error_string(ENGINE_str_functs[0].error) == NULL)
165 { 168 {
166 ERR_load_strings(0,ENGINE_str_functs); 169 ERR_load_strings(0,ENGINE_str_functs);
167 ERR_load_strings(0,ENGINE_str_reasons); 170 ERR_load_strings(0,ENGINE_str_reasons);
168 } 171 }
169 #endif 172 #endif
170 } 173 }
OLDNEW
« no previous file with comments | « openssl/crypto/engine/eng_dyn.c ('k') | openssl/crypto/engine/eng_fat.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698