summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/conf/conf_err.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/conf/conf_err.c')
-rw-r--r--src/lib/libcrypto/conf/conf_err.c109
1 files changed, 53 insertions, 56 deletions
diff --git a/src/lib/libcrypto/conf/conf_err.c b/src/lib/libcrypto/conf/conf_err.c
index 25bb5dc9aa..94feb5ec94 100644
--- a/src/lib/libcrypto/conf/conf_err.c
+++ b/src/lib/libcrypto/conf/conf_err.c
@@ -7,7 +7,7 @@
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
@@ -68,64 +68,61 @@
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
71static ERR_STRING_DATA CONF_str_functs[]= 71static ERR_STRING_DATA CONF_str_functs[]= {
72 { 72 {ERR_FUNC(CONF_F_CONF_DUMP_FP), "CONF_dump_fp"},
73{ERR_FUNC(CONF_F_CONF_DUMP_FP), "CONF_dump_fp"}, 73 {ERR_FUNC(CONF_F_CONF_LOAD), "CONF_load"},
74{ERR_FUNC(CONF_F_CONF_LOAD), "CONF_load"}, 74 {ERR_FUNC(CONF_F_CONF_LOAD_BIO), "CONF_load_bio"},
75{ERR_FUNC(CONF_F_CONF_LOAD_BIO), "CONF_load_bio"}, 75 {ERR_FUNC(CONF_F_CONF_LOAD_FP), "CONF_load_fp"},
76{ERR_FUNC(CONF_F_CONF_LOAD_FP), "CONF_load_fp"}, 76 {ERR_FUNC(CONF_F_CONF_MODULES_LOAD), "CONF_modules_load"},
77{ERR_FUNC(CONF_F_CONF_MODULES_LOAD), "CONF_modules_load"}, 77 {ERR_FUNC(CONF_F_CONF_PARSE_LIST), "CONF_parse_list"},
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 };
97 96
98static ERR_STRING_DATA CONF_str_reasons[]= 97static ERR_STRING_DATA CONF_str_reasons[]= {
99 { 98 {ERR_REASON(CONF_R_ERROR_LOADING_DSO) , "error loading dso"},
100{ERR_REASON(CONF_R_ERROR_LOADING_DSO) ,"error loading dso"}, 99 {ERR_REASON(CONF_R_LIST_CANNOT_BE_NULL) , "list cannot be null"},
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 variable"},
109{ERR_REASON(CONF_R_NO_CONF_OR_ENVIRONMENT_VARIABLE),"no conf or environment variable"}, 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"}, 110 {ERR_REASON(CONF_R_NO_VALUE) , "no value"},
112{ERR_REASON(CONF_R_NO_VALUE) ,"no value"}, 111 {ERR_REASON(CONF_R_UNABLE_TO_CREATE_NEW_SECTION), "unable to create new section"},
113{ERR_REASON(CONF_R_UNABLE_TO_CREATE_NEW_SECTION),"unable to create new section"}, 112 {ERR_REASON(CONF_R_UNKNOWN_MODULE_NAME) , "unknown module name"},
114{ERR_REASON(CONF_R_UNKNOWN_MODULE_NAME) ,"unknown module name"}, 113 {ERR_REASON(CONF_R_VARIABLE_HAS_NO_VALUE), "variable has no value"},
115{ERR_REASON(CONF_R_VARIABLE_HAS_NO_VALUE),"variable has no value"}, 114 {0, NULL}
116{0,NULL} 115};
117 };
118 116
119#endif 117#endif
120 118
121void ERR_load_CONF_strings(void) 119void
122 { 120ERR_load_CONF_strings(void)
121{
123#ifndef OPENSSL_NO_ERR 122#ifndef OPENSSL_NO_ERR
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 ERR_load_strings(0, CONF_str_functs);
126 { 125 ERR_load_strings(0, CONF_str_reasons);
127 ERR_load_strings(0,CONF_str_functs);
128 ERR_load_strings(0,CONF_str_reasons);
129 }
130#endif
131 } 126 }
127#endif
128}