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

Side by Side Diff: openssl/crypto/conf/conf_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/conf/conf_def.c ('k') | openssl/crypto/conf/conf_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/conf/conf_err.c */ 1 /* crypto/conf/conf_err.c */
2 /* ==================================================================== 2 /* ====================================================================
3 * Copyright (c) 1999-2005 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 1999-2007 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_CONF,func,0) 68 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_CONF,func,0)
69 #define ERR_REASON(reason) ERR_PACK(ERR_LIB_CONF,0,reason) 69 #define ERR_REASON(reason) ERR_PACK(ERR_LIB_CONF,0,reason)
70 70
71 static ERR_STRING_DATA CONF_str_functs[]= 71 static ERR_STRING_DATA CONF_str_functs[]=
72 { 72 {
73 {ERR_FUNC(CONF_F_CONF_DUMP_FP), "CONF_dump_fp"}, 73 {ERR_FUNC(CONF_F_CONF_DUMP_FP), "CONF_dump_fp"},
74 {ERR_FUNC(CONF_F_CONF_LOAD), "CONF_load"}, 74 {ERR_FUNC(CONF_F_CONF_LOAD), "CONF_load"},
75 {ERR_FUNC(CONF_F_CONF_LOAD_BIO), "CONF_load_bio"}, 75 {ERR_FUNC(CONF_F_CONF_LOAD_BIO), "CONF_load_bio"},
76 {ERR_FUNC(CONF_F_CONF_LOAD_FP), "CONF_load_fp"}, 76 {ERR_FUNC(CONF_F_CONF_LOAD_FP), "CONF_load_fp"},
77 {ERR_FUNC(CONF_F_CONF_MODULES_LOAD), "CONF_modules_load"}, 77 {ERR_FUNC(CONF_F_CONF_MODULES_LOAD), "CONF_modules_load"},
78 {ERR_FUNC(CONF_F_CONF_PARSE_LIST), "CONF_parse_list"},
78 {ERR_FUNC(CONF_F_DEF_LOAD), "DEF_LOAD"}, 79 {ERR_FUNC(CONF_F_DEF_LOAD), "DEF_LOAD"},
79 {ERR_FUNC(CONF_F_DEF_LOAD_BIO), "DEF_LOAD_BIO"}, 80 {ERR_FUNC(CONF_F_DEF_LOAD_BIO), "DEF_LOAD_BIO"},
80 {ERR_FUNC(CONF_F_MODULE_INIT), "MODULE_INIT"}, 81 {ERR_FUNC(CONF_F_MODULE_INIT), "MODULE_INIT"},
81 {ERR_FUNC(CONF_F_MODULE_LOAD_DSO), "MODULE_LOAD_DSO"}, 82 {ERR_FUNC(CONF_F_MODULE_LOAD_DSO), "MODULE_LOAD_DSO"},
82 {ERR_FUNC(CONF_F_MODULE_RUN), "MODULE_RUN"}, 83 {ERR_FUNC(CONF_F_MODULE_RUN), "MODULE_RUN"},
83 {ERR_FUNC(CONF_F_NCONF_DUMP_BIO), "NCONF_dump_bio"}, 84 {ERR_FUNC(CONF_F_NCONF_DUMP_BIO), "NCONF_dump_bio"},
84 {ERR_FUNC(CONF_F_NCONF_DUMP_FP), "NCONF_dump_fp"}, 85 {ERR_FUNC(CONF_F_NCONF_DUMP_FP), "NCONF_dump_fp"},
85 {ERR_FUNC(CONF_F_NCONF_GET_NUMBER), "NCONF_get_number"}, 86 {ERR_FUNC(CONF_F_NCONF_GET_NUMBER), "NCONF_get_number"},
86 {ERR_FUNC(CONF_F_NCONF_GET_NUMBER_E), "NCONF_get_number_e"}, 87 {ERR_FUNC(CONF_F_NCONF_GET_NUMBER_E), "NCONF_get_number_e"},
87 {ERR_FUNC(CONF_F_NCONF_GET_SECTION), "NCONF_get_section"}, 88 {ERR_FUNC(CONF_F_NCONF_GET_SECTION), "NCONF_get_section"},
88 {ERR_FUNC(CONF_F_NCONF_GET_STRING), "NCONF_get_string"}, 89 {ERR_FUNC(CONF_F_NCONF_GET_STRING), "NCONF_get_string"},
89 {ERR_FUNC(CONF_F_NCONF_LOAD), "NCONF_load"}, 90 {ERR_FUNC(CONF_F_NCONF_LOAD), "NCONF_load"},
90 {ERR_FUNC(CONF_F_NCONF_LOAD_BIO), "NCONF_load_bio"}, 91 {ERR_FUNC(CONF_F_NCONF_LOAD_BIO), "NCONF_load_bio"},
91 {ERR_FUNC(CONF_F_NCONF_LOAD_FP), "NCONF_load_fp"}, 92 {ERR_FUNC(CONF_F_NCONF_LOAD_FP), "NCONF_load_fp"},
92 {ERR_FUNC(CONF_F_NCONF_NEW), "NCONF_new"}, 93 {ERR_FUNC(CONF_F_NCONF_NEW), "NCONF_new"},
93 {ERR_FUNC(CONF_F_STR_COPY), "STR_COPY"}, 94 {ERR_FUNC(CONF_F_STR_COPY), "STR_COPY"},
94 {0,NULL} 95 {0,NULL}
95 }; 96 };
96 97
97 static ERR_STRING_DATA CONF_str_reasons[]= 98 static ERR_STRING_DATA CONF_str_reasons[]=
98 { 99 {
99 {ERR_REASON(CONF_R_ERROR_LOADING_DSO) ,"error loading dso"}, 100 {ERR_REASON(CONF_R_ERROR_LOADING_DSO) ,"error loading dso"},
101 {ERR_REASON(CONF_R_LIST_CANNOT_BE_NULL) ,"list cannot be null"},
100 {ERR_REASON(CONF_R_MISSING_CLOSE_SQUARE_BRACKET),"missing close square bracket"} , 102 {ERR_REASON(CONF_R_MISSING_CLOSE_SQUARE_BRACKET),"missing close square bracket"} ,
101 {ERR_REASON(CONF_R_MISSING_EQUAL_SIGN) ,"missing equal sign"}, 103 {ERR_REASON(CONF_R_MISSING_EQUAL_SIGN) ,"missing equal sign"},
102 {ERR_REASON(CONF_R_MISSING_FINISH_FUNCTION),"missing finish function"}, 104 {ERR_REASON(CONF_R_MISSING_FINISH_FUNCTION),"missing finish function"},
103 {ERR_REASON(CONF_R_MISSING_INIT_FUNCTION),"missing init function"}, 105 {ERR_REASON(CONF_R_MISSING_INIT_FUNCTION),"missing init function"},
104 {ERR_REASON(CONF_R_MODULE_INITIALIZATION_ERROR),"module initialization error"}, 106 {ERR_REASON(CONF_R_MODULE_INITIALIZATION_ERROR),"module initialization error"},
105 {ERR_REASON(CONF_R_NO_CLOSE_BRACE) ,"no close brace"}, 107 {ERR_REASON(CONF_R_NO_CLOSE_BRACE) ,"no close brace"},
106 {ERR_REASON(CONF_R_NO_CONF) ,"no conf"}, 108 {ERR_REASON(CONF_R_NO_CONF) ,"no conf"},
107 {ERR_REASON(CONF_R_NO_CONF_OR_ENVIRONMENT_VARIABLE),"no conf or environment vari able"}, 109 {ERR_REASON(CONF_R_NO_CONF_OR_ENVIRONMENT_VARIABLE),"no conf or environment vari able"},
108 {ERR_REASON(CONF_R_NO_SECTION) ,"no section"}, 110 {ERR_REASON(CONF_R_NO_SECTION) ,"no section"},
109 {ERR_REASON(CONF_R_NO_SUCH_FILE) ,"no such file"}, 111 {ERR_REASON(CONF_R_NO_SUCH_FILE) ,"no such file"},
(...skipping 10 matching lines...) Expand all
120 { 122 {
121 #ifndef OPENSSL_NO_ERR 123 #ifndef OPENSSL_NO_ERR
122 124
123 if (ERR_func_error_string(CONF_str_functs[0].error) == NULL) 125 if (ERR_func_error_string(CONF_str_functs[0].error) == NULL)
124 { 126 {
125 ERR_load_strings(0,CONF_str_functs); 127 ERR_load_strings(0,CONF_str_functs);
126 ERR_load_strings(0,CONF_str_reasons); 128 ERR_load_strings(0,CONF_str_reasons);
127 } 129 }
128 #endif 130 #endif
129 } 131 }
OLDNEW
« no previous file with comments | « openssl/crypto/conf/conf_def.c ('k') | openssl/crypto/conf/conf_lib.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698