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