diff options
Diffstat (limited to 'src/lib/libcrypto/err')
-rw-r--r-- | src/lib/libcrypto/err/err.c | 782 | ||||
-rw-r--r-- | src/lib/libcrypto/err/err.h | 8 | ||||
-rw-r--r-- | src/lib/libcrypto/err/err_all.c | 13 | ||||
-rw-r--r-- | src/lib/libcrypto/err/err_prn.c | 70 | ||||
-rw-r--r-- | src/lib/libcrypto/err/openssl.ec | 2 |
5 files changed, 115 insertions, 760 deletions
diff --git a/src/lib/libcrypto/err/err.c b/src/lib/libcrypto/err/err.c index 7952e70ab0..292404a2fb 100644 --- a/src/lib/libcrypto/err/err.c +++ b/src/lib/libcrypto/err/err.c | |||
@@ -119,480 +119,9 @@ | |||
119 | #include <openssl/bio.h> | 119 | #include <openssl/bio.h> |
120 | #include <openssl/err.h> | 120 | #include <openssl/err.h> |
121 | 121 | ||
122 | static void err_load_strings(int lib, ERR_STRING_DATA *str); | 122 | static unsigned long get_error_values(int inc,int top, |
123 | 123 | const char **file,int *line, | |
124 | static void ERR_STATE_free(ERR_STATE *s); | 124 | const char **data,int *flags); |
125 | #ifndef OPENSSL_NO_ERR | ||
126 | static ERR_STRING_DATA ERR_str_libraries[]= | ||
127 | { | ||
128 | {ERR_PACK(ERR_LIB_NONE,0,0) ,"unknown library"}, | ||
129 | {ERR_PACK(ERR_LIB_SYS,0,0) ,"system library"}, | ||
130 | {ERR_PACK(ERR_LIB_BN,0,0) ,"bignum routines"}, | ||
131 | {ERR_PACK(ERR_LIB_RSA,0,0) ,"rsa routines"}, | ||
132 | {ERR_PACK(ERR_LIB_DH,0,0) ,"Diffie-Hellman routines"}, | ||
133 | {ERR_PACK(ERR_LIB_EVP,0,0) ,"digital envelope routines"}, | ||
134 | {ERR_PACK(ERR_LIB_BUF,0,0) ,"memory buffer routines"}, | ||
135 | {ERR_PACK(ERR_LIB_OBJ,0,0) ,"object identifier routines"}, | ||
136 | {ERR_PACK(ERR_LIB_PEM,0,0) ,"PEM routines"}, | ||
137 | {ERR_PACK(ERR_LIB_DSA,0,0) ,"dsa routines"}, | ||
138 | {ERR_PACK(ERR_LIB_X509,0,0) ,"x509 certificate routines"}, | ||
139 | {ERR_PACK(ERR_LIB_ASN1,0,0) ,"asn1 encoding routines"}, | ||
140 | {ERR_PACK(ERR_LIB_CONF,0,0) ,"configuration file routines"}, | ||
141 | {ERR_PACK(ERR_LIB_CRYPTO,0,0) ,"common libcrypto routines"}, | ||
142 | {ERR_PACK(ERR_LIB_EC,0,0) ,"elliptic curve routines"}, | ||
143 | {ERR_PACK(ERR_LIB_SSL,0,0) ,"SSL routines"}, | ||
144 | {ERR_PACK(ERR_LIB_BIO,0,0) ,"BIO routines"}, | ||
145 | {ERR_PACK(ERR_LIB_PKCS7,0,0) ,"PKCS7 routines"}, | ||
146 | {ERR_PACK(ERR_LIB_X509V3,0,0) ,"X509 V3 routines"}, | ||
147 | {ERR_PACK(ERR_LIB_PKCS12,0,0) ,"PKCS12 routines"}, | ||
148 | {ERR_PACK(ERR_LIB_RAND,0,0) ,"random number generator"}, | ||
149 | {ERR_PACK(ERR_LIB_DSO,0,0) ,"DSO support routines"}, | ||
150 | {ERR_PACK(ERR_LIB_ENGINE,0,0) ,"engine routines"}, | ||
151 | {ERR_PACK(ERR_LIB_OCSP,0,0) ,"OCSP routines"}, | ||
152 | {ERR_PACK(ERR_LIB_FIPS,0,0) ,"FIPS routines"}, | ||
153 | {ERR_PACK(ERR_LIB_CMS,0,0) ,"CMS routines"}, | ||
154 | {0,NULL}, | ||
155 | }; | ||
156 | |||
157 | static ERR_STRING_DATA ERR_str_functs[]= | ||
158 | { | ||
159 | {ERR_PACK(0,SYS_F_FOPEN,0), "fopen"}, | ||
160 | {ERR_PACK(0,SYS_F_CONNECT,0), "connect"}, | ||
161 | {ERR_PACK(0,SYS_F_GETSERVBYNAME,0), "getservbyname"}, | ||
162 | {ERR_PACK(0,SYS_F_SOCKET,0), "socket"}, | ||
163 | {ERR_PACK(0,SYS_F_IOCTLSOCKET,0), "ioctlsocket"}, | ||
164 | {ERR_PACK(0,SYS_F_BIND,0), "bind"}, | ||
165 | {ERR_PACK(0,SYS_F_LISTEN,0), "listen"}, | ||
166 | {ERR_PACK(0,SYS_F_ACCEPT,0), "accept"}, | ||
167 | #ifdef OPENSSL_SYS_WINDOWS | ||
168 | {ERR_PACK(0,SYS_F_WSASTARTUP,0), "WSAstartup"}, | ||
169 | #endif | ||
170 | {ERR_PACK(0,SYS_F_OPENDIR,0), "opendir"}, | ||
171 | {ERR_PACK(0,SYS_F_FREAD,0), "fread"}, | ||
172 | {0,NULL}, | ||
173 | }; | ||
174 | |||
175 | static ERR_STRING_DATA ERR_str_reasons[]= | ||
176 | { | ||
177 | {ERR_R_SYS_LIB ,"system lib"}, | ||
178 | {ERR_R_BN_LIB ,"BN lib"}, | ||
179 | {ERR_R_RSA_LIB ,"RSA lib"}, | ||
180 | {ERR_R_DH_LIB ,"DH lib"}, | ||
181 | {ERR_R_EVP_LIB ,"EVP lib"}, | ||
182 | {ERR_R_BUF_LIB ,"BUF lib"}, | ||
183 | {ERR_R_OBJ_LIB ,"OBJ lib"}, | ||
184 | {ERR_R_PEM_LIB ,"PEM lib"}, | ||
185 | {ERR_R_DSA_LIB ,"DSA lib"}, | ||
186 | {ERR_R_X509_LIB ,"X509 lib"}, | ||
187 | {ERR_R_ASN1_LIB ,"ASN1 lib"}, | ||
188 | {ERR_R_CONF_LIB ,"CONF lib"}, | ||
189 | {ERR_R_CRYPTO_LIB ,"CRYPTO lib"}, | ||
190 | {ERR_R_EC_LIB ,"EC lib"}, | ||
191 | {ERR_R_SSL_LIB ,"SSL lib"}, | ||
192 | {ERR_R_BIO_LIB ,"BIO lib"}, | ||
193 | {ERR_R_PKCS7_LIB ,"PKCS7 lib"}, | ||
194 | {ERR_R_X509V3_LIB ,"X509V3 lib"}, | ||
195 | {ERR_R_PKCS12_LIB ,"PKCS12 lib"}, | ||
196 | {ERR_R_RAND_LIB ,"RAND lib"}, | ||
197 | {ERR_R_DSO_LIB ,"DSO lib"}, | ||
198 | {ERR_R_ENGINE_LIB ,"ENGINE lib"}, | ||
199 | {ERR_R_OCSP_LIB ,"OCSP lib"}, | ||
200 | |||
201 | {ERR_R_NESTED_ASN1_ERROR ,"nested asn1 error"}, | ||
202 | {ERR_R_BAD_ASN1_OBJECT_HEADER ,"bad asn1 object header"}, | ||
203 | {ERR_R_BAD_GET_ASN1_OBJECT_CALL ,"bad get asn1 object call"}, | ||
204 | {ERR_R_EXPECTING_AN_ASN1_SEQUENCE ,"expecting an asn1 sequence"}, | ||
205 | {ERR_R_ASN1_LENGTH_MISMATCH ,"asn1 length mismatch"}, | ||
206 | {ERR_R_MISSING_ASN1_EOS ,"missing asn1 eos"}, | ||
207 | |||
208 | {ERR_R_FATAL ,"fatal"}, | ||
209 | {ERR_R_MALLOC_FAILURE ,"malloc failure"}, | ||
210 | {ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED ,"called a function you should not call"}, | ||
211 | {ERR_R_PASSED_NULL_PARAMETER ,"passed a null parameter"}, | ||
212 | {ERR_R_INTERNAL_ERROR ,"internal error"}, | ||
213 | {ERR_R_DISABLED ,"called a function that was disabled at compile-time"}, | ||
214 | |||
215 | {0,NULL}, | ||
216 | }; | ||
217 | #endif | ||
218 | |||
219 | |||
220 | /* Define the predeclared (but externally opaque) "ERR_FNS" type */ | ||
221 | struct st_ERR_FNS | ||
222 | { | ||
223 | /* Works on the "error_hash" string table */ | ||
224 | LHASH *(*cb_err_get)(int create); | ||
225 | void (*cb_err_del)(void); | ||
226 | ERR_STRING_DATA *(*cb_err_get_item)(const ERR_STRING_DATA *); | ||
227 | ERR_STRING_DATA *(*cb_err_set_item)(ERR_STRING_DATA *); | ||
228 | ERR_STRING_DATA *(*cb_err_del_item)(ERR_STRING_DATA *); | ||
229 | /* Works on the "thread_hash" error-state table */ | ||
230 | LHASH *(*cb_thread_get)(int create); | ||
231 | void (*cb_thread_release)(LHASH **hash); | ||
232 | ERR_STATE *(*cb_thread_get_item)(const ERR_STATE *); | ||
233 | ERR_STATE *(*cb_thread_set_item)(ERR_STATE *); | ||
234 | void (*cb_thread_del_item)(const ERR_STATE *); | ||
235 | /* Returns the next available error "library" numbers */ | ||
236 | int (*cb_get_next_lib)(void); | ||
237 | }; | ||
238 | |||
239 | /* Predeclarations of the "err_defaults" functions */ | ||
240 | static LHASH *int_err_get(int create); | ||
241 | static void int_err_del(void); | ||
242 | static ERR_STRING_DATA *int_err_get_item(const ERR_STRING_DATA *); | ||
243 | static ERR_STRING_DATA *int_err_set_item(ERR_STRING_DATA *); | ||
244 | static ERR_STRING_DATA *int_err_del_item(ERR_STRING_DATA *); | ||
245 | static LHASH *int_thread_get(int create); | ||
246 | static void int_thread_release(LHASH **hash); | ||
247 | static ERR_STATE *int_thread_get_item(const ERR_STATE *); | ||
248 | static ERR_STATE *int_thread_set_item(ERR_STATE *); | ||
249 | static void int_thread_del_item(const ERR_STATE *); | ||
250 | static int int_err_get_next_lib(void); | ||
251 | /* The static ERR_FNS table using these defaults functions */ | ||
252 | static const ERR_FNS err_defaults = | ||
253 | { | ||
254 | int_err_get, | ||
255 | int_err_del, | ||
256 | int_err_get_item, | ||
257 | int_err_set_item, | ||
258 | int_err_del_item, | ||
259 | int_thread_get, | ||
260 | int_thread_release, | ||
261 | int_thread_get_item, | ||
262 | int_thread_set_item, | ||
263 | int_thread_del_item, | ||
264 | int_err_get_next_lib | ||
265 | }; | ||
266 | |||
267 | /* The replacable table of ERR_FNS functions we use at run-time */ | ||
268 | static const ERR_FNS *err_fns = NULL; | ||
269 | |||
270 | /* Eg. rather than using "err_get()", use "ERRFN(err_get)()". */ | ||
271 | #define ERRFN(a) err_fns->cb_##a | ||
272 | |||
273 | /* The internal state used by "err_defaults" - as such, the setting, reading, | ||
274 | * creating, and deleting of this data should only be permitted via the | ||
275 | * "err_defaults" functions. This way, a linked module can completely defer all | ||
276 | * ERR state operation (together with requisite locking) to the implementations | ||
277 | * and state in the loading application. */ | ||
278 | static LHASH *int_error_hash = NULL; | ||
279 | static LHASH *int_thread_hash = NULL; | ||
280 | static int int_thread_hash_references = 0; | ||
281 | static int int_err_library_number= ERR_LIB_USER; | ||
282 | |||
283 | /* Internal function that checks whether "err_fns" is set and if not, sets it to | ||
284 | * the defaults. */ | ||
285 | static void err_fns_check(void) | ||
286 | { | ||
287 | if (err_fns) return; | ||
288 | |||
289 | CRYPTO_w_lock(CRYPTO_LOCK_ERR); | ||
290 | if (!err_fns) | ||
291 | err_fns = &err_defaults; | ||
292 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR); | ||
293 | } | ||
294 | |||
295 | /* API functions to get or set the underlying ERR functions. */ | ||
296 | |||
297 | const ERR_FNS *ERR_get_implementation(void) | ||
298 | { | ||
299 | err_fns_check(); | ||
300 | return err_fns; | ||
301 | } | ||
302 | |||
303 | int ERR_set_implementation(const ERR_FNS *fns) | ||
304 | { | ||
305 | int ret = 0; | ||
306 | |||
307 | CRYPTO_w_lock(CRYPTO_LOCK_ERR); | ||
308 | /* It's too late if 'err_fns' is non-NULL. BTW: not much point setting | ||
309 | * an error is there?! */ | ||
310 | if (!err_fns) | ||
311 | { | ||
312 | err_fns = fns; | ||
313 | ret = 1; | ||
314 | } | ||
315 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR); | ||
316 | return ret; | ||
317 | } | ||
318 | |||
319 | /* These are the callbacks provided to "lh_new()" when creating the LHASH tables | ||
320 | * internal to the "err_defaults" implementation. */ | ||
321 | |||
322 | /* static unsigned long err_hash(ERR_STRING_DATA *a); */ | ||
323 | static unsigned long err_hash(const void *a_void); | ||
324 | /* static int err_cmp(ERR_STRING_DATA *a, ERR_STRING_DATA *b); */ | ||
325 | static int err_cmp(const void *a_void, const void *b_void); | ||
326 | /* static unsigned long pid_hash(ERR_STATE *pid); */ | ||
327 | static unsigned long pid_hash(const void *pid_void); | ||
328 | /* static int pid_cmp(ERR_STATE *a,ERR_STATE *pid); */ | ||
329 | static int pid_cmp(const void *a_void,const void *pid_void); | ||
330 | static unsigned long get_error_values(int inc,int top,const char **file,int *line, | ||
331 | const char **data,int *flags); | ||
332 | |||
333 | /* The internal functions used in the "err_defaults" implementation */ | ||
334 | |||
335 | static LHASH *int_err_get(int create) | ||
336 | { | ||
337 | LHASH *ret = NULL; | ||
338 | |||
339 | CRYPTO_w_lock(CRYPTO_LOCK_ERR); | ||
340 | if (!int_error_hash && create) | ||
341 | { | ||
342 | CRYPTO_push_info("int_err_get (err.c)"); | ||
343 | int_error_hash = lh_new(err_hash, err_cmp); | ||
344 | CRYPTO_pop_info(); | ||
345 | } | ||
346 | if (int_error_hash) | ||
347 | ret = int_error_hash; | ||
348 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR); | ||
349 | |||
350 | return ret; | ||
351 | } | ||
352 | |||
353 | static void int_err_del(void) | ||
354 | { | ||
355 | CRYPTO_w_lock(CRYPTO_LOCK_ERR); | ||
356 | if (int_error_hash) | ||
357 | { | ||
358 | lh_free(int_error_hash); | ||
359 | int_error_hash = NULL; | ||
360 | } | ||
361 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR); | ||
362 | } | ||
363 | |||
364 | static ERR_STRING_DATA *int_err_get_item(const ERR_STRING_DATA *d) | ||
365 | { | ||
366 | ERR_STRING_DATA *p; | ||
367 | LHASH *hash; | ||
368 | |||
369 | err_fns_check(); | ||
370 | hash = ERRFN(err_get)(0); | ||
371 | if (!hash) | ||
372 | return NULL; | ||
373 | |||
374 | CRYPTO_r_lock(CRYPTO_LOCK_ERR); | ||
375 | p = (ERR_STRING_DATA *)lh_retrieve(hash, d); | ||
376 | CRYPTO_r_unlock(CRYPTO_LOCK_ERR); | ||
377 | |||
378 | return p; | ||
379 | } | ||
380 | |||
381 | static ERR_STRING_DATA *int_err_set_item(ERR_STRING_DATA *d) | ||
382 | { | ||
383 | ERR_STRING_DATA *p; | ||
384 | LHASH *hash; | ||
385 | |||
386 | err_fns_check(); | ||
387 | hash = ERRFN(err_get)(1); | ||
388 | if (!hash) | ||
389 | return NULL; | ||
390 | |||
391 | CRYPTO_w_lock(CRYPTO_LOCK_ERR); | ||
392 | p = (ERR_STRING_DATA *)lh_insert(hash, d); | ||
393 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR); | ||
394 | |||
395 | return p; | ||
396 | } | ||
397 | |||
398 | static ERR_STRING_DATA *int_err_del_item(ERR_STRING_DATA *d) | ||
399 | { | ||
400 | ERR_STRING_DATA *p; | ||
401 | LHASH *hash; | ||
402 | |||
403 | err_fns_check(); | ||
404 | hash = ERRFN(err_get)(0); | ||
405 | if (!hash) | ||
406 | return NULL; | ||
407 | |||
408 | CRYPTO_w_lock(CRYPTO_LOCK_ERR); | ||
409 | p = (ERR_STRING_DATA *)lh_delete(hash, d); | ||
410 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR); | ||
411 | |||
412 | return p; | ||
413 | } | ||
414 | |||
415 | static LHASH *int_thread_get(int create) | ||
416 | { | ||
417 | LHASH *ret = NULL; | ||
418 | |||
419 | CRYPTO_w_lock(CRYPTO_LOCK_ERR); | ||
420 | if (!int_thread_hash && create) | ||
421 | { | ||
422 | CRYPTO_push_info("int_thread_get (err.c)"); | ||
423 | int_thread_hash = lh_new(pid_hash, pid_cmp); | ||
424 | CRYPTO_pop_info(); | ||
425 | } | ||
426 | if (int_thread_hash) | ||
427 | { | ||
428 | int_thread_hash_references++; | ||
429 | ret = int_thread_hash; | ||
430 | } | ||
431 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR); | ||
432 | return ret; | ||
433 | } | ||
434 | |||
435 | static void int_thread_release(LHASH **hash) | ||
436 | { | ||
437 | int i; | ||
438 | |||
439 | if (hash == NULL || *hash == NULL) | ||
440 | return; | ||
441 | |||
442 | i = CRYPTO_add(&int_thread_hash_references, -1, CRYPTO_LOCK_ERR); | ||
443 | |||
444 | #ifdef REF_PRINT | ||
445 | fprintf(stderr,"%4d:%s\n",int_thread_hash_references,"ERR"); | ||
446 | #endif | ||
447 | if (i > 0) return; | ||
448 | #ifdef REF_CHECK | ||
449 | if (i < 0) | ||
450 | { | ||
451 | fprintf(stderr,"int_thread_release, bad reference count\n"); | ||
452 | abort(); /* ok */ | ||
453 | } | ||
454 | #endif | ||
455 | *hash = NULL; | ||
456 | } | ||
457 | |||
458 | static ERR_STATE *int_thread_get_item(const ERR_STATE *d) | ||
459 | { | ||
460 | ERR_STATE *p; | ||
461 | LHASH *hash; | ||
462 | |||
463 | err_fns_check(); | ||
464 | hash = ERRFN(thread_get)(0); | ||
465 | if (!hash) | ||
466 | return NULL; | ||
467 | |||
468 | CRYPTO_r_lock(CRYPTO_LOCK_ERR); | ||
469 | p = (ERR_STATE *)lh_retrieve(hash, d); | ||
470 | CRYPTO_r_unlock(CRYPTO_LOCK_ERR); | ||
471 | |||
472 | ERRFN(thread_release)(&hash); | ||
473 | return p; | ||
474 | } | ||
475 | |||
476 | static ERR_STATE *int_thread_set_item(ERR_STATE *d) | ||
477 | { | ||
478 | ERR_STATE *p; | ||
479 | LHASH *hash; | ||
480 | |||
481 | err_fns_check(); | ||
482 | hash = ERRFN(thread_get)(1); | ||
483 | if (!hash) | ||
484 | return NULL; | ||
485 | |||
486 | CRYPTO_w_lock(CRYPTO_LOCK_ERR); | ||
487 | p = (ERR_STATE *)lh_insert(hash, d); | ||
488 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR); | ||
489 | |||
490 | ERRFN(thread_release)(&hash); | ||
491 | return p; | ||
492 | } | ||
493 | |||
494 | static void int_thread_del_item(const ERR_STATE *d) | ||
495 | { | ||
496 | ERR_STATE *p; | ||
497 | LHASH *hash; | ||
498 | |||
499 | err_fns_check(); | ||
500 | hash = ERRFN(thread_get)(0); | ||
501 | if (!hash) | ||
502 | return; | ||
503 | |||
504 | CRYPTO_w_lock(CRYPTO_LOCK_ERR); | ||
505 | p = (ERR_STATE *)lh_delete(hash, d); | ||
506 | /* make sure we don't leak memory */ | ||
507 | if (int_thread_hash_references == 1 | ||
508 | && int_thread_hash && (lh_num_items(int_thread_hash) == 0)) | ||
509 | { | ||
510 | lh_free(int_thread_hash); | ||
511 | int_thread_hash = NULL; | ||
512 | } | ||
513 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR); | ||
514 | |||
515 | ERRFN(thread_release)(&hash); | ||
516 | if (p) | ||
517 | ERR_STATE_free(p); | ||
518 | } | ||
519 | |||
520 | static int int_err_get_next_lib(void) | ||
521 | { | ||
522 | int ret; | ||
523 | |||
524 | CRYPTO_w_lock(CRYPTO_LOCK_ERR); | ||
525 | ret = int_err_library_number++; | ||
526 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR); | ||
527 | |||
528 | return ret; | ||
529 | } | ||
530 | |||
531 | |||
532 | #ifndef OPENSSL_NO_ERR | ||
533 | #define NUM_SYS_STR_REASONS 127 | ||
534 | #define LEN_SYS_STR_REASON 32 | ||
535 | |||
536 | static ERR_STRING_DATA SYS_str_reasons[NUM_SYS_STR_REASONS + 1]; | ||
537 | /* SYS_str_reasons is filled with copies of strerror() results at | ||
538 | * initialization. | ||
539 | * 'errno' values up to 127 should cover all usual errors, | ||
540 | * others will be displayed numerically by ERR_error_string. | ||
541 | * It is crucial that we have something for each reason code | ||
542 | * that occurs in ERR_str_reasons, or bogus reason strings | ||
543 | * will be returned for SYSerr(), which always gets an errno | ||
544 | * value and never one of those 'standard' reason codes. */ | ||
545 | |||
546 | static void build_SYS_str_reasons(void) | ||
547 | { | ||
548 | /* OPENSSL_malloc cannot be used here, use static storage instead */ | ||
549 | static char strerror_tab[NUM_SYS_STR_REASONS][LEN_SYS_STR_REASON]; | ||
550 | int i; | ||
551 | static int init = 1; | ||
552 | |||
553 | CRYPTO_r_lock(CRYPTO_LOCK_ERR); | ||
554 | if (!init) | ||
555 | { | ||
556 | CRYPTO_r_unlock(CRYPTO_LOCK_ERR); | ||
557 | return; | ||
558 | } | ||
559 | |||
560 | CRYPTO_r_unlock(CRYPTO_LOCK_ERR); | ||
561 | CRYPTO_w_lock(CRYPTO_LOCK_ERR); | ||
562 | if (!init) | ||
563 | { | ||
564 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR); | ||
565 | return; | ||
566 | } | ||
567 | |||
568 | for (i = 1; i <= NUM_SYS_STR_REASONS; i++) | ||
569 | { | ||
570 | ERR_STRING_DATA *str = &SYS_str_reasons[i - 1]; | ||
571 | |||
572 | str->error = (unsigned long)i; | ||
573 | if (str->string == NULL) | ||
574 | { | ||
575 | char (*dest)[LEN_SYS_STR_REASON] = &(strerror_tab[i - 1]); | ||
576 | char *src = strerror(i); | ||
577 | if (src != NULL) | ||
578 | { | ||
579 | strncpy(*dest, src, sizeof *dest); | ||
580 | (*dest)[sizeof *dest - 1] = '\0'; | ||
581 | str->string = *dest; | ||
582 | } | ||
583 | } | ||
584 | if (str->string == NULL) | ||
585 | str->string = "unknown"; | ||
586 | } | ||
587 | |||
588 | /* Now we still have SYS_str_reasons[NUM_SYS_STR_REASONS] = {0, NULL}, | ||
589 | * as required by ERR_load_strings. */ | ||
590 | |||
591 | init = 0; | ||
592 | |||
593 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR); | ||
594 | } | ||
595 | #endif | ||
596 | 125 | ||
597 | #define err_clear_data(p,i) \ | 126 | #define err_clear_data(p,i) \ |
598 | do { \ | 127 | do { \ |
@@ -614,68 +143,6 @@ static void build_SYS_str_reasons(void) | |||
614 | (p)->err_line[i]= -1; \ | 143 | (p)->err_line[i]= -1; \ |
615 | } while(0) | 144 | } while(0) |
616 | 145 | ||
617 | static void ERR_STATE_free(ERR_STATE *s) | ||
618 | { | ||
619 | int i; | ||
620 | |||
621 | if (s == NULL) | ||
622 | return; | ||
623 | |||
624 | for (i=0; i<ERR_NUM_ERRORS; i++) | ||
625 | { | ||
626 | err_clear_data(s,i); | ||
627 | } | ||
628 | OPENSSL_free(s); | ||
629 | } | ||
630 | |||
631 | void ERR_load_ERR_strings(void) | ||
632 | { | ||
633 | err_fns_check(); | ||
634 | #ifndef OPENSSL_NO_ERR | ||
635 | err_load_strings(0,ERR_str_libraries); | ||
636 | err_load_strings(0,ERR_str_reasons); | ||
637 | err_load_strings(ERR_LIB_SYS,ERR_str_functs); | ||
638 | build_SYS_str_reasons(); | ||
639 | err_load_strings(ERR_LIB_SYS,SYS_str_reasons); | ||
640 | #endif | ||
641 | } | ||
642 | |||
643 | static void err_load_strings(int lib, ERR_STRING_DATA *str) | ||
644 | { | ||
645 | while (str->error) | ||
646 | { | ||
647 | if (lib) | ||
648 | str->error|=ERR_PACK(lib,0,0); | ||
649 | ERRFN(err_set_item)(str); | ||
650 | str++; | ||
651 | } | ||
652 | } | ||
653 | |||
654 | void ERR_load_strings(int lib, ERR_STRING_DATA *str) | ||
655 | { | ||
656 | ERR_load_ERR_strings(); | ||
657 | err_load_strings(lib, str); | ||
658 | } | ||
659 | |||
660 | void ERR_unload_strings(int lib, ERR_STRING_DATA *str) | ||
661 | { | ||
662 | while (str->error) | ||
663 | { | ||
664 | if (lib) | ||
665 | str->error|=ERR_PACK(lib,0,0); | ||
666 | ERRFN(err_del_item)(str); | ||
667 | str++; | ||
668 | } | ||
669 | } | ||
670 | |||
671 | void ERR_free_strings(void) | ||
672 | { | ||
673 | err_fns_check(); | ||
674 | ERRFN(err_del)(); | ||
675 | } | ||
676 | |||
677 | /********************************************************/ | ||
678 | |||
679 | void ERR_put_error(int lib, int func, int reason, const char *file, | 146 | void ERR_put_error(int lib, int func, int reason, const char *file, |
680 | int line) | 147 | int line) |
681 | { | 148 | { |
@@ -830,218 +297,6 @@ static unsigned long get_error_values(int inc, int top, const char **file, int * | |||
830 | return ret; | 297 | return ret; |
831 | } | 298 | } |
832 | 299 | ||
833 | void ERR_error_string_n(unsigned long e, char *buf, size_t len) | ||
834 | { | ||
835 | char lsbuf[64], fsbuf[64], rsbuf[64]; | ||
836 | const char *ls,*fs,*rs; | ||
837 | unsigned long l,f,r; | ||
838 | |||
839 | l=ERR_GET_LIB(e); | ||
840 | f=ERR_GET_FUNC(e); | ||
841 | r=ERR_GET_REASON(e); | ||
842 | |||
843 | ls=ERR_lib_error_string(e); | ||
844 | fs=ERR_func_error_string(e); | ||
845 | rs=ERR_reason_error_string(e); | ||
846 | |||
847 | if (ls == NULL) | ||
848 | BIO_snprintf(lsbuf, sizeof(lsbuf), "lib(%lu)", l); | ||
849 | if (fs == NULL) | ||
850 | BIO_snprintf(fsbuf, sizeof(fsbuf), "func(%lu)", f); | ||
851 | if (rs == NULL) | ||
852 | BIO_snprintf(rsbuf, sizeof(rsbuf), "reason(%lu)", r); | ||
853 | |||
854 | BIO_snprintf(buf, len,"error:%08lX:%s:%s:%s", e, ls?ls:lsbuf, | ||
855 | fs?fs:fsbuf, rs?rs:rsbuf); | ||
856 | if (strlen(buf) == len-1) | ||
857 | { | ||
858 | /* output may be truncated; make sure we always have 5 | ||
859 | * colon-separated fields, i.e. 4 colons ... */ | ||
860 | #define NUM_COLONS 4 | ||
861 | if (len > NUM_COLONS) /* ... if possible */ | ||
862 | { | ||
863 | int i; | ||
864 | char *s = buf; | ||
865 | |||
866 | for (i = 0; i < NUM_COLONS; i++) | ||
867 | { | ||
868 | char *colon = strchr(s, ':'); | ||
869 | if (colon == NULL || colon > &buf[len-1] - NUM_COLONS + i) | ||
870 | { | ||
871 | /* set colon no. i at last possible position | ||
872 | * (buf[len-1] is the terminating 0)*/ | ||
873 | colon = &buf[len-1] - NUM_COLONS + i; | ||
874 | *colon = ':'; | ||
875 | } | ||
876 | s = colon + 1; | ||
877 | } | ||
878 | } | ||
879 | } | ||
880 | } | ||
881 | |||
882 | /* BAD for multi-threading: uses a local buffer if ret == NULL */ | ||
883 | /* ERR_error_string_n should be used instead for ret != NULL | ||
884 | * as ERR_error_string cannot know how large the buffer is */ | ||
885 | char *ERR_error_string(unsigned long e, char *ret) | ||
886 | { | ||
887 | static char buf[256]; | ||
888 | |||
889 | if (ret == NULL) ret=buf; | ||
890 | ERR_error_string_n(e, ret, 256); | ||
891 | |||
892 | return ret; | ||
893 | } | ||
894 | |||
895 | LHASH *ERR_get_string_table(void) | ||
896 | { | ||
897 | err_fns_check(); | ||
898 | return ERRFN(err_get)(0); | ||
899 | } | ||
900 | |||
901 | LHASH *ERR_get_err_state_table(void) | ||
902 | { | ||
903 | err_fns_check(); | ||
904 | return ERRFN(thread_get)(0); | ||
905 | } | ||
906 | |||
907 | void ERR_release_err_state_table(LHASH **hash) | ||
908 | { | ||
909 | err_fns_check(); | ||
910 | ERRFN(thread_release)(hash); | ||
911 | } | ||
912 | |||
913 | const char *ERR_lib_error_string(unsigned long e) | ||
914 | { | ||
915 | ERR_STRING_DATA d,*p; | ||
916 | unsigned long l; | ||
917 | |||
918 | err_fns_check(); | ||
919 | l=ERR_GET_LIB(e); | ||
920 | d.error=ERR_PACK(l,0,0); | ||
921 | p=ERRFN(err_get_item)(&d); | ||
922 | return((p == NULL)?NULL:p->string); | ||
923 | } | ||
924 | |||
925 | const char *ERR_func_error_string(unsigned long e) | ||
926 | { | ||
927 | ERR_STRING_DATA d,*p; | ||
928 | unsigned long l,f; | ||
929 | |||
930 | err_fns_check(); | ||
931 | l=ERR_GET_LIB(e); | ||
932 | f=ERR_GET_FUNC(e); | ||
933 | d.error=ERR_PACK(l,f,0); | ||
934 | p=ERRFN(err_get_item)(&d); | ||
935 | return((p == NULL)?NULL:p->string); | ||
936 | } | ||
937 | |||
938 | const char *ERR_reason_error_string(unsigned long e) | ||
939 | { | ||
940 | ERR_STRING_DATA d,*p=NULL; | ||
941 | unsigned long l,r; | ||
942 | |||
943 | err_fns_check(); | ||
944 | l=ERR_GET_LIB(e); | ||
945 | r=ERR_GET_REASON(e); | ||
946 | d.error=ERR_PACK(l,0,r); | ||
947 | p=ERRFN(err_get_item)(&d); | ||
948 | if (!p) | ||
949 | { | ||
950 | d.error=ERR_PACK(0,0,r); | ||
951 | p=ERRFN(err_get_item)(&d); | ||
952 | } | ||
953 | return((p == NULL)?NULL:p->string); | ||
954 | } | ||
955 | |||
956 | /* static unsigned long err_hash(ERR_STRING_DATA *a) */ | ||
957 | static unsigned long err_hash(const void *a_void) | ||
958 | { | ||
959 | unsigned long ret,l; | ||
960 | |||
961 | l=((const ERR_STRING_DATA *)a_void)->error; | ||
962 | ret=l^ERR_GET_LIB(l)^ERR_GET_FUNC(l); | ||
963 | return(ret^ret%19*13); | ||
964 | } | ||
965 | |||
966 | /* static int err_cmp(ERR_STRING_DATA *a, ERR_STRING_DATA *b) */ | ||
967 | static int err_cmp(const void *a_void, const void *b_void) | ||
968 | { | ||
969 | return((int)(((const ERR_STRING_DATA *)a_void)->error - | ||
970 | ((const ERR_STRING_DATA *)b_void)->error)); | ||
971 | } | ||
972 | |||
973 | /* static unsigned long pid_hash(ERR_STATE *a) */ | ||
974 | static unsigned long pid_hash(const void *a_void) | ||
975 | { | ||
976 | return(((const ERR_STATE *)a_void)->pid*13); | ||
977 | } | ||
978 | |||
979 | /* static int pid_cmp(ERR_STATE *a, ERR_STATE *b) */ | ||
980 | static int pid_cmp(const void *a_void, const void *b_void) | ||
981 | { | ||
982 | return((int)((long)((const ERR_STATE *)a_void)->pid - | ||
983 | (long)((const ERR_STATE *)b_void)->pid)); | ||
984 | } | ||
985 | |||
986 | void ERR_remove_state(unsigned long pid) | ||
987 | { | ||
988 | ERR_STATE tmp; | ||
989 | |||
990 | err_fns_check(); | ||
991 | if (pid == 0) | ||
992 | pid=(unsigned long)CRYPTO_thread_id(); | ||
993 | tmp.pid=pid; | ||
994 | /* thread_del_item automatically destroys the LHASH if the number of | ||
995 | * items reaches zero. */ | ||
996 | ERRFN(thread_del_item)(&tmp); | ||
997 | } | ||
998 | |||
999 | ERR_STATE *ERR_get_state(void) | ||
1000 | { | ||
1001 | static ERR_STATE fallback; | ||
1002 | ERR_STATE *ret,tmp,*tmpp=NULL; | ||
1003 | int i; | ||
1004 | unsigned long pid; | ||
1005 | |||
1006 | err_fns_check(); | ||
1007 | pid=(unsigned long)CRYPTO_thread_id(); | ||
1008 | tmp.pid=pid; | ||
1009 | ret=ERRFN(thread_get_item)(&tmp); | ||
1010 | |||
1011 | /* ret == the error state, if NULL, make a new one */ | ||
1012 | if (ret == NULL) | ||
1013 | { | ||
1014 | ret=(ERR_STATE *)OPENSSL_malloc(sizeof(ERR_STATE)); | ||
1015 | if (ret == NULL) return(&fallback); | ||
1016 | ret->pid=pid; | ||
1017 | ret->top=0; | ||
1018 | ret->bottom=0; | ||
1019 | for (i=0; i<ERR_NUM_ERRORS; i++) | ||
1020 | { | ||
1021 | ret->err_data[i]=NULL; | ||
1022 | ret->err_data_flags[i]=0; | ||
1023 | } | ||
1024 | tmpp = ERRFN(thread_set_item)(ret); | ||
1025 | /* To check if insertion failed, do a get. */ | ||
1026 | if (ERRFN(thread_get_item)(ret) != ret) | ||
1027 | { | ||
1028 | ERR_STATE_free(ret); /* could not insert it */ | ||
1029 | return(&fallback); | ||
1030 | } | ||
1031 | /* If a race occured in this function and we came second, tmpp | ||
1032 | * is the first one that we just replaced. */ | ||
1033 | if (tmpp) | ||
1034 | ERR_STATE_free(tmpp); | ||
1035 | } | ||
1036 | return ret; | ||
1037 | } | ||
1038 | |||
1039 | int ERR_get_next_error_library(void) | ||
1040 | { | ||
1041 | err_fns_check(); | ||
1042 | return ERRFN(get_next_lib)(); | ||
1043 | } | ||
1044 | |||
1045 | void ERR_set_error_data(char *data, int flags) | 300 | void ERR_set_error_data(char *data, int flags) |
1046 | { | 301 | { |
1047 | ERR_STATE *es; | 302 | ERR_STATE *es; |
@@ -1128,3 +383,34 @@ int ERR_pop_to_mark(void) | |||
1128 | es->err_flags[es->top]&=~ERR_FLAG_MARK; | 383 | es->err_flags[es->top]&=~ERR_FLAG_MARK; |
1129 | return 1; | 384 | return 1; |
1130 | } | 385 | } |
386 | |||
387 | #ifdef OPENSSL_FIPS | ||
388 | |||
389 | static ERR_STATE *fget_state(void) | ||
390 | { | ||
391 | static ERR_STATE fstate; | ||
392 | return &fstate; | ||
393 | } | ||
394 | |||
395 | ERR_STATE *(*get_state_func)(void) = fget_state; | ||
396 | void (*remove_state_func)(unsigned long pid); | ||
397 | |||
398 | ERR_STATE *ERR_get_state(void) | ||
399 | { | ||
400 | return get_state_func(); | ||
401 | } | ||
402 | |||
403 | void int_ERR_set_state_func(ERR_STATE *(*get_func)(void), | ||
404 | void (*remove_func)(unsigned long pid)) | ||
405 | { | ||
406 | get_state_func = get_func; | ||
407 | remove_state_func = remove_func; | ||
408 | } | ||
409 | |||
410 | void ERR_remove_state(unsigned long pid) | ||
411 | { | ||
412 | if (remove_state_func) | ||
413 | remove_state_func(pid); | ||
414 | } | ||
415 | |||
416 | #endif | ||
diff --git a/src/lib/libcrypto/err/err.h b/src/lib/libcrypto/err/err.h index 8d9f0da172..dcac415231 100644 --- a/src/lib/libcrypto/err/err.h +++ b/src/lib/libcrypto/err/err.h | |||
@@ -142,6 +142,7 @@ typedef struct err_state_st | |||
142 | #define ERR_LIB_STORE 44 | 142 | #define ERR_LIB_STORE 44 |
143 | #define ERR_LIB_FIPS 45 | 143 | #define ERR_LIB_FIPS 45 |
144 | #define ERR_LIB_CMS 46 | 144 | #define ERR_LIB_CMS 46 |
145 | #define ERR_LIB_JPAKE 47 | ||
145 | 146 | ||
146 | #define ERR_LIB_USER 128 | 147 | #define ERR_LIB_USER 128 |
147 | 148 | ||
@@ -175,6 +176,7 @@ typedef struct err_state_st | |||
175 | #define STOREerr(f,r) ERR_PUT_error(ERR_LIB_STORE,(f),(r),__FILE__,__LINE__) | 176 | #define STOREerr(f,r) ERR_PUT_error(ERR_LIB_STORE,(f),(r),__FILE__,__LINE__) |
176 | #define FIPSerr(f,r) ERR_PUT_error(ERR_LIB_FIPS,(f),(r),__FILE__,__LINE__) | 177 | #define FIPSerr(f,r) ERR_PUT_error(ERR_LIB_FIPS,(f),(r),__FILE__,__LINE__) |
177 | #define CMSerr(f,r) ERR_PUT_error(ERR_LIB_CMS,(f),(r),__FILE__,__LINE__) | 178 | #define CMSerr(f,r) ERR_PUT_error(ERR_LIB_CMS,(f),(r),__FILE__,__LINE__) |
179 | #define JPAKEerr(f,r) ERR_PUT_error(ERR_LIB_JPAKE,(f),(r),__FILE__,__LINE__) | ||
178 | 180 | ||
179 | /* Borland C seems too stupid to be able to shift and do longs in | 181 | /* Borland C seems too stupid to be able to shift and do longs in |
180 | * the pre-processor :-( */ | 182 | * the pre-processor :-( */ |
@@ -306,6 +308,12 @@ int ERR_get_next_error_library(void); | |||
306 | int ERR_set_mark(void); | 308 | int ERR_set_mark(void); |
307 | int ERR_pop_to_mark(void); | 309 | int ERR_pop_to_mark(void); |
308 | 310 | ||
311 | #ifdef OPENSSL_FIPS | ||
312 | void int_ERR_set_state_func(ERR_STATE *(*get_func)(void), | ||
313 | void (*remove_func)(unsigned long pid)); | ||
314 | void int_ERR_lib_init(void); | ||
315 | #endif | ||
316 | |||
309 | /* Already defined in ossl_typ.h */ | 317 | /* Already defined in ossl_typ.h */ |
310 | /* typedef struct st_ERR_FNS ERR_FNS; */ | 318 | /* typedef struct st_ERR_FNS ERR_FNS; */ |
311 | /* An application can use this function and provide the return value to loaded | 319 | /* An application can use this function and provide the return value to loaded |
diff --git a/src/lib/libcrypto/err/err_all.c b/src/lib/libcrypto/err/err_all.c index 5813060ce2..f21a5276ed 100644 --- a/src/lib/libcrypto/err/err_all.c +++ b/src/lib/libcrypto/err/err_all.c | |||
@@ -94,9 +94,16 @@ | |||
94 | #include <openssl/ui.h> | 94 | #include <openssl/ui.h> |
95 | #include <openssl/ocsp.h> | 95 | #include <openssl/ocsp.h> |
96 | #include <openssl/err.h> | 96 | #include <openssl/err.h> |
97 | #ifdef OPENSSL_FIPS | ||
98 | #include <openssl/fips.h> | ||
99 | #endif | ||
100 | |||
97 | #ifndef OPENSSL_NO_CMS | 101 | #ifndef OPENSSL_NO_CMS |
98 | #include <openssl/cms.h> | 102 | #include <openssl/cms.h> |
99 | #endif | 103 | #endif |
104 | #ifndef OPENSSL_NO_JPAKE | ||
105 | #include <openssl/jpake.h> | ||
106 | #endif | ||
100 | 107 | ||
101 | void ERR_load_crypto_strings(void) | 108 | void ERR_load_crypto_strings(void) |
102 | { | 109 | { |
@@ -141,8 +148,14 @@ void ERR_load_crypto_strings(void) | |||
141 | #endif | 148 | #endif |
142 | ERR_load_OCSP_strings(); | 149 | ERR_load_OCSP_strings(); |
143 | ERR_load_UI_strings(); | 150 | ERR_load_UI_strings(); |
151 | #ifdef OPENSSL_FIPS | ||
152 | ERR_load_FIPS_strings(); | ||
153 | #endif | ||
144 | #ifndef OPENSSL_NO_CMS | 154 | #ifndef OPENSSL_NO_CMS |
145 | ERR_load_CMS_strings(); | 155 | ERR_load_CMS_strings(); |
146 | #endif | 156 | #endif |
157 | #ifndef OPENSSL_NO_JPAKE | ||
158 | ERR_load_JPAKE_strings(); | ||
159 | #endif | ||
147 | #endif | 160 | #endif |
148 | } | 161 | } |
diff --git a/src/lib/libcrypto/err/err_prn.c b/src/lib/libcrypto/err/err_prn.c index 2224a901e5..4cdf342fa6 100644 --- a/src/lib/libcrypto/err/err_prn.c +++ b/src/lib/libcrypto/err/err_prn.c | |||
@@ -86,12 +86,7 @@ void ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u), | |||
86 | #ifndef OPENSSL_NO_FP_API | 86 | #ifndef OPENSSL_NO_FP_API |
87 | static int print_fp(const char *str, size_t len, void *fp) | 87 | static int print_fp(const char *str, size_t len, void *fp) |
88 | { | 88 | { |
89 | BIO bio; | 89 | return fwrite(str, 1, len, fp); |
90 | |||
91 | BIO_set(&bio,BIO_s_file()); | ||
92 | BIO_set_fp(&bio,fp,BIO_NOCLOSE); | ||
93 | |||
94 | return BIO_printf(&bio, "%s", str); | ||
95 | } | 90 | } |
96 | void ERR_print_errors_fp(FILE *fp) | 91 | void ERR_print_errors_fp(FILE *fp) |
97 | { | 92 | { |
@@ -99,13 +94,64 @@ void ERR_print_errors_fp(FILE *fp) | |||
99 | } | 94 | } |
100 | #endif | 95 | #endif |
101 | 96 | ||
102 | static int print_bio(const char *str, size_t len, void *bp) | 97 | void ERR_error_string_n(unsigned long e, char *buf, size_t len) |
103 | { | 98 | { |
104 | return BIO_write((BIO *)bp, str, len); | 99 | char lsbuf[64], fsbuf[64], rsbuf[64]; |
100 | const char *ls,*fs,*rs; | ||
101 | unsigned long l,f,r; | ||
102 | |||
103 | l=ERR_GET_LIB(e); | ||
104 | f=ERR_GET_FUNC(e); | ||
105 | r=ERR_GET_REASON(e); | ||
106 | |||
107 | ls=ERR_lib_error_string(e); | ||
108 | fs=ERR_func_error_string(e); | ||
109 | rs=ERR_reason_error_string(e); | ||
110 | |||
111 | if (ls == NULL) | ||
112 | BIO_snprintf(lsbuf, sizeof(lsbuf), "lib(%lu)", l); | ||
113 | if (fs == NULL) | ||
114 | BIO_snprintf(fsbuf, sizeof(fsbuf), "func(%lu)", f); | ||
115 | if (rs == NULL) | ||
116 | BIO_snprintf(rsbuf, sizeof(rsbuf), "reason(%lu)", r); | ||
117 | |||
118 | BIO_snprintf(buf, len,"error:%08lX:%s:%s:%s", e, ls?ls:lsbuf, | ||
119 | fs?fs:fsbuf, rs?rs:rsbuf); | ||
120 | if (strlen(buf) == len-1) | ||
121 | { | ||
122 | /* output may be truncated; make sure we always have 5 | ||
123 | * colon-separated fields, i.e. 4 colons ... */ | ||
124 | #define NUM_COLONS 4 | ||
125 | if (len > NUM_COLONS) /* ... if possible */ | ||
126 | { | ||
127 | int i; | ||
128 | char *s = buf; | ||
129 | |||
130 | for (i = 0; i < NUM_COLONS; i++) | ||
131 | { | ||
132 | char *colon = strchr(s, ':'); | ||
133 | if (colon == NULL || colon > &buf[len-1] - NUM_COLONS + i) | ||
134 | { | ||
135 | /* set colon no. i at last possible position | ||
136 | * (buf[len-1] is the terminating 0)*/ | ||
137 | colon = &buf[len-1] - NUM_COLONS + i; | ||
138 | *colon = ':'; | ||
139 | } | ||
140 | s = colon + 1; | ||
141 | } | ||
142 | } | ||
143 | } | ||
105 | } | 144 | } |
106 | void ERR_print_errors(BIO *bp) | 145 | |
146 | /* BAD for multi-threading: uses a local buffer if ret == NULL */ | ||
147 | /* ERR_error_string_n should be used instead for ret != NULL | ||
148 | * as ERR_error_string cannot know how large the buffer is */ | ||
149 | char *ERR_error_string(unsigned long e, char *ret) | ||
107 | { | 150 | { |
108 | ERR_print_errors_cb(print_bio, bp); | 151 | static char buf[256]; |
109 | } | 152 | |
153 | if (ret == NULL) ret=buf; | ||
154 | ERR_error_string_n(e, ret, 256); | ||
110 | 155 | ||
111 | 156 | return ret; | |
157 | } | ||
diff --git a/src/lib/libcrypto/err/openssl.ec b/src/lib/libcrypto/err/openssl.ec index 1938f081ac..868826624d 100644 --- a/src/lib/libcrypto/err/openssl.ec +++ b/src/lib/libcrypto/err/openssl.ec | |||
@@ -31,7 +31,9 @@ L COMP crypto/comp/comp.h crypto/comp/comp_err.c | |||
31 | L ECDSA crypto/ecdsa/ecdsa.h crypto/ecdsa/ecs_err.c | 31 | L ECDSA crypto/ecdsa/ecdsa.h crypto/ecdsa/ecs_err.c |
32 | L ECDH crypto/ecdh/ecdh.h crypto/ecdh/ech_err.c | 32 | L ECDH crypto/ecdh/ecdh.h crypto/ecdh/ech_err.c |
33 | L STORE crypto/store/store.h crypto/store/str_err.c | 33 | L STORE crypto/store/store.h crypto/store/str_err.c |
34 | L FIPS fips/fips.h crypto/fips_err.h | ||
34 | L CMS crypto/cms/cms.h crypto/cms/cms_err.c | 35 | L CMS crypto/cms/cms.h crypto/cms/cms_err.c |
36 | L JPAKE crypto/jpake/jpake.h crypto/jpake/jpake_err.c | ||
35 | 37 | ||
36 | # additional header files to be scanned for function names | 38 | # additional header files to be scanned for function names |
37 | L NONE crypto/x509/x509_vfy.h NONE | 39 | L NONE crypto/x509/x509_vfy.h NONE |