summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/err
diff options
context:
space:
mode:
authordjm <>2010-10-01 22:59:01 +0000
committerdjm <>2010-10-01 22:59:01 +0000
commitfe047d8b632246cb2db3234a0a4f32e5c318857b (patch)
tree939b752540947d33507b3acc48d76a8bfb7c3dc3 /src/lib/libcrypto/err
parent2ea67f4aa254b09ded62e6e14fc893bbe6381579 (diff)
downloadopenbsd-fe047d8b632246cb2db3234a0a4f32e5c318857b.tar.gz
openbsd-fe047d8b632246cb2db3234a0a4f32e5c318857b.tar.bz2
openbsd-fe047d8b632246cb2db3234a0a4f32e5c318857b.zip
resolve conflicts, fix local changes
Diffstat (limited to 'src/lib/libcrypto/err')
-rw-r--r--src/lib/libcrypto/err/Makefile.ssl119
-rw-r--r--src/lib/libcrypto/err/err.c789
-rw-r--r--src/lib/libcrypto/err/err.h77
-rw-r--r--src/lib/libcrypto/err/err_all.c13
-rw-r--r--src/lib/libcrypto/err/err_bio.c75
-rw-r--r--src/lib/libcrypto/err/err_def.c665
-rw-r--r--src/lib/libcrypto/err/err_prn.c77
-rw-r--r--src/lib/libcrypto/err/err_str.c295
-rw-r--r--src/lib/libcrypto/err/openssl.ec9
9 files changed, 851 insertions, 1268 deletions
diff --git a/src/lib/libcrypto/err/Makefile.ssl b/src/lib/libcrypto/err/Makefile.ssl
deleted file mode 100644
index b253061d07..0000000000
--- a/src/lib/libcrypto/err/Makefile.ssl
+++ /dev/null
@@ -1,119 +0,0 @@
1#
2# SSLeay/crypto/err/Makefile
3#
4
5DIR= err
6TOP= ../..
7CC= cc
8INCLUDES= -I.. -I$(TOP) -I../../include
9CFLAG=-g
10INSTALL_PREFIX=
11OPENSSLDIR= /usr/local/ssl
12INSTALLTOP=/usr/local/ssl
13MAKE= make -f Makefile.ssl
14MAKEDEPPROG= makedepend
15MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
16MAKEFILE= Makefile.ssl
17AR= ar r
18
19CFLAGS= $(INCLUDES) $(CFLAG)
20
21GENERAL=Makefile
22TEST=
23APPS=
24
25LIB=$(TOP)/libcrypto.a
26LIBSRC=err.c err_all.c err_prn.c
27LIBOBJ=err.o err_all.o err_prn.o
28
29SRC= $(LIBSRC)
30
31EXHEADER= err.h
32HEADER= $(EXHEADER)
33
34ALL= $(GENERAL) $(SRC) $(HEADER)
35
36top:
37 (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
38
39all: lib
40
41lib: $(LIBOBJ)
42 $(AR) $(LIB) $(LIBOBJ)
43 $(RANLIB) $(LIB) || echo Never mind.
44 @touch lib
45
46files:
47 $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
48
49links:
50 @sh $(TOP)/util/point.sh Makefile.ssl Makefile
51 @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
52 @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
53 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
54
55install:
56 @for i in $(EXHEADER) ; \
57 do \
58 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
59 chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
60 done;
61
62tags:
63 ctags $(SRC)
64
65tests:
66
67lint:
68 lint -DLINT $(INCLUDES) $(SRC)>fluff
69
70depend:
71 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
72
73dclean:
74 $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
75 mv -f Makefile.new $(MAKEFILE)
76
77clean:
78 rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
79
80# DO NOT DELETE THIS LINE -- make depend depends on it.
81
82err.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/buffer.h
83err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
84err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
85err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
86err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
87err.o: ../../include/openssl/symhacks.h ../cryptlib.h err.c
88err_all.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
89err_all.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
90err_all.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
91err_all.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
92err_all.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
93err_all.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
94err_all.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h
95err_all.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
96err_all.o: ../../include/openssl/engine.h ../../include/openssl/err.h
97err_all.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
98err_all.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
99err_all.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
100err_all.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
101err_all.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h
102err_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
103err_all.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem2.h
104err_all.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
105err_all.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
106err_all.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
107err_all.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
108err_all.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
109err_all.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
110err_all.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
111err_all.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
112err_all.o: ../../include/openssl/x509v3.h err_all.c
113err_prn.o: ../../e_os.h ../../include/openssl/bio.h
114err_prn.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
115err_prn.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
116err_prn.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
117err_prn.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
118err_prn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
119err_prn.o: ../cryptlib.h err_prn.c
diff --git a/src/lib/libcrypto/err/err.c b/src/lib/libcrypto/err/err.c
index 292404a2fb..69713a6e2f 100644
--- a/src/lib/libcrypto/err/err.c
+++ b/src/lib/libcrypto/err/err.c
@@ -56,7 +56,7 @@
56 * [including the GNU Public Licence.] 56 * [including the GNU Public Licence.]
57 */ 57 */
58/* ==================================================================== 58/* ====================================================================
59 * Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved. 59 * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved.
60 * 60 *
61 * Redistribution and use in source and binary forms, with or without 61 * Redistribution and use in source and binary forms, with or without
62 * modification, are permitted provided that the following conditions 62 * modification, are permitted provided that the following conditions
@@ -119,9 +119,507 @@
119#include <openssl/bio.h> 119#include <openssl/bio.h>
120#include <openssl/err.h> 120#include <openssl/err.h>
121 121
122static unsigned long get_error_values(int inc,int top, 122DECLARE_LHASH_OF(ERR_STRING_DATA);
123 const char **file,int *line, 123DECLARE_LHASH_OF(ERR_STATE);
124 const char **data,int *flags); 124
125static void err_load_strings(int lib, ERR_STRING_DATA *str);
126
127static void ERR_STATE_free(ERR_STATE *s);
128#ifndef OPENSSL_NO_ERR
129static ERR_STRING_DATA ERR_str_libraries[]=
130 {
131{ERR_PACK(ERR_LIB_NONE,0,0) ,"unknown library"},
132{ERR_PACK(ERR_LIB_SYS,0,0) ,"system library"},
133{ERR_PACK(ERR_LIB_BN,0,0) ,"bignum routines"},
134{ERR_PACK(ERR_LIB_RSA,0,0) ,"rsa routines"},
135{ERR_PACK(ERR_LIB_DH,0,0) ,"Diffie-Hellman routines"},
136{ERR_PACK(ERR_LIB_EVP,0,0) ,"digital envelope routines"},
137{ERR_PACK(ERR_LIB_BUF,0,0) ,"memory buffer routines"},
138{ERR_PACK(ERR_LIB_OBJ,0,0) ,"object identifier routines"},
139{ERR_PACK(ERR_LIB_PEM,0,0) ,"PEM routines"},
140{ERR_PACK(ERR_LIB_DSA,0,0) ,"dsa routines"},
141{ERR_PACK(ERR_LIB_X509,0,0) ,"x509 certificate routines"},
142{ERR_PACK(ERR_LIB_ASN1,0,0) ,"asn1 encoding routines"},
143{ERR_PACK(ERR_LIB_CONF,0,0) ,"configuration file routines"},
144{ERR_PACK(ERR_LIB_CRYPTO,0,0) ,"common libcrypto routines"},
145{ERR_PACK(ERR_LIB_EC,0,0) ,"elliptic curve routines"},
146{ERR_PACK(ERR_LIB_SSL,0,0) ,"SSL routines"},
147{ERR_PACK(ERR_LIB_BIO,0,0) ,"BIO routines"},
148{ERR_PACK(ERR_LIB_PKCS7,0,0) ,"PKCS7 routines"},
149{ERR_PACK(ERR_LIB_X509V3,0,0) ,"X509 V3 routines"},
150{ERR_PACK(ERR_LIB_PKCS12,0,0) ,"PKCS12 routines"},
151{ERR_PACK(ERR_LIB_RAND,0,0) ,"random number generator"},
152{ERR_PACK(ERR_LIB_DSO,0,0) ,"DSO support routines"},
153{ERR_PACK(ERR_LIB_TS,0,0) ,"time stamp routines"},
154{ERR_PACK(ERR_LIB_ENGINE,0,0) ,"engine routines"},
155{ERR_PACK(ERR_LIB_OCSP,0,0) ,"OCSP routines"},
156{ERR_PACK(ERR_LIB_FIPS,0,0) ,"FIPS routines"},
157{ERR_PACK(ERR_LIB_CMS,0,0) ,"CMS routines"},
158{ERR_PACK(ERR_LIB_HMAC,0,0) ,"HMAC routines"},
159{0,NULL},
160 };
161
162static ERR_STRING_DATA ERR_str_functs[]=
163 {
164 {ERR_PACK(0,SYS_F_FOPEN,0), "fopen"},
165 {ERR_PACK(0,SYS_F_CONNECT,0), "connect"},
166 {ERR_PACK(0,SYS_F_GETSERVBYNAME,0), "getservbyname"},
167 {ERR_PACK(0,SYS_F_SOCKET,0), "socket"},
168 {ERR_PACK(0,SYS_F_IOCTLSOCKET,0), "ioctlsocket"},
169 {ERR_PACK(0,SYS_F_BIND,0), "bind"},
170 {ERR_PACK(0,SYS_F_LISTEN,0), "listen"},
171 {ERR_PACK(0,SYS_F_ACCEPT,0), "accept"},
172#ifdef OPENSSL_SYS_WINDOWS
173 {ERR_PACK(0,SYS_F_WSASTARTUP,0), "WSAstartup"},
174#endif
175 {ERR_PACK(0,SYS_F_OPENDIR,0), "opendir"},
176 {ERR_PACK(0,SYS_F_FREAD,0), "fread"},
177 {0,NULL},
178 };
179
180static ERR_STRING_DATA ERR_str_reasons[]=
181 {
182{ERR_R_SYS_LIB ,"system lib"},
183{ERR_R_BN_LIB ,"BN lib"},
184{ERR_R_RSA_LIB ,"RSA lib"},
185{ERR_R_DH_LIB ,"DH lib"},
186{ERR_R_EVP_LIB ,"EVP lib"},
187{ERR_R_BUF_LIB ,"BUF lib"},
188{ERR_R_OBJ_LIB ,"OBJ lib"},
189{ERR_R_PEM_LIB ,"PEM lib"},
190{ERR_R_DSA_LIB ,"DSA lib"},
191{ERR_R_X509_LIB ,"X509 lib"},
192{ERR_R_ASN1_LIB ,"ASN1 lib"},
193{ERR_R_CONF_LIB ,"CONF lib"},
194{ERR_R_CRYPTO_LIB ,"CRYPTO lib"},
195{ERR_R_EC_LIB ,"EC lib"},
196{ERR_R_SSL_LIB ,"SSL lib"},
197{ERR_R_BIO_LIB ,"BIO lib"},
198{ERR_R_PKCS7_LIB ,"PKCS7 lib"},
199{ERR_R_X509V3_LIB ,"X509V3 lib"},
200{ERR_R_PKCS12_LIB ,"PKCS12 lib"},
201{ERR_R_RAND_LIB ,"RAND lib"},
202{ERR_R_DSO_LIB ,"DSO lib"},
203{ERR_R_ENGINE_LIB ,"ENGINE lib"},
204{ERR_R_OCSP_LIB ,"OCSP lib"},
205{ERR_R_TS_LIB ,"TS lib"},
206
207{ERR_R_NESTED_ASN1_ERROR ,"nested asn1 error"},
208{ERR_R_BAD_ASN1_OBJECT_HEADER ,"bad asn1 object header"},
209{ERR_R_BAD_GET_ASN1_OBJECT_CALL ,"bad get asn1 object call"},
210{ERR_R_EXPECTING_AN_ASN1_SEQUENCE ,"expecting an asn1 sequence"},
211{ERR_R_ASN1_LENGTH_MISMATCH ,"asn1 length mismatch"},
212{ERR_R_MISSING_ASN1_EOS ,"missing asn1 eos"},
213
214{ERR_R_FATAL ,"fatal"},
215{ERR_R_MALLOC_FAILURE ,"malloc failure"},
216{ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED ,"called a function you should not call"},
217{ERR_R_PASSED_NULL_PARAMETER ,"passed a null parameter"},
218{ERR_R_INTERNAL_ERROR ,"internal error"},
219{ERR_R_DISABLED ,"called a function that was disabled at compile-time"},
220
221{0,NULL},
222 };
223#endif
224
225
226/* Define the predeclared (but externally opaque) "ERR_FNS" type */
227struct st_ERR_FNS
228 {
229 /* Works on the "error_hash" string table */
230 LHASH_OF(ERR_STRING_DATA) *(*cb_err_get)(int create);
231 void (*cb_err_del)(void);
232 ERR_STRING_DATA *(*cb_err_get_item)(const ERR_STRING_DATA *);
233 ERR_STRING_DATA *(*cb_err_set_item)(ERR_STRING_DATA *);
234 ERR_STRING_DATA *(*cb_err_del_item)(ERR_STRING_DATA *);
235 /* Works on the "thread_hash" error-state table */
236 LHASH_OF(ERR_STATE) *(*cb_thread_get)(int create);
237 void (*cb_thread_release)(LHASH_OF(ERR_STATE) **hash);
238 ERR_STATE *(*cb_thread_get_item)(const ERR_STATE *);
239 ERR_STATE *(*cb_thread_set_item)(ERR_STATE *);
240 void (*cb_thread_del_item)(const ERR_STATE *);
241 /* Returns the next available error "library" numbers */
242 int (*cb_get_next_lib)(void);
243 };
244
245/* Predeclarations of the "err_defaults" functions */
246static LHASH_OF(ERR_STRING_DATA) *int_err_get(int create);
247static void int_err_del(void);
248static ERR_STRING_DATA *int_err_get_item(const ERR_STRING_DATA *);
249static ERR_STRING_DATA *int_err_set_item(ERR_STRING_DATA *);
250static ERR_STRING_DATA *int_err_del_item(ERR_STRING_DATA *);
251static LHASH_OF(ERR_STATE) *int_thread_get(int create);
252static void int_thread_release(LHASH_OF(ERR_STATE) **hash);
253static ERR_STATE *int_thread_get_item(const ERR_STATE *);
254static ERR_STATE *int_thread_set_item(ERR_STATE *);
255static void int_thread_del_item(const ERR_STATE *);
256static int int_err_get_next_lib(void);
257/* The static ERR_FNS table using these defaults functions */
258static const ERR_FNS err_defaults =
259 {
260 int_err_get,
261 int_err_del,
262 int_err_get_item,
263 int_err_set_item,
264 int_err_del_item,
265 int_thread_get,
266 int_thread_release,
267 int_thread_get_item,
268 int_thread_set_item,
269 int_thread_del_item,
270 int_err_get_next_lib
271 };
272
273/* The replacable table of ERR_FNS functions we use at run-time */
274static const ERR_FNS *err_fns = NULL;
275
276/* Eg. rather than using "err_get()", use "ERRFN(err_get)()". */
277#define ERRFN(a) err_fns->cb_##a
278
279/* The internal state used by "err_defaults" - as such, the setting, reading,
280 * creating, and deleting of this data should only be permitted via the
281 * "err_defaults" functions. This way, a linked module can completely defer all
282 * ERR state operation (together with requisite locking) to the implementations
283 * and state in the loading application. */
284static LHASH_OF(ERR_STRING_DATA) *int_error_hash = NULL;
285static LHASH_OF(ERR_STATE) *int_thread_hash = NULL;
286static int int_thread_hash_references = 0;
287static int int_err_library_number= ERR_LIB_USER;
288
289/* Internal function that checks whether "err_fns" is set and if not, sets it to
290 * the defaults. */
291static void err_fns_check(void)
292 {
293 if (err_fns) return;
294
295 CRYPTO_w_lock(CRYPTO_LOCK_ERR);
296 if (!err_fns)
297 err_fns = &err_defaults;
298 CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
299 }
300
301/* API functions to get or set the underlying ERR functions. */
302
303const ERR_FNS *ERR_get_implementation(void)
304 {
305 err_fns_check();
306 return err_fns;
307 }
308
309int ERR_set_implementation(const ERR_FNS *fns)
310 {
311 int ret = 0;
312
313 CRYPTO_w_lock(CRYPTO_LOCK_ERR);
314 /* It's too late if 'err_fns' is non-NULL. BTW: not much point setting
315 * an error is there?! */
316 if (!err_fns)
317 {
318 err_fns = fns;
319 ret = 1;
320 }
321 CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
322 return ret;
323 }
324
325/* These are the callbacks provided to "lh_new()" when creating the LHASH tables
326 * internal to the "err_defaults" implementation. */
327
328static unsigned long get_error_values(int inc,int top,const char **file,int *line,
329 const char **data,int *flags);
330
331/* The internal functions used in the "err_defaults" implementation */
332
333static unsigned long err_string_data_hash(const ERR_STRING_DATA *a)
334 {
335 unsigned long ret,l;
336
337 l=a->error;
338 ret=l^ERR_GET_LIB(l)^ERR_GET_FUNC(l);
339 return(ret^ret%19*13);
340 }
341static IMPLEMENT_LHASH_HASH_FN(err_string_data, ERR_STRING_DATA)
342
343static int err_string_data_cmp(const ERR_STRING_DATA *a,
344 const ERR_STRING_DATA *b)
345 {
346 return (int)(a->error - b->error);
347 }
348static IMPLEMENT_LHASH_COMP_FN(err_string_data, ERR_STRING_DATA)
349
350static LHASH_OF(ERR_STRING_DATA) *int_err_get(int create)
351 {
352 LHASH_OF(ERR_STRING_DATA) *ret = NULL;
353
354 CRYPTO_w_lock(CRYPTO_LOCK_ERR);
355 if (!int_error_hash && create)
356 {
357 CRYPTO_push_info("int_err_get (err.c)");
358 int_error_hash = lh_ERR_STRING_DATA_new();
359 CRYPTO_pop_info();
360 }
361 if (int_error_hash)
362 ret = int_error_hash;
363 CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
364
365 return ret;
366 }
367
368static void int_err_del(void)
369 {
370 CRYPTO_w_lock(CRYPTO_LOCK_ERR);
371 if (int_error_hash)
372 {
373 lh_ERR_STRING_DATA_free(int_error_hash);
374 int_error_hash = NULL;
375 }
376 CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
377 }
378
379static ERR_STRING_DATA *int_err_get_item(const ERR_STRING_DATA *d)
380 {
381 ERR_STRING_DATA *p;
382 LHASH_OF(ERR_STRING_DATA) *hash;
383
384 err_fns_check();
385 hash = ERRFN(err_get)(0);
386 if (!hash)
387 return NULL;
388
389 CRYPTO_r_lock(CRYPTO_LOCK_ERR);
390 p = lh_ERR_STRING_DATA_retrieve(hash, d);
391 CRYPTO_r_unlock(CRYPTO_LOCK_ERR);
392
393 return p;
394 }
395
396static ERR_STRING_DATA *int_err_set_item(ERR_STRING_DATA *d)
397 {
398 ERR_STRING_DATA *p;
399 LHASH_OF(ERR_STRING_DATA) *hash;
400
401 err_fns_check();
402 hash = ERRFN(err_get)(1);
403 if (!hash)
404 return NULL;
405
406 CRYPTO_w_lock(CRYPTO_LOCK_ERR);
407 p = lh_ERR_STRING_DATA_insert(hash, d);
408 CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
409
410 return p;
411 }
412
413static ERR_STRING_DATA *int_err_del_item(ERR_STRING_DATA *d)
414 {
415 ERR_STRING_DATA *p;
416 LHASH_OF(ERR_STRING_DATA) *hash;
417
418 err_fns_check();
419 hash = ERRFN(err_get)(0);
420 if (!hash)
421 return NULL;
422
423 CRYPTO_w_lock(CRYPTO_LOCK_ERR);
424 p = lh_ERR_STRING_DATA_delete(hash, d);
425 CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
426
427 return p;
428 }
429
430static unsigned long err_state_hash(const ERR_STATE *a)
431 {
432 return CRYPTO_THREADID_hash(&a->tid) * 13;
433 }
434static IMPLEMENT_LHASH_HASH_FN(err_state, ERR_STATE)
435
436static int err_state_cmp(const ERR_STATE *a, const ERR_STATE *b)
437 {
438 return CRYPTO_THREADID_cmp(&a->tid, &b->tid);
439 }
440static IMPLEMENT_LHASH_COMP_FN(err_state, ERR_STATE)
441
442static LHASH_OF(ERR_STATE) *int_thread_get(int create)
443 {
444 LHASH_OF(ERR_STATE) *ret = NULL;
445
446 CRYPTO_w_lock(CRYPTO_LOCK_ERR);
447 if (!int_thread_hash && create)
448 {
449 CRYPTO_push_info("int_thread_get (err.c)");
450 int_thread_hash = lh_ERR_STATE_new();
451 CRYPTO_pop_info();
452 }
453 if (int_thread_hash)
454 {
455 int_thread_hash_references++;
456 ret = int_thread_hash;
457 }
458 CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
459 return ret;
460 }
461
462static void int_thread_release(LHASH_OF(ERR_STATE) **hash)
463 {
464 int i;
465
466 if (hash == NULL || *hash == NULL)
467 return;
468
469 i = CRYPTO_add(&int_thread_hash_references, -1, CRYPTO_LOCK_ERR);
470
471#ifdef REF_PRINT
472 fprintf(stderr,"%4d:%s\n",int_thread_hash_references,"ERR");
473#endif
474 if (i > 0) return;
475#ifdef REF_CHECK
476 if (i < 0)
477 {
478 fprintf(stderr,"int_thread_release, bad reference count\n");
479 abort(); /* ok */
480 }
481#endif
482 *hash = NULL;
483 }
484
485static ERR_STATE *int_thread_get_item(const ERR_STATE *d)
486 {
487 ERR_STATE *p;
488 LHASH_OF(ERR_STATE) *hash;
489
490 err_fns_check();
491 hash = ERRFN(thread_get)(0);
492 if (!hash)
493 return NULL;
494
495 CRYPTO_r_lock(CRYPTO_LOCK_ERR);
496 p = lh_ERR_STATE_retrieve(hash, d);
497 CRYPTO_r_unlock(CRYPTO_LOCK_ERR);
498
499 ERRFN(thread_release)(&hash);
500 return p;
501 }
502
503static ERR_STATE *int_thread_set_item(ERR_STATE *d)
504 {
505 ERR_STATE *p;
506 LHASH_OF(ERR_STATE) *hash;
507
508 err_fns_check();
509 hash = ERRFN(thread_get)(1);
510 if (!hash)
511 return NULL;
512
513 CRYPTO_w_lock(CRYPTO_LOCK_ERR);
514 p = lh_ERR_STATE_insert(hash, d);
515 CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
516
517 ERRFN(thread_release)(&hash);
518 return p;
519 }
520
521static void int_thread_del_item(const ERR_STATE *d)
522 {
523 ERR_STATE *p;
524 LHASH_OF(ERR_STATE) *hash;
525
526 err_fns_check();
527 hash = ERRFN(thread_get)(0);
528 if (!hash)
529 return;
530
531 CRYPTO_w_lock(CRYPTO_LOCK_ERR);
532 p = lh_ERR_STATE_delete(hash, d);
533 /* make sure we don't leak memory */
534 if (int_thread_hash_references == 1
535 && int_thread_hash && lh_ERR_STATE_num_items(int_thread_hash) == 0)
536 {
537 lh_ERR_STATE_free(int_thread_hash);
538 int_thread_hash = NULL;
539 }
540 CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
541
542 ERRFN(thread_release)(&hash);
543 if (p)
544 ERR_STATE_free(p);
545 }
546
547static int int_err_get_next_lib(void)
548 {
549 int ret;
550
551 CRYPTO_w_lock(CRYPTO_LOCK_ERR);
552 ret = int_err_library_number++;
553 CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
554
555 return ret;
556 }
557
558
559#ifndef OPENSSL_NO_ERR
560#define NUM_SYS_STR_REASONS 127
561#define LEN_SYS_STR_REASON 32
562
563static ERR_STRING_DATA SYS_str_reasons[NUM_SYS_STR_REASONS + 1];
564/* SYS_str_reasons is filled with copies of strerror() results at
565 * initialization.
566 * 'errno' values up to 127 should cover all usual errors,
567 * others will be displayed numerically by ERR_error_string.
568 * It is crucial that we have something for each reason code
569 * that occurs in ERR_str_reasons, or bogus reason strings
570 * will be returned for SYSerr(), which always gets an errno
571 * value and never one of those 'standard' reason codes. */
572
573static void build_SYS_str_reasons(void)
574 {
575 /* OPENSSL_malloc cannot be used here, use static storage instead */
576 static char strerror_tab[NUM_SYS_STR_REASONS][LEN_SYS_STR_REASON];
577 int i;
578 static int init = 1;
579
580 CRYPTO_r_lock(CRYPTO_LOCK_ERR);
581 if (!init)
582 {
583 CRYPTO_r_unlock(CRYPTO_LOCK_ERR);
584 return;
585 }
586
587 CRYPTO_r_unlock(CRYPTO_LOCK_ERR);
588 CRYPTO_w_lock(CRYPTO_LOCK_ERR);
589 if (!init)
590 {
591 CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
592 return;
593 }
594
595 for (i = 1; i <= NUM_SYS_STR_REASONS; i++)
596 {
597 ERR_STRING_DATA *str = &SYS_str_reasons[i - 1];
598
599 str->error = (unsigned long)i;
600 if (str->string == NULL)
601 {
602 char (*dest)[LEN_SYS_STR_REASON] = &(strerror_tab[i - 1]);
603 char *src = strerror(i);
604 if (src != NULL)
605 {
606 strncpy(*dest, src, sizeof *dest);
607 (*dest)[sizeof *dest - 1] = '\0';
608 str->string = *dest;
609 }
610 }
611 if (str->string == NULL)
612 str->string = "unknown";
613 }
614
615 /* Now we still have SYS_str_reasons[NUM_SYS_STR_REASONS] = {0, NULL},
616 * as required by ERR_load_strings. */
617
618 init = 0;
619
620 CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
621 }
622#endif
125 623
126#define err_clear_data(p,i) \ 624#define err_clear_data(p,i) \
127 do { \ 625 do { \
@@ -143,6 +641,68 @@ static unsigned long get_error_values(int inc,int top,
143 (p)->err_line[i]= -1; \ 641 (p)->err_line[i]= -1; \
144 } while(0) 642 } while(0)
145 643
644static void ERR_STATE_free(ERR_STATE *s)
645 {
646 int i;
647
648 if (s == NULL)
649 return;
650
651 for (i=0; i<ERR_NUM_ERRORS; i++)
652 {
653 err_clear_data(s,i);
654 }
655 OPENSSL_free(s);
656 }
657
658void ERR_load_ERR_strings(void)
659 {
660 err_fns_check();
661#ifndef OPENSSL_NO_ERR
662 err_load_strings(0,ERR_str_libraries);
663 err_load_strings(0,ERR_str_reasons);
664 err_load_strings(ERR_LIB_SYS,ERR_str_functs);
665 build_SYS_str_reasons();
666 err_load_strings(ERR_LIB_SYS,SYS_str_reasons);
667#endif
668 }
669
670static void err_load_strings(int lib, ERR_STRING_DATA *str)
671 {
672 while (str->error)
673 {
674 if (lib)
675 str->error|=ERR_PACK(lib,0,0);
676 ERRFN(err_set_item)(str);
677 str++;
678 }
679 }
680
681void ERR_load_strings(int lib, ERR_STRING_DATA *str)
682 {
683 ERR_load_ERR_strings();
684 err_load_strings(lib, str);
685 }
686
687void ERR_unload_strings(int lib, ERR_STRING_DATA *str)
688 {
689 while (str->error)
690 {
691 if (lib)
692 str->error|=ERR_PACK(lib,0,0);
693 ERRFN(err_del_item)(str);
694 str++;
695 }
696 }
697
698void ERR_free_strings(void)
699 {
700 err_fns_check();
701 ERRFN(err_del)();
702 }
703
704/********************************************************/
705
146void ERR_put_error(int lib, int func, int reason, const char *file, 706void ERR_put_error(int lib, int func, int reason, const char *file,
147 int line) 707 int line)
148 { 708 {
@@ -297,6 +857,196 @@ static unsigned long get_error_values(int inc, int top, const char **file, int *
297 return ret; 857 return ret;
298 } 858 }
299 859
860void ERR_error_string_n(unsigned long e, char *buf, size_t len)
861 {
862 char lsbuf[64], fsbuf[64], rsbuf[64];
863 const char *ls,*fs,*rs;
864 unsigned long l,f,r;
865
866 l=ERR_GET_LIB(e);
867 f=ERR_GET_FUNC(e);
868 r=ERR_GET_REASON(e);
869
870 ls=ERR_lib_error_string(e);
871 fs=ERR_func_error_string(e);
872 rs=ERR_reason_error_string(e);
873
874 if (ls == NULL)
875 BIO_snprintf(lsbuf, sizeof(lsbuf), "lib(%lu)", l);
876 if (fs == NULL)
877 BIO_snprintf(fsbuf, sizeof(fsbuf), "func(%lu)", f);
878 if (rs == NULL)
879 BIO_snprintf(rsbuf, sizeof(rsbuf), "reason(%lu)", r);
880
881 BIO_snprintf(buf, len,"error:%08lX:%s:%s:%s", e, ls?ls:lsbuf,
882 fs?fs:fsbuf, rs?rs:rsbuf);
883 if (strlen(buf) == len-1)
884 {
885 /* output may be truncated; make sure we always have 5
886 * colon-separated fields, i.e. 4 colons ... */
887#define NUM_COLONS 4
888 if (len > NUM_COLONS) /* ... if possible */
889 {
890 int i;
891 char *s = buf;
892
893 for (i = 0; i < NUM_COLONS; i++)
894 {
895 char *colon = strchr(s, ':');
896 if (colon == NULL || colon > &buf[len-1] - NUM_COLONS + i)
897 {
898 /* set colon no. i at last possible position
899 * (buf[len-1] is the terminating 0)*/
900 colon = &buf[len-1] - NUM_COLONS + i;
901 *colon = ':';
902 }
903 s = colon + 1;
904 }
905 }
906 }
907 }
908
909/* BAD for multi-threading: uses a local buffer if ret == NULL */
910/* ERR_error_string_n should be used instead for ret != NULL
911 * as ERR_error_string cannot know how large the buffer is */
912char *ERR_error_string(unsigned long e, char *ret)
913 {
914 static char buf[256];
915
916 if (ret == NULL) ret=buf;
917 ERR_error_string_n(e, ret, 256);
918
919 return ret;
920 }
921
922LHASH_OF(ERR_STRING_DATA) *ERR_get_string_table(void)
923 {
924 err_fns_check();
925 return ERRFN(err_get)(0);
926 }
927
928LHASH_OF(ERR_STATE) *ERR_get_err_state_table(void)
929 {
930 err_fns_check();
931 return ERRFN(thread_get)(0);
932 }
933
934void ERR_release_err_state_table(LHASH_OF(ERR_STATE) **hash)
935 {
936 err_fns_check();
937 ERRFN(thread_release)(hash);
938 }
939
940const char *ERR_lib_error_string(unsigned long e)
941 {
942 ERR_STRING_DATA d,*p;
943 unsigned long l;
944
945 err_fns_check();
946 l=ERR_GET_LIB(e);
947 d.error=ERR_PACK(l,0,0);
948 p=ERRFN(err_get_item)(&d);
949 return((p == NULL)?NULL:p->string);
950 }
951
952const char *ERR_func_error_string(unsigned long e)
953 {
954 ERR_STRING_DATA d,*p;
955 unsigned long l,f;
956
957 err_fns_check();
958 l=ERR_GET_LIB(e);
959 f=ERR_GET_FUNC(e);
960 d.error=ERR_PACK(l,f,0);
961 p=ERRFN(err_get_item)(&d);
962 return((p == NULL)?NULL:p->string);
963 }
964
965const char *ERR_reason_error_string(unsigned long e)
966 {
967 ERR_STRING_DATA d,*p=NULL;
968 unsigned long l,r;
969
970 err_fns_check();
971 l=ERR_GET_LIB(e);
972 r=ERR_GET_REASON(e);
973 d.error=ERR_PACK(l,0,r);
974 p=ERRFN(err_get_item)(&d);
975 if (!p)
976 {
977 d.error=ERR_PACK(0,0,r);
978 p=ERRFN(err_get_item)(&d);
979 }
980 return((p == NULL)?NULL:p->string);
981 }
982
983void ERR_remove_thread_state(const CRYPTO_THREADID *id)
984 {
985 ERR_STATE tmp;
986
987 if (id)
988 CRYPTO_THREADID_cpy(&tmp.tid, id);
989 else
990 CRYPTO_THREADID_current(&tmp.tid);
991 err_fns_check();
992 /* thread_del_item automatically destroys the LHASH if the number of
993 * items reaches zero. */
994 ERRFN(thread_del_item)(&tmp);
995 }
996
997#ifndef OPENSSL_NO_DEPRECATED
998void ERR_remove_state(unsigned long pid)
999 {
1000 ERR_remove_thread_state(NULL);
1001 }
1002#endif
1003
1004ERR_STATE *ERR_get_state(void)
1005 {
1006 static ERR_STATE fallback;
1007 ERR_STATE *ret,tmp,*tmpp=NULL;
1008 int i;
1009 CRYPTO_THREADID tid;
1010
1011 err_fns_check();
1012 CRYPTO_THREADID_current(&tid);
1013 CRYPTO_THREADID_cpy(&tmp.tid, &tid);
1014 ret=ERRFN(thread_get_item)(&tmp);
1015
1016 /* ret == the error state, if NULL, make a new one */
1017 if (ret == NULL)
1018 {
1019 ret=(ERR_STATE *)OPENSSL_malloc(sizeof(ERR_STATE));
1020 if (ret == NULL) return(&fallback);
1021 CRYPTO_THREADID_cpy(&ret->tid, &tid);
1022 ret->top=0;
1023 ret->bottom=0;
1024 for (i=0; i<ERR_NUM_ERRORS; i++)
1025 {
1026 ret->err_data[i]=NULL;
1027 ret->err_data_flags[i]=0;
1028 }
1029 tmpp = ERRFN(thread_set_item)(ret);
1030 /* To check if insertion failed, do a get. */
1031 if (ERRFN(thread_get_item)(ret) != ret)
1032 {
1033 ERR_STATE_free(ret); /* could not insert it */
1034 return(&fallback);
1035 }
1036 /* If a race occured in this function and we came second, tmpp
1037 * is the first one that we just replaced. */
1038 if (tmpp)
1039 ERR_STATE_free(tmpp);
1040 }
1041 return ret;
1042 }
1043
1044int ERR_get_next_error_library(void)
1045 {
1046 err_fns_check();
1047 return ERRFN(get_next_lib)();
1048 }
1049
300void ERR_set_error_data(char *data, int flags) 1050void ERR_set_error_data(char *data, int flags)
301 { 1051 {
302 ERR_STATE *es; 1052 ERR_STATE *es;
@@ -383,34 +1133,3 @@ int ERR_pop_to_mark(void)
383 es->err_flags[es->top]&=~ERR_FLAG_MARK; 1133 es->err_flags[es->top]&=~ERR_FLAG_MARK;
384 return 1; 1134 return 1;
385 } 1135 }
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 dcac415231..b9f8c16d47 100644
--- a/src/lib/libcrypto/err/err.h
+++ b/src/lib/libcrypto/err/err.h
@@ -55,6 +55,59 @@
55 * copied and put under another distribution licence 55 * copied and put under another distribution licence
56 * [including the GNU Public Licence.] 56 * [including the GNU Public Licence.]
57 */ 57 */
58/* ====================================================================
59 * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved.
60 *
61 * Redistribution and use in source and binary forms, with or without
62 * modification, are permitted provided that the following conditions
63 * are met:
64 *
65 * 1. Redistributions of source code must retain the above copyright
66 * notice, this list of conditions and the following disclaimer.
67 *
68 * 2. Redistributions in binary form must reproduce the above copyright
69 * notice, this list of conditions and the following disclaimer in
70 * the documentation and/or other materials provided with the
71 * distribution.
72 *
73 * 3. All advertising materials mentioning features or use of this
74 * software must display the following acknowledgment:
75 * "This product includes software developed by the OpenSSL Project
76 * for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
77 *
78 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
79 * endorse or promote products derived from this software without
80 * prior written permission. For written permission, please contact
81 * openssl-core@openssl.org.
82 *
83 * 5. Products derived from this software may not be called "OpenSSL"
84 * nor may "OpenSSL" appear in their names without prior written
85 * permission of the OpenSSL Project.
86 *
87 * 6. Redistributions of any form whatsoever must retain the following
88 * acknowledgment:
89 * "This product includes software developed by the OpenSSL Project
90 * for use in the OpenSSL Toolkit (http://www.openssl.org/)"
91 *
92 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
93 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
94 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
95 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
96 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
97 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
98 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
99 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
100 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
101 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
102 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
103 * OF THE POSSIBILITY OF SUCH DAMAGE.
104 * ====================================================================
105 *
106 * This product includes cryptographic software written by Eric Young
107 * (eay@cryptsoft.com). This product includes software written by Tim
108 * Hudson (tjh@cryptsoft.com).
109 *
110 */
58 111
59#ifndef HEADER_ERR_H 112#ifndef HEADER_ERR_H
60#define HEADER_ERR_H 113#define HEADER_ERR_H
@@ -94,7 +147,7 @@ extern "C" {
94#define ERR_NUM_ERRORS 16 147#define ERR_NUM_ERRORS 16
95typedef struct err_state_st 148typedef struct err_state_st
96 { 149 {
97 unsigned long pid; 150 CRYPTO_THREADID tid;
98 int err_flags[ERR_NUM_ERRORS]; 151 int err_flags[ERR_NUM_ERRORS];
99 unsigned long err_buffer[ERR_NUM_ERRORS]; 152 unsigned long err_buffer[ERR_NUM_ERRORS];
100 char *err_data[ERR_NUM_ERRORS]; 153 char *err_data[ERR_NUM_ERRORS];
@@ -142,7 +195,9 @@ typedef struct err_state_st
142#define ERR_LIB_STORE 44 195#define ERR_LIB_STORE 44
143#define ERR_LIB_FIPS 45 196#define ERR_LIB_FIPS 45
144#define ERR_LIB_CMS 46 197#define ERR_LIB_CMS 46
145#define ERR_LIB_JPAKE 47 198#define ERR_LIB_TS 47
199#define ERR_LIB_HMAC 48
200#define ERR_LIB_JPAKE 49
146 201
147#define ERR_LIB_USER 128 202#define ERR_LIB_USER 128
148 203
@@ -176,6 +231,8 @@ typedef struct err_state_st
176#define STOREerr(f,r) ERR_PUT_error(ERR_LIB_STORE,(f),(r),__FILE__,__LINE__) 231#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__) 232#define FIPSerr(f,r) ERR_PUT_error(ERR_LIB_FIPS,(f),(r),__FILE__,__LINE__)
178#define CMSerr(f,r) ERR_PUT_error(ERR_LIB_CMS,(f),(r),__FILE__,__LINE__) 233#define CMSerr(f,r) ERR_PUT_error(ERR_LIB_CMS,(f),(r),__FILE__,__LINE__)
234#define TSerr(f,r) ERR_PUT_error(ERR_LIB_TS,(f),(r),__FILE__,__LINE__)
235#define HMACerr(f,r) ERR_PUT_error(ERR_LIB_HMAC,(f),(r),__FILE__,__LINE__)
179#define JPAKEerr(f,r) ERR_PUT_error(ERR_LIB_JPAKE,(f),(r),__FILE__,__LINE__) 236#define JPAKEerr(f,r) ERR_PUT_error(ERR_LIB_JPAKE,(f),(r),__FILE__,__LINE__)
180 237
181/* Borland C seems too stupid to be able to shift and do longs in 238/* Borland C seems too stupid to be able to shift and do longs in
@@ -232,6 +289,7 @@ typedef struct err_state_st
232#define ERR_R_ECDSA_LIB ERR_LIB_ECDSA /* 42 */ 289#define ERR_R_ECDSA_LIB ERR_LIB_ECDSA /* 42 */
233#define ERR_R_ECDH_LIB ERR_LIB_ECDH /* 43 */ 290#define ERR_R_ECDH_LIB ERR_LIB_ECDH /* 43 */
234#define ERR_R_STORE_LIB ERR_LIB_STORE /* 44 */ 291#define ERR_R_STORE_LIB ERR_LIB_STORE /* 44 */
292#define ERR_R_TS_LIB ERR_LIB_TS /* 45 */
235 293
236#define ERR_R_NESTED_ASN1_ERROR 58 294#define ERR_R_NESTED_ASN1_ERROR 58
237#define ERR_R_BAD_ASN1_OBJECT_HEADER 59 295#define ERR_R_BAD_ASN1_OBJECT_HEADER 59
@@ -294,13 +352,16 @@ void ERR_load_ERR_strings(void);
294void ERR_load_crypto_strings(void); 352void ERR_load_crypto_strings(void);
295void ERR_free_strings(void); 353void ERR_free_strings(void);
296 354
355void ERR_remove_thread_state(const CRYPTO_THREADID *tid);
356#ifndef OPENSSL_NO_DEPRECATED
297void ERR_remove_state(unsigned long pid); /* if zero we look it up */ 357void ERR_remove_state(unsigned long pid); /* if zero we look it up */
358#endif
298ERR_STATE *ERR_get_state(void); 359ERR_STATE *ERR_get_state(void);
299 360
300#ifndef OPENSSL_NO_LHASH 361#ifndef OPENSSL_NO_LHASH
301LHASH *ERR_get_string_table(void); 362LHASH_OF(ERR_STRING_DATA) *ERR_get_string_table(void);
302LHASH *ERR_get_err_state_table(void); 363LHASH_OF(ERR_STATE) *ERR_get_err_state_table(void);
303void ERR_release_err_state_table(LHASH **hash); 364void ERR_release_err_state_table(LHASH_OF(ERR_STATE) **hash);
304#endif 365#endif
305 366
306int ERR_get_next_error_library(void); 367int ERR_get_next_error_library(void);
@@ -308,12 +369,6 @@ int ERR_get_next_error_library(void);
308int ERR_set_mark(void); 369int ERR_set_mark(void);
309int ERR_pop_to_mark(void); 370int ERR_pop_to_mark(void);
310 371
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
317/* Already defined in ossl_typ.h */ 372/* Already defined in ossl_typ.h */
318/* typedef struct st_ERR_FNS ERR_FNS; */ 373/* typedef struct st_ERR_FNS ERR_FNS; */
319/* An application can use this function and provide the return value to loaded 374/* 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 f21a5276ed..fc049e8e88 100644
--- a/src/lib/libcrypto/err/err_all.c
+++ b/src/lib/libcrypto/err/err_all.c
@@ -64,6 +64,7 @@
64#endif 64#endif
65#include <openssl/buffer.h> 65#include <openssl/buffer.h>
66#include <openssl/bio.h> 66#include <openssl/bio.h>
67#include <openssl/comp.h>
67#ifndef OPENSSL_NO_RSA 68#ifndef OPENSSL_NO_RSA
68#include <openssl/rsa.h> 69#include <openssl/rsa.h>
69#endif 70#endif
@@ -94,16 +95,14 @@
94#include <openssl/ui.h> 95#include <openssl/ui.h>
95#include <openssl/ocsp.h> 96#include <openssl/ocsp.h>
96#include <openssl/err.h> 97#include <openssl/err.h>
97#ifdef OPENSSL_FIPS 98#include <openssl/ts.h>
98#include <openssl/fips.h>
99#endif
100
101#ifndef OPENSSL_NO_CMS 99#ifndef OPENSSL_NO_CMS
102#include <openssl/cms.h> 100#include <openssl/cms.h>
103#endif 101#endif
104#ifndef OPENSSL_NO_JPAKE 102#ifndef OPENSSL_NO_JPAKE
105#include <openssl/jpake.h> 103#include <openssl/jpake.h>
106#endif 104#endif
105#include <openssl/comp.h>
107 106
108void ERR_load_crypto_strings(void) 107void ERR_load_crypto_strings(void)
109 { 108 {
@@ -127,6 +126,7 @@ void ERR_load_crypto_strings(void)
127 ERR_load_ASN1_strings(); 126 ERR_load_ASN1_strings();
128 ERR_load_CONF_strings(); 127 ERR_load_CONF_strings();
129 ERR_load_CRYPTO_strings(); 128 ERR_load_CRYPTO_strings();
129 ERR_load_COMP_strings();
130#ifndef OPENSSL_NO_EC 130#ifndef OPENSSL_NO_EC
131 ERR_load_EC_strings(); 131 ERR_load_EC_strings();
132#endif 132#endif
@@ -143,19 +143,18 @@ void ERR_load_crypto_strings(void)
143 ERR_load_PKCS12_strings(); 143 ERR_load_PKCS12_strings();
144 ERR_load_RAND_strings(); 144 ERR_load_RAND_strings();
145 ERR_load_DSO_strings(); 145 ERR_load_DSO_strings();
146 ERR_load_TS_strings();
146#ifndef OPENSSL_NO_ENGINE 147#ifndef OPENSSL_NO_ENGINE
147 ERR_load_ENGINE_strings(); 148 ERR_load_ENGINE_strings();
148#endif 149#endif
149 ERR_load_OCSP_strings(); 150 ERR_load_OCSP_strings();
150 ERR_load_UI_strings(); 151 ERR_load_UI_strings();
151#ifdef OPENSSL_FIPS
152 ERR_load_FIPS_strings();
153#endif
154#ifndef OPENSSL_NO_CMS 152#ifndef OPENSSL_NO_CMS
155 ERR_load_CMS_strings(); 153 ERR_load_CMS_strings();
156#endif 154#endif
157#ifndef OPENSSL_NO_JPAKE 155#ifndef OPENSSL_NO_JPAKE
158 ERR_load_JPAKE_strings(); 156 ERR_load_JPAKE_strings();
159#endif 157#endif
158 ERR_load_COMP_strings();
160#endif 159#endif
161 } 160 }
diff --git a/src/lib/libcrypto/err/err_bio.c b/src/lib/libcrypto/err/err_bio.c
deleted file mode 100644
index a42f804840..0000000000
--- a/src/lib/libcrypto/err/err_bio.c
+++ /dev/null
@@ -1,75 +0,0 @@
1/* crypto/err/err_prn.c */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved.
4 *
5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL.
8 *
9 * This library is free for commercial and non-commercial use as long as
10 * the following conditions are aheared to. The following conditions
11 * apply to all code found in this distribution, be it the RC4, RSA,
12 * lhash, DES, etc., code; not just the SSL code. The SSL documentation
13 * included with this distribution is covered by the same copyright terms
14 * except that the holder is Tim Hudson (tjh@cryptsoft.com).
15 *
16 * Copyright remains Eric Young's, and as such any Copyright notices in
17 * the code are not to be removed.
18 * If this package is used in a product, Eric Young should be given attribution
19 * as the author of the parts of the library used.
20 * This can be in the form of a textual message at program startup or
21 * in documentation (online or textual) provided with the package.
22 *
23 * Redistribution and use in source and binary forms, with or without
24 * modification, are permitted provided that the following conditions
25 * are met:
26 * 1. Redistributions of source code must retain the copyright
27 * notice, this list of conditions and the following disclaimer.
28 * 2. Redistributions in binary form must reproduce the above copyright
29 * notice, this list of conditions and the following disclaimer in the
30 * documentation and/or other materials provided with the distribution.
31 * 3. All advertising materials mentioning features or use of this software
32 * must display the following acknowledgement:
33 * "This product includes cryptographic software written by
34 * Eric Young (eay@cryptsoft.com)"
35 * The word 'cryptographic' can be left out if the rouines from the library
36 * being used are not cryptographic related :-).
37 * 4. If you include any Windows specific code (or a derivative thereof) from
38 * the apps directory (application code) you must include an acknowledgement:
39 * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
40 *
41 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
42 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
43 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
44 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
45 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
46 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
47 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
48 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
49 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
50 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
51 * SUCH DAMAGE.
52 *
53 * The licence and distribution terms for any publically available version or
54 * derivative of this code cannot be changed. i.e. this code cannot simply be
55 * copied and put under another distribution licence
56 * [including the GNU Public Licence.]
57 */
58
59#include <stdio.h>
60#include "cryptlib.h"
61#include <openssl/lhash.h>
62#include <openssl/crypto.h>
63#include <openssl/buffer.h>
64#include <openssl/err.h>
65
66static int print_bio(const char *str, size_t len, void *bp)
67 {
68 return BIO_write((BIO *)bp, str, len);
69 }
70void ERR_print_errors(BIO *bp)
71 {
72 ERR_print_errors_cb(print_bio, bp);
73 }
74
75
diff --git a/src/lib/libcrypto/err/err_def.c b/src/lib/libcrypto/err/err_def.c
deleted file mode 100644
index 7ed3d84955..0000000000
--- a/src/lib/libcrypto/err/err_def.c
+++ /dev/null
@@ -1,665 +0,0 @@
1/* crypto/err/err_def.c */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved.
4 *
5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL.
8 *
9 * This library is free for commercial and non-commercial use as long as
10 * the following conditions are aheared to. The following conditions
11 * apply to all code found in this distribution, be it the RC4, RSA,
12 * lhash, DES, etc., code; not just the SSL code. The SSL documentation
13 * included with this distribution is covered by the same copyright terms
14 * except that the holder is Tim Hudson (tjh@cryptsoft.com).
15 *
16 * Copyright remains Eric Young's, and as such any Copyright notices in
17 * the code are not to be removed.
18 * If this package is used in a product, Eric Young should be given attribution
19 * as the author of the parts of the library used.
20 * This can be in the form of a textual message at program startup or
21 * in documentation (online or textual) provided with the package.
22 *
23 * Redistribution and use in source and binary forms, with or without
24 * modification, are permitted provided that the following conditions
25 * are met:
26 * 1. Redistributions of source code must retain the copyright
27 * notice, this list of conditions and the following disclaimer.
28 * 2. Redistributions in binary form must reproduce the above copyright
29 * notice, this list of conditions and the following disclaimer in the
30 * documentation and/or other materials provided with the distribution.
31 * 3. All advertising materials mentioning features or use of this software
32 * must display the following acknowledgement:
33 * "This product includes cryptographic software written by
34 * Eric Young (eay@cryptsoft.com)"
35 * The word 'cryptographic' can be left out if the rouines from the library
36 * being used are not cryptographic related :-).
37 * 4. If you include any Windows specific code (or a derivative thereof) from
38 * the apps directory (application code) you must include an acknowledgement:
39 * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
40 *
41 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
42 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
43 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
44 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
45 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
46 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
47 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
48 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
49 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
50 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
51 * SUCH DAMAGE.
52 *
53 * The licence and distribution terms for any publically available version or
54 * derivative of this code cannot be changed. i.e. this code cannot simply be
55 * copied and put under another distribution licence
56 * [including the GNU Public Licence.]
57 */
58/* ====================================================================
59 * Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved.
60 *
61 * Redistribution and use in source and binary forms, with or without
62 * modification, are permitted provided that the following conditions
63 * are met:
64 *
65 * 1. Redistributions of source code must retain the above copyright
66 * notice, this list of conditions and the following disclaimer.
67 *
68 * 2. Redistributions in binary form must reproduce the above copyright
69 * notice, this list of conditions and the following disclaimer in
70 * the documentation and/or other materials provided with the
71 * distribution.
72 *
73 * 3. All advertising materials mentioning features or use of this
74 * software must display the following acknowledgment:
75 * "This product includes software developed by the OpenSSL Project
76 * for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
77 *
78 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
79 * endorse or promote products derived from this software without
80 * prior written permission. For written permission, please contact
81 * openssl-core@openssl.org.
82 *
83 * 5. Products derived from this software may not be called "OpenSSL"
84 * nor may "OpenSSL" appear in their names without prior written
85 * permission of the OpenSSL Project.
86 *
87 * 6. Redistributions of any form whatsoever must retain the following
88 * acknowledgment:
89 * "This product includes software developed by the OpenSSL Project
90 * for use in the OpenSSL Toolkit (http://www.openssl.org/)"
91 *
92 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
93 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
94 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
95 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
96 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
97 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
98 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
99 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
100 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
101 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
102 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
103 * OF THE POSSIBILITY OF SUCH DAMAGE.
104 * ====================================================================
105 *
106 * This product includes cryptographic software written by Eric Young
107 * (eay@cryptsoft.com). This product includes software written by Tim
108 * Hudson (tjh@cryptsoft.com).
109 *
110 */
111
112#include <stdio.h>
113#include <stdarg.h>
114#include <string.h>
115#include "cryptlib.h"
116#include <openssl/lhash.h>
117#include <openssl/crypto.h>
118#include <openssl/buffer.h>
119#include <openssl/bio.h>
120#include <openssl/err.h>
121
122#define err_clear_data(p,i) \
123 do { \
124 if (((p)->err_data[i] != NULL) && \
125 (p)->err_data_flags[i] & ERR_TXT_MALLOCED) \
126 { \
127 OPENSSL_free((p)->err_data[i]); \
128 (p)->err_data[i]=NULL; \
129 } \
130 (p)->err_data_flags[i]=0; \
131 } while(0)
132
133#define err_clear(p,i) \
134 do { \
135 (p)->err_flags[i]=0; \
136 (p)->err_buffer[i]=0; \
137 err_clear_data(p,i); \
138 (p)->err_file[i]=NULL; \
139 (p)->err_line[i]= -1; \
140 } while(0)
141
142static void err_load_strings(int lib, ERR_STRING_DATA *str);
143
144static void ERR_STATE_free(ERR_STATE *s);
145
146/* Define the predeclared (but externally opaque) "ERR_FNS" type */
147struct st_ERR_FNS
148 {
149 /* Works on the "error_hash" string table */
150 LHASH *(*cb_err_get)(int create);
151 void (*cb_err_del)(void);
152 ERR_STRING_DATA *(*cb_err_get_item)(const ERR_STRING_DATA *);
153 ERR_STRING_DATA *(*cb_err_set_item)(ERR_STRING_DATA *);
154 ERR_STRING_DATA *(*cb_err_del_item)(ERR_STRING_DATA *);
155 /* Works on the "thread_hash" error-state table */
156 LHASH *(*cb_thread_get)(int create);
157 void (*cb_thread_release)(LHASH **hash);
158 ERR_STATE *(*cb_thread_get_item)(const ERR_STATE *);
159 ERR_STATE *(*cb_thread_set_item)(ERR_STATE *);
160 void (*cb_thread_del_item)(const ERR_STATE *);
161 /* Returns the next available error "library" numbers */
162 int (*cb_get_next_lib)(void);
163 };
164
165/* Predeclarations of the "err_defaults" functions */
166static LHASH *int_err_get(int create);
167static void int_err_del(void);
168static ERR_STRING_DATA *int_err_get_item(const ERR_STRING_DATA *);
169static ERR_STRING_DATA *int_err_set_item(ERR_STRING_DATA *);
170static ERR_STRING_DATA *int_err_del_item(ERR_STRING_DATA *);
171static LHASH *int_thread_get(int create);
172static void int_thread_release(LHASH **hash);
173static ERR_STATE *int_thread_get_item(const ERR_STATE *);
174static ERR_STATE *int_thread_set_item(ERR_STATE *);
175static void int_thread_del_item(const ERR_STATE *);
176static int int_err_get_next_lib(void);
177/* The static ERR_FNS table using these defaults functions */
178static const ERR_FNS err_defaults =
179 {
180 int_err_get,
181 int_err_del,
182 int_err_get_item,
183 int_err_set_item,
184 int_err_del_item,
185 int_thread_get,
186 int_thread_release,
187 int_thread_get_item,
188 int_thread_set_item,
189 int_thread_del_item,
190 int_err_get_next_lib
191 };
192
193/* The replacable table of ERR_FNS functions we use at run-time */
194static const ERR_FNS *err_fns = NULL;
195
196/* Eg. rather than using "err_get()", use "ERRFN(err_get)()". */
197#define ERRFN(a) err_fns->cb_##a
198
199/* The internal state used by "err_defaults" - as such, the setting, reading,
200 * creating, and deleting of this data should only be permitted via the
201 * "err_defaults" functions. This way, a linked module can completely defer all
202 * ERR state operation (together with requisite locking) to the implementations
203 * and state in the loading application. */
204static LHASH *int_error_hash = NULL;
205static LHASH *int_thread_hash = NULL;
206static int int_thread_hash_references = 0;
207static int int_err_library_number= ERR_LIB_USER;
208
209/* Internal function that checks whether "err_fns" is set and if not, sets it to
210 * the defaults. */
211static void err_fns_check(void)
212 {
213 if (err_fns) return;
214
215 CRYPTO_w_lock(CRYPTO_LOCK_ERR);
216 if (!err_fns)
217 err_fns = &err_defaults;
218 CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
219 }
220
221/* API functions to get or set the underlying ERR functions. */
222
223const ERR_FNS *ERR_get_implementation(void)
224 {
225 err_fns_check();
226 return err_fns;
227 }
228
229int ERR_set_implementation(const ERR_FNS *fns)
230 {
231 int ret = 0;
232
233 CRYPTO_w_lock(CRYPTO_LOCK_ERR);
234 /* It's too late if 'err_fns' is non-NULL. BTW: not much point setting
235 * an error is there?! */
236 if (!err_fns)
237 {
238 err_fns = fns;
239 ret = 1;
240 }
241 CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
242 return ret;
243 }
244
245/* These are the callbacks provided to "lh_new()" when creating the LHASH tables
246 * internal to the "err_defaults" implementation. */
247
248/* static unsigned long err_hash(ERR_STRING_DATA *a); */
249static unsigned long err_hash(const void *a_void);
250/* static int err_cmp(ERR_STRING_DATA *a, ERR_STRING_DATA *b); */
251static int err_cmp(const void *a_void, const void *b_void);
252/* static unsigned long pid_hash(ERR_STATE *pid); */
253static unsigned long pid_hash(const void *pid_void);
254/* static int pid_cmp(ERR_STATE *a,ERR_STATE *pid); */
255static int pid_cmp(const void *a_void,const void *pid_void);
256
257/* The internal functions used in the "err_defaults" implementation */
258
259static LHASH *int_err_get(int create)
260 {
261 LHASH *ret = NULL;
262
263 CRYPTO_w_lock(CRYPTO_LOCK_ERR);
264 if (!int_error_hash && create)
265 {
266 CRYPTO_push_info("int_err_get (err.c)");
267 int_error_hash = lh_new(err_hash, err_cmp);
268 CRYPTO_pop_info();
269 }
270 if (int_error_hash)
271 ret = int_error_hash;
272 CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
273
274 return ret;
275 }
276
277static void int_err_del(void)
278 {
279 CRYPTO_w_lock(CRYPTO_LOCK_ERR);
280 if (int_error_hash)
281 {
282 lh_free(int_error_hash);
283 int_error_hash = NULL;
284 }
285 CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
286 }
287
288static ERR_STRING_DATA *int_err_get_item(const ERR_STRING_DATA *d)
289 {
290 ERR_STRING_DATA *p;
291 LHASH *hash;
292
293 err_fns_check();
294 hash = ERRFN(err_get)(0);
295 if (!hash)
296 return NULL;
297
298 CRYPTO_r_lock(CRYPTO_LOCK_ERR);
299 p = (ERR_STRING_DATA *)lh_retrieve(hash, d);
300 CRYPTO_r_unlock(CRYPTO_LOCK_ERR);
301
302 return p;
303 }
304
305static ERR_STRING_DATA *int_err_set_item(ERR_STRING_DATA *d)
306 {
307 ERR_STRING_DATA *p;
308 LHASH *hash;
309
310 err_fns_check();
311 hash = ERRFN(err_get)(1);
312 if (!hash)
313 return NULL;
314
315 CRYPTO_w_lock(CRYPTO_LOCK_ERR);
316 p = (ERR_STRING_DATA *)lh_insert(hash, d);
317 CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
318
319 return p;
320 }
321
322static ERR_STRING_DATA *int_err_del_item(ERR_STRING_DATA *d)
323 {
324 ERR_STRING_DATA *p;
325 LHASH *hash;
326
327 err_fns_check();
328 hash = ERRFN(err_get)(0);
329 if (!hash)
330 return NULL;
331
332 CRYPTO_w_lock(CRYPTO_LOCK_ERR);
333 p = (ERR_STRING_DATA *)lh_delete(hash, d);
334 CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
335
336 return p;
337 }
338
339static LHASH *int_thread_get(int create)
340 {
341 LHASH *ret = NULL;
342
343 CRYPTO_w_lock(CRYPTO_LOCK_ERR);
344 if (!int_thread_hash && create)
345 {
346 CRYPTO_push_info("int_thread_get (err.c)");
347 int_thread_hash = lh_new(pid_hash, pid_cmp);
348 CRYPTO_pop_info();
349 }
350 if (int_thread_hash)
351 {
352 int_thread_hash_references++;
353 ret = int_thread_hash;
354 }
355 CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
356 return ret;
357 }
358
359static void int_thread_release(LHASH **hash)
360 {
361 int i;
362
363 if (hash == NULL || *hash == NULL)
364 return;
365
366 i = CRYPTO_add(&int_thread_hash_references, -1, CRYPTO_LOCK_ERR);
367
368#ifdef REF_PRINT
369 fprintf(stderr,"%4d:%s\n",int_thread_hash_references,"ERR");
370#endif
371 if (i > 0) return;
372#ifdef REF_CHECK
373 if (i < 0)
374 {
375 fprintf(stderr,"int_thread_release, bad reference count\n");
376 abort(); /* ok */
377 }
378#endif
379 *hash = NULL;
380 }
381
382static ERR_STATE *int_thread_get_item(const ERR_STATE *d)
383 {
384 ERR_STATE *p;
385 LHASH *hash;
386
387 err_fns_check();
388 hash = ERRFN(thread_get)(0);
389 if (!hash)
390 return NULL;
391
392 CRYPTO_r_lock(CRYPTO_LOCK_ERR);
393 p = (ERR_STATE *)lh_retrieve(hash, d);
394 CRYPTO_r_unlock(CRYPTO_LOCK_ERR);
395
396 ERRFN(thread_release)(&hash);
397 return p;
398 }
399
400static ERR_STATE *int_thread_set_item(ERR_STATE *d)
401 {
402 ERR_STATE *p;
403 LHASH *hash;
404
405 err_fns_check();
406 hash = ERRFN(thread_get)(1);
407 if (!hash)
408 return NULL;
409
410 CRYPTO_w_lock(CRYPTO_LOCK_ERR);
411 p = (ERR_STATE *)lh_insert(hash, d);
412 CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
413
414 ERRFN(thread_release)(&hash);
415 return p;
416 }
417
418static void int_thread_del_item(const ERR_STATE *d)
419 {
420 ERR_STATE *p;
421 LHASH *hash;
422
423 err_fns_check();
424 hash = ERRFN(thread_get)(0);
425 if (!hash)
426 return;
427
428 CRYPTO_w_lock(CRYPTO_LOCK_ERR);
429 p = (ERR_STATE *)lh_delete(hash, d);
430 /* make sure we don't leak memory */
431 if (int_thread_hash_references == 1
432 && int_thread_hash && (lh_num_items(int_thread_hash) == 0))
433 {
434 lh_free(int_thread_hash);
435 int_thread_hash = NULL;
436 }
437 CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
438
439 ERRFN(thread_release)(&hash);
440 if (p)
441 ERR_STATE_free(p);
442 }
443
444static int int_err_get_next_lib(void)
445 {
446 int ret;
447
448 CRYPTO_w_lock(CRYPTO_LOCK_ERR);
449 ret = int_err_library_number++;
450 CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
451
452 return ret;
453 }
454
455static void ERR_STATE_free(ERR_STATE *s)
456 {
457 int i;
458
459 if (s == NULL)
460 return;
461
462 for (i=0; i<ERR_NUM_ERRORS; i++)
463 {
464 err_clear_data(s,i);
465 }
466 OPENSSL_free(s);
467 }
468
469static void err_load_strings(int lib, ERR_STRING_DATA *str)
470 {
471 while (str->error)
472 {
473 if (lib)
474 str->error|=ERR_PACK(lib,0,0);
475 ERRFN(err_set_item)(str);
476 str++;
477 }
478 }
479
480void ERR_load_strings(int lib, ERR_STRING_DATA *str)
481 {
482 err_fns_check();
483 err_load_strings(lib, str);
484 }
485
486void ERR_unload_strings(int lib, ERR_STRING_DATA *str)
487 {
488 while (str->error)
489 {
490 if (lib)
491 str->error|=ERR_PACK(lib,0,0);
492 ERRFN(err_del_item)(str);
493 str++;
494 }
495 }
496
497void ERR_free_strings(void)
498 {
499 err_fns_check();
500 ERRFN(err_del)();
501 }
502
503LHASH *ERR_get_string_table(void)
504 {
505 err_fns_check();
506 return ERRFN(err_get)(0);
507 }
508
509LHASH *ERR_get_err_state_table(void)
510 {
511 err_fns_check();
512 return ERRFN(thread_get)(0);
513 }
514
515void ERR_release_err_state_table(LHASH **hash)
516 {
517 err_fns_check();
518 ERRFN(thread_release)(hash);
519 }
520
521const char *ERR_lib_error_string(unsigned long e)
522 {
523 ERR_STRING_DATA d,*p;
524 unsigned long l;
525
526 err_fns_check();
527 l=ERR_GET_LIB(e);
528 d.error=ERR_PACK(l,0,0);
529 p=ERRFN(err_get_item)(&d);
530 return((p == NULL)?NULL:p->string);
531 }
532
533const char *ERR_func_error_string(unsigned long e)
534 {
535 ERR_STRING_DATA d,*p;
536 unsigned long l,f;
537
538 err_fns_check();
539 l=ERR_GET_LIB(e);
540 f=ERR_GET_FUNC(e);
541 d.error=ERR_PACK(l,f,0);
542 p=ERRFN(err_get_item)(&d);
543 return((p == NULL)?NULL:p->string);
544 }
545
546const char *ERR_reason_error_string(unsigned long e)
547 {
548 ERR_STRING_DATA d,*p=NULL;
549 unsigned long l,r;
550
551 err_fns_check();
552 l=ERR_GET_LIB(e);
553 r=ERR_GET_REASON(e);
554 d.error=ERR_PACK(l,0,r);
555 p=ERRFN(err_get_item)(&d);
556 if (!p)
557 {
558 d.error=ERR_PACK(0,0,r);
559 p=ERRFN(err_get_item)(&d);
560 }
561 return((p == NULL)?NULL:p->string);
562 }
563
564/* static unsigned long err_hash(ERR_STRING_DATA *a) */
565static unsigned long err_hash(const void *a_void)
566 {
567 unsigned long ret,l;
568
569 l=((const ERR_STRING_DATA *)a_void)->error;
570 ret=l^ERR_GET_LIB(l)^ERR_GET_FUNC(l);
571 return(ret^ret%19*13);
572 }
573
574/* static int err_cmp(ERR_STRING_DATA *a, ERR_STRING_DATA *b) */
575static int err_cmp(const void *a_void, const void *b_void)
576 {
577 return((int)(((const ERR_STRING_DATA *)a_void)->error -
578 ((const ERR_STRING_DATA *)b_void)->error));
579 }
580
581/* static unsigned long pid_hash(ERR_STATE *a) */
582static unsigned long pid_hash(const void *a_void)
583 {
584 return(((const ERR_STATE *)a_void)->pid*13);
585 }
586
587/* static int pid_cmp(ERR_STATE *a, ERR_STATE *b) */
588static int pid_cmp(const void *a_void, const void *b_void)
589 {
590 return((int)((long)((const ERR_STATE *)a_void)->pid -
591 (long)((const ERR_STATE *)b_void)->pid));
592 }
593#ifdef OPENSSL_FIPS
594static void int_err_remove_state(unsigned long pid)
595#else
596void ERR_remove_state(unsigned long pid)
597#endif
598 {
599 ERR_STATE tmp;
600
601 err_fns_check();
602 if (pid == 0)
603 pid=(unsigned long)CRYPTO_thread_id();
604 tmp.pid=pid;
605 /* thread_del_item automatically destroys the LHASH if the number of
606 * items reaches zero. */
607 ERRFN(thread_del_item)(&tmp);
608 }
609
610#ifdef OPENSSL_FIPS
611 static ERR_STATE *int_err_get_state(void)
612#else
613ERR_STATE *ERR_get_state(void)
614#endif
615 {
616 static ERR_STATE fallback;
617 ERR_STATE *ret,tmp,*tmpp=NULL;
618 int i;
619 unsigned long pid;
620
621 err_fns_check();
622 pid=(unsigned long)CRYPTO_thread_id();
623 tmp.pid=pid;
624 ret=ERRFN(thread_get_item)(&tmp);
625
626 /* ret == the error state, if NULL, make a new one */
627 if (ret == NULL)
628 {
629 ret=(ERR_STATE *)OPENSSL_malloc(sizeof(ERR_STATE));
630 if (ret == NULL) return(&fallback);
631 ret->pid=pid;
632 ret->top=0;
633 ret->bottom=0;
634 for (i=0; i<ERR_NUM_ERRORS; i++)
635 {
636 ret->err_data[i]=NULL;
637 ret->err_data_flags[i]=0;
638 }
639 tmpp = ERRFN(thread_set_item)(ret);
640 /* To check if insertion failed, do a get. */
641 if (ERRFN(thread_get_item)(ret) != ret)
642 {
643 ERR_STATE_free(ret); /* could not insert it */
644 return(&fallback);
645 }
646 /* If a race occured in this function and we came second, tmpp
647 * is the first one that we just replaced. */
648 if (tmpp)
649 ERR_STATE_free(tmpp);
650 }
651 return ret;
652 }
653
654#ifdef OPENSSL_FIPS
655void int_ERR_lib_init(void)
656 {
657 int_ERR_set_state_func(int_err_get_state, int_err_remove_state);
658 }
659#endif
660
661int ERR_get_next_error_library(void)
662 {
663 err_fns_check();
664 return ERRFN(get_next_lib)();
665 }
diff --git a/src/lib/libcrypto/err/err_prn.c b/src/lib/libcrypto/err/err_prn.c
index 4cdf342fa6..a0168ac8ed 100644
--- a/src/lib/libcrypto/err/err_prn.c
+++ b/src/lib/libcrypto/err/err_prn.c
@@ -72,21 +72,29 @@ void ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u),
72 const char *file,*data; 72 const char *file,*data;
73 int line,flags; 73 int line,flags;
74 unsigned long es; 74 unsigned long es;
75 CRYPTO_THREADID cur;
75 76
76 es=CRYPTO_thread_id(); 77 CRYPTO_THREADID_current(&cur);
78 es=CRYPTO_THREADID_hash(&cur);
77 while ((l=ERR_get_error_line_data(&file,&line,&data,&flags)) != 0) 79 while ((l=ERR_get_error_line_data(&file,&line,&data,&flags)) != 0)
78 { 80 {
79 ERR_error_string_n(l, buf, sizeof buf); 81 ERR_error_string_n(l, buf, sizeof buf);
80 BIO_snprintf(buf2, sizeof(buf2), "%lu:%s:%s:%d:%s\n", es, buf, 82 BIO_snprintf(buf2, sizeof(buf2), "%lu:%s:%s:%d:%s\n", es, buf,
81 file, line, (flags & ERR_TXT_STRING) ? data : ""); 83 file, line, (flags & ERR_TXT_STRING) ? data : "");
82 cb(buf2, strlen(buf2), u); 84 if (cb(buf2, strlen(buf2), u) <= 0)
85 break; /* abort outputting the error report */
83 } 86 }
84 } 87 }
85 88
86#ifndef OPENSSL_NO_FP_API 89#ifndef OPENSSL_NO_FP_API
87static int print_fp(const char *str, size_t len, void *fp) 90static int print_fp(const char *str, size_t len, void *fp)
88 { 91 {
89 return fwrite(str, 1, len, fp); 92 BIO bio;
93
94 BIO_set(&bio,BIO_s_file());
95 BIO_set_fp(&bio,fp,BIO_NOCLOSE);
96
97 return BIO_printf(&bio, "%s", str);
90 } 98 }
91void ERR_print_errors_fp(FILE *fp) 99void ERR_print_errors_fp(FILE *fp)
92 { 100 {
@@ -94,64 +102,13 @@ void ERR_print_errors_fp(FILE *fp)
94 } 102 }
95#endif 103#endif
96 104
97void ERR_error_string_n(unsigned long e, char *buf, size_t len) 105static int print_bio(const char *str, size_t len, void *bp)
98 { 106 {
99 char lsbuf[64], fsbuf[64], rsbuf[64]; 107 return BIO_write((BIO *)bp, str, len);
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 }
144 } 108 }
145 109void ERR_print_errors(BIO *bp)
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)
150 { 110 {
151 static char buf[256]; 111 ERR_print_errors_cb(print_bio, bp);
152
153 if (ret == NULL) ret=buf;
154 ERR_error_string_n(e, ret, 256);
155
156 return ret;
157 } 112 }
113
114
diff --git a/src/lib/libcrypto/err/err_str.c b/src/lib/libcrypto/err/err_str.c
deleted file mode 100644
index d39040888d..0000000000
--- a/src/lib/libcrypto/err/err_str.c
+++ /dev/null
@@ -1,295 +0,0 @@
1/* crypto/err/err_str.c */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved.
4 *
5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL.
8 *
9 * This library is free for commercial and non-commercial use as long as
10 * the following conditions are aheared to. The following conditions
11 * apply to all code found in this distribution, be it the RC4, RSA,
12 * lhash, DES, etc., code; not just the SSL code. The SSL documentation
13 * included with this distribution is covered by the same copyright terms
14 * except that the holder is Tim Hudson (tjh@cryptsoft.com).
15 *
16 * Copyright remains Eric Young's, and as such any Copyright notices in
17 * the code are not to be removed.
18 * If this package is used in a product, Eric Young should be given attribution
19 * as the author of the parts of the library used.
20 * This can be in the form of a textual message at program startup or
21 * in documentation (online or textual) provided with the package.
22 *
23 * Redistribution and use in source and binary forms, with or without
24 * modification, are permitted provided that the following conditions
25 * are met:
26 * 1. Redistributions of source code must retain the copyright
27 * notice, this list of conditions and the following disclaimer.
28 * 2. Redistributions in binary form must reproduce the above copyright
29 * notice, this list of conditions and the following disclaimer in the
30 * documentation and/or other materials provided with the distribution.
31 * 3. All advertising materials mentioning features or use of this software
32 * must display the following acknowledgement:
33 * "This product includes cryptographic software written by
34 * Eric Young (eay@cryptsoft.com)"
35 * The word 'cryptographic' can be left out if the rouines from the library
36 * being used are not cryptographic related :-).
37 * 4. If you include any Windows specific code (or a derivative thereof) from
38 * the apps directory (application code) you must include an acknowledgement:
39 * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
40 *
41 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
42 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
43 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
44 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
45 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
46 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
47 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
48 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
49 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
50 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
51 * SUCH DAMAGE.
52 *
53 * The licence and distribution terms for any publically available version or
54 * derivative of this code cannot be changed. i.e. this code cannot simply be
55 * copied and put under another distribution licence
56 * [including the GNU Public Licence.]
57 */
58/* ====================================================================
59 * Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved.
60 *
61 * Redistribution and use in source and binary forms, with or without
62 * modification, are permitted provided that the following conditions
63 * are met:
64 *
65 * 1. Redistributions of source code must retain the above copyright
66 * notice, this list of conditions and the following disclaimer.
67 *
68 * 2. Redistributions in binary form must reproduce the above copyright
69 * notice, this list of conditions and the following disclaimer in
70 * the documentation and/or other materials provided with the
71 * distribution.
72 *
73 * 3. All advertising materials mentioning features or use of this
74 * software must display the following acknowledgment:
75 * "This product includes software developed by the OpenSSL Project
76 * for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
77 *
78 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
79 * endorse or promote products derived from this software without
80 * prior written permission. For written permission, please contact
81 * openssl-core@openssl.org.
82 *
83 * 5. Products derived from this software may not be called "OpenSSL"
84 * nor may "OpenSSL" appear in their names without prior written
85 * permission of the OpenSSL Project.
86 *
87 * 6. Redistributions of any form whatsoever must retain the following
88 * acknowledgment:
89 * "This product includes software developed by the OpenSSL Project
90 * for use in the OpenSSL Toolkit (http://www.openssl.org/)"
91 *
92 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
93 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
94 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
95 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
96 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
97 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
98 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
99 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
100 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
101 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
102 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
103 * OF THE POSSIBILITY OF SUCH DAMAGE.
104 * ====================================================================
105 *
106 * This product includes cryptographic software written by Eric Young
107 * (eay@cryptsoft.com). This product includes software written by Tim
108 * Hudson (tjh@cryptsoft.com).
109 *
110 */
111
112#include <stdio.h>
113#include <stdarg.h>
114#include <string.h>
115#include "cryptlib.h"
116#include <openssl/lhash.h>
117#include <openssl/crypto.h>
118#include <openssl/buffer.h>
119#include <openssl/bio.h>
120#include <openssl/err.h>
121
122#ifndef OPENSSL_NO_ERR
123static ERR_STRING_DATA ERR_str_libraries[]=
124 {
125{ERR_PACK(ERR_LIB_NONE,0,0) ,"unknown library"},
126{ERR_PACK(ERR_LIB_SYS,0,0) ,"system library"},
127{ERR_PACK(ERR_LIB_BN,0,0) ,"bignum routines"},
128{ERR_PACK(ERR_LIB_RSA,0,0) ,"rsa routines"},
129{ERR_PACK(ERR_LIB_DH,0,0) ,"Diffie-Hellman routines"},
130{ERR_PACK(ERR_LIB_EVP,0,0) ,"digital envelope routines"},
131{ERR_PACK(ERR_LIB_BUF,0,0) ,"memory buffer routines"},
132{ERR_PACK(ERR_LIB_OBJ,0,0) ,"object identifier routines"},
133{ERR_PACK(ERR_LIB_PEM,0,0) ,"PEM routines"},
134{ERR_PACK(ERR_LIB_DSA,0,0) ,"dsa routines"},
135{ERR_PACK(ERR_LIB_X509,0,0) ,"x509 certificate routines"},
136{ERR_PACK(ERR_LIB_ASN1,0,0) ,"asn1 encoding routines"},
137{ERR_PACK(ERR_LIB_CONF,0,0) ,"configuration file routines"},
138{ERR_PACK(ERR_LIB_CRYPTO,0,0) ,"common libcrypto routines"},
139{ERR_PACK(ERR_LIB_EC,0,0) ,"elliptic curve routines"},
140{ERR_PACK(ERR_LIB_SSL,0,0) ,"SSL routines"},
141{ERR_PACK(ERR_LIB_BIO,0,0) ,"BIO routines"},
142{ERR_PACK(ERR_LIB_PKCS7,0,0) ,"PKCS7 routines"},
143{ERR_PACK(ERR_LIB_X509V3,0,0) ,"X509 V3 routines"},
144{ERR_PACK(ERR_LIB_PKCS12,0,0) ,"PKCS12 routines"},
145{ERR_PACK(ERR_LIB_RAND,0,0) ,"random number generator"},
146{ERR_PACK(ERR_LIB_DSO,0,0) ,"DSO support routines"},
147{ERR_PACK(ERR_LIB_ENGINE,0,0) ,"engine routines"},
148{ERR_PACK(ERR_LIB_OCSP,0,0) ,"OCSP routines"},
149{ERR_PACK(ERR_LIB_FIPS,0,0) ,"FIPS routines"},
150{ERR_PACK(ERR_LIB_CMS,0,0) ,"CMS routines"},
151{ERR_PACK(ERR_LIB_JPAKE,0,0) ,"JPAKE routines"},
152{0,NULL},
153 };
154
155static ERR_STRING_DATA ERR_str_functs[]=
156 {
157 {ERR_PACK(0,SYS_F_FOPEN,0), "fopen"},
158 {ERR_PACK(0,SYS_F_CONNECT,0), "connect"},
159 {ERR_PACK(0,SYS_F_GETSERVBYNAME,0), "getservbyname"},
160 {ERR_PACK(0,SYS_F_SOCKET,0), "socket"},
161 {ERR_PACK(0,SYS_F_IOCTLSOCKET,0), "ioctlsocket"},
162 {ERR_PACK(0,SYS_F_BIND,0), "bind"},
163 {ERR_PACK(0,SYS_F_LISTEN,0), "listen"},
164 {ERR_PACK(0,SYS_F_ACCEPT,0), "accept"},
165#ifdef OPENSSL_SYS_WINDOWS
166 {ERR_PACK(0,SYS_F_WSASTARTUP,0), "WSAstartup"},
167#endif
168 {ERR_PACK(0,SYS_F_OPENDIR,0), "opendir"},
169 {ERR_PACK(0,SYS_F_FREAD,0), "fread"},
170 {0,NULL},
171 };
172
173static ERR_STRING_DATA ERR_str_reasons[]=
174 {
175{ERR_R_SYS_LIB ,"system lib"},
176{ERR_R_BN_LIB ,"BN lib"},
177{ERR_R_RSA_LIB ,"RSA lib"},
178{ERR_R_DH_LIB ,"DH lib"},
179{ERR_R_EVP_LIB ,"EVP lib"},
180{ERR_R_BUF_LIB ,"BUF lib"},
181{ERR_R_OBJ_LIB ,"OBJ lib"},
182{ERR_R_PEM_LIB ,"PEM lib"},
183{ERR_R_DSA_LIB ,"DSA lib"},
184{ERR_R_X509_LIB ,"X509 lib"},
185{ERR_R_ASN1_LIB ,"ASN1 lib"},
186{ERR_R_CONF_LIB ,"CONF lib"},
187{ERR_R_CRYPTO_LIB ,"CRYPTO lib"},
188{ERR_R_EC_LIB ,"EC lib"},
189{ERR_R_SSL_LIB ,"SSL lib"},
190{ERR_R_BIO_LIB ,"BIO lib"},
191{ERR_R_PKCS7_LIB ,"PKCS7 lib"},
192{ERR_R_X509V3_LIB ,"X509V3 lib"},
193{ERR_R_PKCS12_LIB ,"PKCS12 lib"},
194{ERR_R_RAND_LIB ,"RAND lib"},
195{ERR_R_DSO_LIB ,"DSO lib"},
196{ERR_R_ENGINE_LIB ,"ENGINE lib"},
197{ERR_R_OCSP_LIB ,"OCSP lib"},
198
199{ERR_R_NESTED_ASN1_ERROR ,"nested asn1 error"},
200{ERR_R_BAD_ASN1_OBJECT_HEADER ,"bad asn1 object header"},
201{ERR_R_BAD_GET_ASN1_OBJECT_CALL ,"bad get asn1 object call"},
202{ERR_R_EXPECTING_AN_ASN1_SEQUENCE ,"expecting an asn1 sequence"},
203{ERR_R_ASN1_LENGTH_MISMATCH ,"asn1 length mismatch"},
204{ERR_R_MISSING_ASN1_EOS ,"missing asn1 eos"},
205
206{ERR_R_FATAL ,"fatal"},
207{ERR_R_MALLOC_FAILURE ,"malloc failure"},
208{ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED ,"called a function you should not call"},
209{ERR_R_PASSED_NULL_PARAMETER ,"passed a null parameter"},
210{ERR_R_INTERNAL_ERROR ,"internal error"},
211{ERR_R_DISABLED ,"called a function that was disabled at compile-time"},
212
213{0,NULL},
214 };
215#endif
216
217#ifndef OPENSSL_NO_ERR
218#define NUM_SYS_STR_REASONS 127
219#define LEN_SYS_STR_REASON 32
220
221static ERR_STRING_DATA SYS_str_reasons[NUM_SYS_STR_REASONS + 1];
222/* SYS_str_reasons is filled with copies of strerror() results at
223 * initialization.
224 * 'errno' values up to 127 should cover all usual errors,
225 * others will be displayed numerically by ERR_error_string.
226 * It is crucial that we have something for each reason code
227 * that occurs in ERR_str_reasons, or bogus reason strings
228 * will be returned for SYSerr, which always gets an errno
229 * value and never one of those 'standard' reason codes. */
230
231static void build_SYS_str_reasons(void)
232 {
233 /* OPENSSL_malloc cannot be used here, use static storage instead */
234 static char strerror_tab[NUM_SYS_STR_REASONS][LEN_SYS_STR_REASON];
235 int i;
236 static int init = 1;
237
238 CRYPTO_r_lock(CRYPTO_LOCK_ERR);
239 if (!init)
240 {
241 CRYPTO_r_unlock(CRYPTO_LOCK_ERR);
242 return;
243 }
244
245 CRYPTO_r_unlock(CRYPTO_LOCK_ERR);
246 CRYPTO_w_lock(CRYPTO_LOCK_ERR);
247 if (!init)
248 {
249 CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
250 return;
251 }
252
253 for (i = 1; i <= NUM_SYS_STR_REASONS; i++)
254 {
255 ERR_STRING_DATA *str = &SYS_str_reasons[i - 1];
256
257 str->error = (unsigned long)i;
258 if (str->string == NULL)
259 {
260 char (*dest)[LEN_SYS_STR_REASON] = &(strerror_tab[i - 1]);
261 char *src = strerror(i);
262 if (src != NULL)
263 {
264 strncpy(*dest, src, sizeof *dest);
265 (*dest)[sizeof *dest - 1] = '\0';
266 str->string = *dest;
267 }
268 }
269 if (str->string == NULL)
270 str->string = "unknown";
271 }
272
273 /* Now we still have SYS_str_reasons[NUM_SYS_STR_REASONS] = {0, NULL},
274 * as required by ERR_load_strings. */
275
276 init = 0;
277
278 CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
279 }
280#endif
281
282void ERR_load_ERR_strings(void)
283 {
284#ifndef OPENSSL_NO_ERR
285 if (ERR_func_error_string(ERR_str_functs[0].error) == NULL)
286 {
287 ERR_load_strings(0,ERR_str_libraries);
288 ERR_load_strings(0,ERR_str_reasons);
289 ERR_load_strings(ERR_LIB_SYS,ERR_str_functs);
290 build_SYS_str_reasons();
291 ERR_load_strings(ERR_LIB_SYS,SYS_str_reasons);
292 }
293#endif
294 }
295
diff --git a/src/lib/libcrypto/err/openssl.ec b/src/lib/libcrypto/err/openssl.ec
index 868826624d..e0554b4342 100644
--- a/src/lib/libcrypto/err/openssl.ec
+++ b/src/lib/libcrypto/err/openssl.ec
@@ -31,13 +31,15 @@ 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 TS crypto/ts/ts.h crypto/ts/ts_err.c
35L HMAC crypto/hmac/hmac.h crypto/hmac/hmac_err.c
35L CMS crypto/cms/cms.h crypto/cms/cms_err.c 36L CMS crypto/cms/cms.h crypto/cms/cms_err.c
36L JPAKE crypto/jpake/jpake.h crypto/jpake/jpake_err.c 37L JPAKE crypto/jpake/jpake.h crypto/jpake/jpake_err.c
37 38
38# additional header files to be scanned for function names 39# additional header files to be scanned for function names
39L NONE crypto/x509/x509_vfy.h NONE 40L NONE crypto/x509/x509_vfy.h NONE
40L NONE crypto/ec/ec_lcl.h NONE 41L NONE crypto/ec/ec_lcl.h NONE
42L NONE crypto/asn1/asn_lcl.h NONE
41L NONE crypto/cms/cms_lcl.h NONE 43L NONE crypto/cms/cms_lcl.h NONE
42 44
43 45
@@ -71,6 +73,11 @@ R SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY 1071
71R SSL_R_TLSV1_ALERT_INTERNAL_ERROR 1080 73R SSL_R_TLSV1_ALERT_INTERNAL_ERROR 1080
72R SSL_R_TLSV1_ALERT_USER_CANCELLED 1090 74R SSL_R_TLSV1_ALERT_USER_CANCELLED 1090
73R SSL_R_TLSV1_ALERT_NO_RENEGOTIATION 1100 75R SSL_R_TLSV1_ALERT_NO_RENEGOTIATION 1100
76R SSL_R_TLSV1_UNSUPPORTED_EXTENSION 1110
77R SSL_R_TLSV1_CERTIFICATE_UNOBTAINABLE 1111
78R SSL_R_TLSV1_UNRECOGNIZED_NAME 1112
79R SSL_R_TLSV1_BAD_CERTIFICATE_STATUS_RESPONSE 1113
80R SSL_R_TLSV1_BAD_CERTIFICATE_HASH_VALUE 1114
74 81
75R RSAREF_R_CONTENT_ENCODING 0x0400 82R RSAREF_R_CONTENT_ENCODING 0x0400
76R RSAREF_R_DATA 0x0401 83R RSAREF_R_DATA 0x0401
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-26 10:44:26 +0000