diff options
Diffstat (limited to 'src/lib/libcrypto/err')
-rw-r--r-- | src/lib/libcrypto/err/err.c (renamed from src/lib/libcrypto/err/err_def.c) | 700 | ||||
-rw-r--r-- | src/lib/libcrypto/err/err.h | 385 | ||||
-rw-r--r-- | src/lib/libcrypto/err/err_all.c | 160 | ||||
-rw-r--r-- | src/lib/libcrypto/err/err_prn.c (renamed from src/lib/libcrypto/err/err_bio.c) | 39 | ||||
-rw-r--r-- | src/lib/libcrypto/err/err_str.c | 295 | ||||
-rw-r--r-- | src/lib/libcrypto/err/openssl.ec | 96 |
6 files changed, 1265 insertions, 410 deletions
diff --git a/src/lib/libcrypto/err/err_def.c b/src/lib/libcrypto/err/err.c index 7ed3d84955..69713a6e2f 100644 --- a/src/lib/libcrypto/err/err_def.c +++ b/src/lib/libcrypto/err/err.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* crypto/err/err_def.c */ | 1 | /* crypto/err/err.c */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -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,42 +119,122 @@ | |||
119 | #include <openssl/bio.h> | 119 | #include <openssl/bio.h> |
120 | #include <openssl/err.h> | 120 | #include <openssl/err.h> |
121 | 121 | ||
122 | #define err_clear_data(p,i) \ | 122 | DECLARE_LHASH_OF(ERR_STRING_DATA); |
123 | do { \ | 123 | DECLARE_LHASH_OF(ERR_STATE); |
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 | 124 | ||
142 | static void err_load_strings(int lib, ERR_STRING_DATA *str); | 125 | static void err_load_strings(int lib, ERR_STRING_DATA *str); |
143 | 126 | ||
144 | static void ERR_STATE_free(ERR_STATE *s); | 127 | static void ERR_STATE_free(ERR_STATE *s); |
128 | #ifndef OPENSSL_NO_ERR | ||
129 | static 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 | |||
162 | static 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 | |||
180 | static 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 | |||
145 | 225 | ||
146 | /* Define the predeclared (but externally opaque) "ERR_FNS" type */ | 226 | /* Define the predeclared (but externally opaque) "ERR_FNS" type */ |
147 | struct st_ERR_FNS | 227 | struct st_ERR_FNS |
148 | { | 228 | { |
149 | /* Works on the "error_hash" string table */ | 229 | /* Works on the "error_hash" string table */ |
150 | LHASH *(*cb_err_get)(int create); | 230 | LHASH_OF(ERR_STRING_DATA) *(*cb_err_get)(int create); |
151 | void (*cb_err_del)(void); | 231 | void (*cb_err_del)(void); |
152 | ERR_STRING_DATA *(*cb_err_get_item)(const ERR_STRING_DATA *); | 232 | ERR_STRING_DATA *(*cb_err_get_item)(const ERR_STRING_DATA *); |
153 | ERR_STRING_DATA *(*cb_err_set_item)(ERR_STRING_DATA *); | 233 | ERR_STRING_DATA *(*cb_err_set_item)(ERR_STRING_DATA *); |
154 | ERR_STRING_DATA *(*cb_err_del_item)(ERR_STRING_DATA *); | 234 | ERR_STRING_DATA *(*cb_err_del_item)(ERR_STRING_DATA *); |
155 | /* Works on the "thread_hash" error-state table */ | 235 | /* Works on the "thread_hash" error-state table */ |
156 | LHASH *(*cb_thread_get)(int create); | 236 | LHASH_OF(ERR_STATE) *(*cb_thread_get)(int create); |
157 | void (*cb_thread_release)(LHASH **hash); | 237 | void (*cb_thread_release)(LHASH_OF(ERR_STATE) **hash); |
158 | ERR_STATE *(*cb_thread_get_item)(const ERR_STATE *); | 238 | ERR_STATE *(*cb_thread_get_item)(const ERR_STATE *); |
159 | ERR_STATE *(*cb_thread_set_item)(ERR_STATE *); | 239 | ERR_STATE *(*cb_thread_set_item)(ERR_STATE *); |
160 | void (*cb_thread_del_item)(const ERR_STATE *); | 240 | void (*cb_thread_del_item)(const ERR_STATE *); |
@@ -163,13 +243,13 @@ struct st_ERR_FNS | |||
163 | }; | 243 | }; |
164 | 244 | ||
165 | /* Predeclarations of the "err_defaults" functions */ | 245 | /* Predeclarations of the "err_defaults" functions */ |
166 | static LHASH *int_err_get(int create); | 246 | static LHASH_OF(ERR_STRING_DATA) *int_err_get(int create); |
167 | static void int_err_del(void); | 247 | static void int_err_del(void); |
168 | static ERR_STRING_DATA *int_err_get_item(const ERR_STRING_DATA *); | 248 | static ERR_STRING_DATA *int_err_get_item(const ERR_STRING_DATA *); |
169 | static ERR_STRING_DATA *int_err_set_item(ERR_STRING_DATA *); | 249 | static ERR_STRING_DATA *int_err_set_item(ERR_STRING_DATA *); |
170 | static ERR_STRING_DATA *int_err_del_item(ERR_STRING_DATA *); | 250 | static ERR_STRING_DATA *int_err_del_item(ERR_STRING_DATA *); |
171 | static LHASH *int_thread_get(int create); | 251 | static LHASH_OF(ERR_STATE) *int_thread_get(int create); |
172 | static void int_thread_release(LHASH **hash); | 252 | static void int_thread_release(LHASH_OF(ERR_STATE) **hash); |
173 | static ERR_STATE *int_thread_get_item(const ERR_STATE *); | 253 | static ERR_STATE *int_thread_get_item(const ERR_STATE *); |
174 | static ERR_STATE *int_thread_set_item(ERR_STATE *); | 254 | static ERR_STATE *int_thread_set_item(ERR_STATE *); |
175 | static void int_thread_del_item(const ERR_STATE *); | 255 | static void int_thread_del_item(const ERR_STATE *); |
@@ -201,8 +281,8 @@ static const ERR_FNS *err_fns = NULL; | |||
201 | * "err_defaults" functions. This way, a linked module can completely defer all | 281 | * "err_defaults" functions. This way, a linked module can completely defer all |
202 | * ERR state operation (together with requisite locking) to the implementations | 282 | * ERR state operation (together with requisite locking) to the implementations |
203 | * and state in the loading application. */ | 283 | * and state in the loading application. */ |
204 | static LHASH *int_error_hash = NULL; | 284 | static LHASH_OF(ERR_STRING_DATA) *int_error_hash = NULL; |
205 | static LHASH *int_thread_hash = NULL; | 285 | static LHASH_OF(ERR_STATE) *int_thread_hash = NULL; |
206 | static int int_thread_hash_references = 0; | 286 | static int int_thread_hash_references = 0; |
207 | static int int_err_library_number= ERR_LIB_USER; | 287 | static int int_err_library_number= ERR_LIB_USER; |
208 | 288 | ||
@@ -245,26 +325,37 @@ int ERR_set_implementation(const ERR_FNS *fns) | |||
245 | /* These are the callbacks provided to "lh_new()" when creating the LHASH tables | 325 | /* These are the callbacks provided to "lh_new()" when creating the LHASH tables |
246 | * internal to the "err_defaults" implementation. */ | 326 | * internal to the "err_defaults" implementation. */ |
247 | 327 | ||
248 | /* static unsigned long err_hash(ERR_STRING_DATA *a); */ | 328 | static unsigned long get_error_values(int inc,int top,const char **file,int *line, |
249 | static unsigned long err_hash(const void *a_void); | 329 | const char **data,int *flags); |
250 | /* static int err_cmp(ERR_STRING_DATA *a, ERR_STRING_DATA *b); */ | ||
251 | static int err_cmp(const void *a_void, const void *b_void); | ||
252 | /* static unsigned long pid_hash(ERR_STATE *pid); */ | ||
253 | static unsigned long pid_hash(const void *pid_void); | ||
254 | /* static int pid_cmp(ERR_STATE *a,ERR_STATE *pid); */ | ||
255 | static int pid_cmp(const void *a_void,const void *pid_void); | ||
256 | 330 | ||
257 | /* The internal functions used in the "err_defaults" implementation */ | 331 | /* The internal functions used in the "err_defaults" implementation */ |
258 | 332 | ||
259 | static LHASH *int_err_get(int create) | 333 | static unsigned long err_string_data_hash(const ERR_STRING_DATA *a) |
260 | { | 334 | { |
261 | LHASH *ret = NULL; | 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 | } | ||
341 | static IMPLEMENT_LHASH_HASH_FN(err_string_data, ERR_STRING_DATA) | ||
342 | |||
343 | static 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 | } | ||
348 | static IMPLEMENT_LHASH_COMP_FN(err_string_data, ERR_STRING_DATA) | ||
349 | |||
350 | static LHASH_OF(ERR_STRING_DATA) *int_err_get(int create) | ||
351 | { | ||
352 | LHASH_OF(ERR_STRING_DATA) *ret = NULL; | ||
262 | 353 | ||
263 | CRYPTO_w_lock(CRYPTO_LOCK_ERR); | 354 | CRYPTO_w_lock(CRYPTO_LOCK_ERR); |
264 | if (!int_error_hash && create) | 355 | if (!int_error_hash && create) |
265 | { | 356 | { |
266 | CRYPTO_push_info("int_err_get (err.c)"); | 357 | CRYPTO_push_info("int_err_get (err.c)"); |
267 | int_error_hash = lh_new(err_hash, err_cmp); | 358 | int_error_hash = lh_ERR_STRING_DATA_new(); |
268 | CRYPTO_pop_info(); | 359 | CRYPTO_pop_info(); |
269 | } | 360 | } |
270 | if (int_error_hash) | 361 | if (int_error_hash) |
@@ -279,7 +370,7 @@ static void int_err_del(void) | |||
279 | CRYPTO_w_lock(CRYPTO_LOCK_ERR); | 370 | CRYPTO_w_lock(CRYPTO_LOCK_ERR); |
280 | if (int_error_hash) | 371 | if (int_error_hash) |
281 | { | 372 | { |
282 | lh_free(int_error_hash); | 373 | lh_ERR_STRING_DATA_free(int_error_hash); |
283 | int_error_hash = NULL; | 374 | int_error_hash = NULL; |
284 | } | 375 | } |
285 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR); | 376 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR); |
@@ -288,7 +379,7 @@ static void int_err_del(void) | |||
288 | static ERR_STRING_DATA *int_err_get_item(const ERR_STRING_DATA *d) | 379 | static ERR_STRING_DATA *int_err_get_item(const ERR_STRING_DATA *d) |
289 | { | 380 | { |
290 | ERR_STRING_DATA *p; | 381 | ERR_STRING_DATA *p; |
291 | LHASH *hash; | 382 | LHASH_OF(ERR_STRING_DATA) *hash; |
292 | 383 | ||
293 | err_fns_check(); | 384 | err_fns_check(); |
294 | hash = ERRFN(err_get)(0); | 385 | hash = ERRFN(err_get)(0); |
@@ -296,7 +387,7 @@ static ERR_STRING_DATA *int_err_get_item(const ERR_STRING_DATA *d) | |||
296 | return NULL; | 387 | return NULL; |
297 | 388 | ||
298 | CRYPTO_r_lock(CRYPTO_LOCK_ERR); | 389 | CRYPTO_r_lock(CRYPTO_LOCK_ERR); |
299 | p = (ERR_STRING_DATA *)lh_retrieve(hash, d); | 390 | p = lh_ERR_STRING_DATA_retrieve(hash, d); |
300 | CRYPTO_r_unlock(CRYPTO_LOCK_ERR); | 391 | CRYPTO_r_unlock(CRYPTO_LOCK_ERR); |
301 | 392 | ||
302 | return p; | 393 | return p; |
@@ -305,7 +396,7 @@ static ERR_STRING_DATA *int_err_get_item(const ERR_STRING_DATA *d) | |||
305 | static ERR_STRING_DATA *int_err_set_item(ERR_STRING_DATA *d) | 396 | static ERR_STRING_DATA *int_err_set_item(ERR_STRING_DATA *d) |
306 | { | 397 | { |
307 | ERR_STRING_DATA *p; | 398 | ERR_STRING_DATA *p; |
308 | LHASH *hash; | 399 | LHASH_OF(ERR_STRING_DATA) *hash; |
309 | 400 | ||
310 | err_fns_check(); | 401 | err_fns_check(); |
311 | hash = ERRFN(err_get)(1); | 402 | hash = ERRFN(err_get)(1); |
@@ -313,7 +404,7 @@ static ERR_STRING_DATA *int_err_set_item(ERR_STRING_DATA *d) | |||
313 | return NULL; | 404 | return NULL; |
314 | 405 | ||
315 | CRYPTO_w_lock(CRYPTO_LOCK_ERR); | 406 | CRYPTO_w_lock(CRYPTO_LOCK_ERR); |
316 | p = (ERR_STRING_DATA *)lh_insert(hash, d); | 407 | p = lh_ERR_STRING_DATA_insert(hash, d); |
317 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR); | 408 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR); |
318 | 409 | ||
319 | return p; | 410 | return p; |
@@ -322,7 +413,7 @@ static ERR_STRING_DATA *int_err_set_item(ERR_STRING_DATA *d) | |||
322 | static ERR_STRING_DATA *int_err_del_item(ERR_STRING_DATA *d) | 413 | static ERR_STRING_DATA *int_err_del_item(ERR_STRING_DATA *d) |
323 | { | 414 | { |
324 | ERR_STRING_DATA *p; | 415 | ERR_STRING_DATA *p; |
325 | LHASH *hash; | 416 | LHASH_OF(ERR_STRING_DATA) *hash; |
326 | 417 | ||
327 | err_fns_check(); | 418 | err_fns_check(); |
328 | hash = ERRFN(err_get)(0); | 419 | hash = ERRFN(err_get)(0); |
@@ -330,21 +421,33 @@ static ERR_STRING_DATA *int_err_del_item(ERR_STRING_DATA *d) | |||
330 | return NULL; | 421 | return NULL; |
331 | 422 | ||
332 | CRYPTO_w_lock(CRYPTO_LOCK_ERR); | 423 | CRYPTO_w_lock(CRYPTO_LOCK_ERR); |
333 | p = (ERR_STRING_DATA *)lh_delete(hash, d); | 424 | p = lh_ERR_STRING_DATA_delete(hash, d); |
334 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR); | 425 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR); |
335 | 426 | ||
336 | return p; | 427 | return p; |
337 | } | 428 | } |
338 | 429 | ||
339 | static LHASH *int_thread_get(int create) | 430 | static unsigned long err_state_hash(const ERR_STATE *a) |
340 | { | 431 | { |
341 | LHASH *ret = NULL; | 432 | return CRYPTO_THREADID_hash(&a->tid) * 13; |
433 | } | ||
434 | static IMPLEMENT_LHASH_HASH_FN(err_state, ERR_STATE) | ||
435 | |||
436 | static int err_state_cmp(const ERR_STATE *a, const ERR_STATE *b) | ||
437 | { | ||
438 | return CRYPTO_THREADID_cmp(&a->tid, &b->tid); | ||
439 | } | ||
440 | static IMPLEMENT_LHASH_COMP_FN(err_state, ERR_STATE) | ||
441 | |||
442 | static LHASH_OF(ERR_STATE) *int_thread_get(int create) | ||
443 | { | ||
444 | LHASH_OF(ERR_STATE) *ret = NULL; | ||
342 | 445 | ||
343 | CRYPTO_w_lock(CRYPTO_LOCK_ERR); | 446 | CRYPTO_w_lock(CRYPTO_LOCK_ERR); |
344 | if (!int_thread_hash && create) | 447 | if (!int_thread_hash && create) |
345 | { | 448 | { |
346 | CRYPTO_push_info("int_thread_get (err.c)"); | 449 | CRYPTO_push_info("int_thread_get (err.c)"); |
347 | int_thread_hash = lh_new(pid_hash, pid_cmp); | 450 | int_thread_hash = lh_ERR_STATE_new(); |
348 | CRYPTO_pop_info(); | 451 | CRYPTO_pop_info(); |
349 | } | 452 | } |
350 | if (int_thread_hash) | 453 | if (int_thread_hash) |
@@ -356,7 +459,7 @@ static LHASH *int_thread_get(int create) | |||
356 | return ret; | 459 | return ret; |
357 | } | 460 | } |
358 | 461 | ||
359 | static void int_thread_release(LHASH **hash) | 462 | static void int_thread_release(LHASH_OF(ERR_STATE) **hash) |
360 | { | 463 | { |
361 | int i; | 464 | int i; |
362 | 465 | ||
@@ -382,7 +485,7 @@ static void int_thread_release(LHASH **hash) | |||
382 | static ERR_STATE *int_thread_get_item(const ERR_STATE *d) | 485 | static ERR_STATE *int_thread_get_item(const ERR_STATE *d) |
383 | { | 486 | { |
384 | ERR_STATE *p; | 487 | ERR_STATE *p; |
385 | LHASH *hash; | 488 | LHASH_OF(ERR_STATE) *hash; |
386 | 489 | ||
387 | err_fns_check(); | 490 | err_fns_check(); |
388 | hash = ERRFN(thread_get)(0); | 491 | hash = ERRFN(thread_get)(0); |
@@ -390,7 +493,7 @@ static ERR_STATE *int_thread_get_item(const ERR_STATE *d) | |||
390 | return NULL; | 493 | return NULL; |
391 | 494 | ||
392 | CRYPTO_r_lock(CRYPTO_LOCK_ERR); | 495 | CRYPTO_r_lock(CRYPTO_LOCK_ERR); |
393 | p = (ERR_STATE *)lh_retrieve(hash, d); | 496 | p = lh_ERR_STATE_retrieve(hash, d); |
394 | CRYPTO_r_unlock(CRYPTO_LOCK_ERR); | 497 | CRYPTO_r_unlock(CRYPTO_LOCK_ERR); |
395 | 498 | ||
396 | ERRFN(thread_release)(&hash); | 499 | ERRFN(thread_release)(&hash); |
@@ -400,7 +503,7 @@ static ERR_STATE *int_thread_get_item(const ERR_STATE *d) | |||
400 | static ERR_STATE *int_thread_set_item(ERR_STATE *d) | 503 | static ERR_STATE *int_thread_set_item(ERR_STATE *d) |
401 | { | 504 | { |
402 | ERR_STATE *p; | 505 | ERR_STATE *p; |
403 | LHASH *hash; | 506 | LHASH_OF(ERR_STATE) *hash; |
404 | 507 | ||
405 | err_fns_check(); | 508 | err_fns_check(); |
406 | hash = ERRFN(thread_get)(1); | 509 | hash = ERRFN(thread_get)(1); |
@@ -408,7 +511,7 @@ static ERR_STATE *int_thread_set_item(ERR_STATE *d) | |||
408 | return NULL; | 511 | return NULL; |
409 | 512 | ||
410 | CRYPTO_w_lock(CRYPTO_LOCK_ERR); | 513 | CRYPTO_w_lock(CRYPTO_LOCK_ERR); |
411 | p = (ERR_STATE *)lh_insert(hash, d); | 514 | p = lh_ERR_STATE_insert(hash, d); |
412 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR); | 515 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR); |
413 | 516 | ||
414 | ERRFN(thread_release)(&hash); | 517 | ERRFN(thread_release)(&hash); |
@@ -418,7 +521,7 @@ static ERR_STATE *int_thread_set_item(ERR_STATE *d) | |||
418 | static void int_thread_del_item(const ERR_STATE *d) | 521 | static void int_thread_del_item(const ERR_STATE *d) |
419 | { | 522 | { |
420 | ERR_STATE *p; | 523 | ERR_STATE *p; |
421 | LHASH *hash; | 524 | LHASH_OF(ERR_STATE) *hash; |
422 | 525 | ||
423 | err_fns_check(); | 526 | err_fns_check(); |
424 | hash = ERRFN(thread_get)(0); | 527 | hash = ERRFN(thread_get)(0); |
@@ -426,12 +529,12 @@ static void int_thread_del_item(const ERR_STATE *d) | |||
426 | return; | 529 | return; |
427 | 530 | ||
428 | CRYPTO_w_lock(CRYPTO_LOCK_ERR); | 531 | CRYPTO_w_lock(CRYPTO_LOCK_ERR); |
429 | p = (ERR_STATE *)lh_delete(hash, d); | 532 | p = lh_ERR_STATE_delete(hash, d); |
430 | /* make sure we don't leak memory */ | 533 | /* make sure we don't leak memory */ |
431 | if (int_thread_hash_references == 1 | 534 | if (int_thread_hash_references == 1 |
432 | && int_thread_hash && (lh_num_items(int_thread_hash) == 0)) | 535 | && int_thread_hash && lh_ERR_STATE_num_items(int_thread_hash) == 0) |
433 | { | 536 | { |
434 | lh_free(int_thread_hash); | 537 | lh_ERR_STATE_free(int_thread_hash); |
435 | int_thread_hash = NULL; | 538 | int_thread_hash = NULL; |
436 | } | 539 | } |
437 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR); | 540 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR); |
@@ -452,6 +555,92 @@ static int int_err_get_next_lib(void) | |||
452 | return ret; | 555 | return ret; |
453 | } | 556 | } |
454 | 557 | ||
558 | |||
559 | #ifndef OPENSSL_NO_ERR | ||
560 | #define NUM_SYS_STR_REASONS 127 | ||
561 | #define LEN_SYS_STR_REASON 32 | ||
562 | |||
563 | static 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 | |||
573 | static 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 | ||
623 | |||
624 | #define err_clear_data(p,i) \ | ||
625 | do { \ | ||
626 | if (((p)->err_data[i] != NULL) && \ | ||
627 | (p)->err_data_flags[i] & ERR_TXT_MALLOCED) \ | ||
628 | { \ | ||
629 | OPENSSL_free((p)->err_data[i]); \ | ||
630 | (p)->err_data[i]=NULL; \ | ||
631 | } \ | ||
632 | (p)->err_data_flags[i]=0; \ | ||
633 | } while(0) | ||
634 | |||
635 | #define err_clear(p,i) \ | ||
636 | do { \ | ||
637 | (p)->err_flags[i]=0; \ | ||
638 | (p)->err_buffer[i]=0; \ | ||
639 | err_clear_data(p,i); \ | ||
640 | (p)->err_file[i]=NULL; \ | ||
641 | (p)->err_line[i]= -1; \ | ||
642 | } while(0) | ||
643 | |||
455 | static void ERR_STATE_free(ERR_STATE *s) | 644 | static void ERR_STATE_free(ERR_STATE *s) |
456 | { | 645 | { |
457 | int i; | 646 | int i; |
@@ -466,6 +655,18 @@ static void ERR_STATE_free(ERR_STATE *s) | |||
466 | OPENSSL_free(s); | 655 | OPENSSL_free(s); |
467 | } | 656 | } |
468 | 657 | ||
658 | void 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 | |||
469 | static void err_load_strings(int lib, ERR_STRING_DATA *str) | 670 | static void err_load_strings(int lib, ERR_STRING_DATA *str) |
470 | { | 671 | { |
471 | while (str->error) | 672 | while (str->error) |
@@ -479,7 +680,7 @@ static void err_load_strings(int lib, ERR_STRING_DATA *str) | |||
479 | 680 | ||
480 | void ERR_load_strings(int lib, ERR_STRING_DATA *str) | 681 | void ERR_load_strings(int lib, ERR_STRING_DATA *str) |
481 | { | 682 | { |
482 | err_fns_check(); | 683 | ERR_load_ERR_strings(); |
483 | err_load_strings(lib, str); | 684 | err_load_strings(lib, str); |
484 | } | 685 | } |
485 | 686 | ||
@@ -500,19 +701,237 @@ void ERR_free_strings(void) | |||
500 | ERRFN(err_del)(); | 701 | ERRFN(err_del)(); |
501 | } | 702 | } |
502 | 703 | ||
503 | LHASH *ERR_get_string_table(void) | 704 | /********************************************************/ |
705 | |||
706 | void ERR_put_error(int lib, int func, int reason, const char *file, | ||
707 | int line) | ||
708 | { | ||
709 | ERR_STATE *es; | ||
710 | |||
711 | #ifdef _OSD_POSIX | ||
712 | /* In the BS2000-OSD POSIX subsystem, the compiler generates | ||
713 | * path names in the form "*POSIX(/etc/passwd)". | ||
714 | * This dirty hack strips them to something sensible. | ||
715 | * @@@ We shouldn't modify a const string, though. | ||
716 | */ | ||
717 | if (strncmp(file,"*POSIX(", sizeof("*POSIX(")-1) == 0) { | ||
718 | char *end; | ||
719 | |||
720 | /* Skip the "*POSIX(" prefix */ | ||
721 | file += sizeof("*POSIX(")-1; | ||
722 | end = &file[strlen(file)-1]; | ||
723 | if (*end == ')') | ||
724 | *end = '\0'; | ||
725 | /* Optional: use the basename of the path only. */ | ||
726 | if ((end = strrchr(file, '/')) != NULL) | ||
727 | file = &end[1]; | ||
728 | } | ||
729 | #endif | ||
730 | es=ERR_get_state(); | ||
731 | |||
732 | es->top=(es->top+1)%ERR_NUM_ERRORS; | ||
733 | if (es->top == es->bottom) | ||
734 | es->bottom=(es->bottom+1)%ERR_NUM_ERRORS; | ||
735 | es->err_flags[es->top]=0; | ||
736 | es->err_buffer[es->top]=ERR_PACK(lib,func,reason); | ||
737 | es->err_file[es->top]=file; | ||
738 | es->err_line[es->top]=line; | ||
739 | err_clear_data(es,es->top); | ||
740 | } | ||
741 | |||
742 | void ERR_clear_error(void) | ||
743 | { | ||
744 | int i; | ||
745 | ERR_STATE *es; | ||
746 | |||
747 | es=ERR_get_state(); | ||
748 | |||
749 | for (i=0; i<ERR_NUM_ERRORS; i++) | ||
750 | { | ||
751 | err_clear(es,i); | ||
752 | } | ||
753 | es->top=es->bottom=0; | ||
754 | } | ||
755 | |||
756 | |||
757 | unsigned long ERR_get_error(void) | ||
758 | { return(get_error_values(1,0,NULL,NULL,NULL,NULL)); } | ||
759 | |||
760 | unsigned long ERR_get_error_line(const char **file, | ||
761 | int *line) | ||
762 | { return(get_error_values(1,0,file,line,NULL,NULL)); } | ||
763 | |||
764 | unsigned long ERR_get_error_line_data(const char **file, int *line, | ||
765 | const char **data, int *flags) | ||
766 | { return(get_error_values(1,0,file,line,data,flags)); } | ||
767 | |||
768 | |||
769 | unsigned long ERR_peek_error(void) | ||
770 | { return(get_error_values(0,0,NULL,NULL,NULL,NULL)); } | ||
771 | |||
772 | unsigned long ERR_peek_error_line(const char **file, int *line) | ||
773 | { return(get_error_values(0,0,file,line,NULL,NULL)); } | ||
774 | |||
775 | unsigned long ERR_peek_error_line_data(const char **file, int *line, | ||
776 | const char **data, int *flags) | ||
777 | { return(get_error_values(0,0,file,line,data,flags)); } | ||
778 | |||
779 | |||
780 | unsigned long ERR_peek_last_error(void) | ||
781 | { return(get_error_values(0,1,NULL,NULL,NULL,NULL)); } | ||
782 | |||
783 | unsigned long ERR_peek_last_error_line(const char **file, int *line) | ||
784 | { return(get_error_values(0,1,file,line,NULL,NULL)); } | ||
785 | |||
786 | unsigned long ERR_peek_last_error_line_data(const char **file, int *line, | ||
787 | const char **data, int *flags) | ||
788 | { return(get_error_values(0,1,file,line,data,flags)); } | ||
789 | |||
790 | |||
791 | static unsigned long get_error_values(int inc, int top, const char **file, int *line, | ||
792 | const char **data, int *flags) | ||
793 | { | ||
794 | int i=0; | ||
795 | ERR_STATE *es; | ||
796 | unsigned long ret; | ||
797 | |||
798 | es=ERR_get_state(); | ||
799 | |||
800 | if (inc && top) | ||
801 | { | ||
802 | if (file) *file = ""; | ||
803 | if (line) *line = 0; | ||
804 | if (data) *data = ""; | ||
805 | if (flags) *flags = 0; | ||
806 | |||
807 | return ERR_R_INTERNAL_ERROR; | ||
808 | } | ||
809 | |||
810 | if (es->bottom == es->top) return 0; | ||
811 | if (top) | ||
812 | i=es->top; /* last error */ | ||
813 | else | ||
814 | i=(es->bottom+1)%ERR_NUM_ERRORS; /* first error */ | ||
815 | |||
816 | ret=es->err_buffer[i]; | ||
817 | if (inc) | ||
818 | { | ||
819 | es->bottom=i; | ||
820 | es->err_buffer[i]=0; | ||
821 | } | ||
822 | |||
823 | if ((file != NULL) && (line != NULL)) | ||
824 | { | ||
825 | if (es->err_file[i] == NULL) | ||
826 | { | ||
827 | *file="NA"; | ||
828 | if (line != NULL) *line=0; | ||
829 | } | ||
830 | else | ||
831 | { | ||
832 | *file=es->err_file[i]; | ||
833 | if (line != NULL) *line=es->err_line[i]; | ||
834 | } | ||
835 | } | ||
836 | |||
837 | if (data == NULL) | ||
838 | { | ||
839 | if (inc) | ||
840 | { | ||
841 | err_clear_data(es, i); | ||
842 | } | ||
843 | } | ||
844 | else | ||
845 | { | ||
846 | if (es->err_data[i] == NULL) | ||
847 | { | ||
848 | *data=""; | ||
849 | if (flags != NULL) *flags=0; | ||
850 | } | ||
851 | else | ||
852 | { | ||
853 | *data=es->err_data[i]; | ||
854 | if (flags != NULL) *flags=es->err_data_flags[i]; | ||
855 | } | ||
856 | } | ||
857 | return ret; | ||
858 | } | ||
859 | |||
860 | void 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 */ | ||
912 | char *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 | |||
922 | LHASH_OF(ERR_STRING_DATA) *ERR_get_string_table(void) | ||
504 | { | 923 | { |
505 | err_fns_check(); | 924 | err_fns_check(); |
506 | return ERRFN(err_get)(0); | 925 | return ERRFN(err_get)(0); |
507 | } | 926 | } |
508 | 927 | ||
509 | LHASH *ERR_get_err_state_table(void) | 928 | LHASH_OF(ERR_STATE) *ERR_get_err_state_table(void) |
510 | { | 929 | { |
511 | err_fns_check(); | 930 | err_fns_check(); |
512 | return ERRFN(thread_get)(0); | 931 | return ERRFN(thread_get)(0); |
513 | } | 932 | } |
514 | 933 | ||
515 | void ERR_release_err_state_table(LHASH **hash) | 934 | void ERR_release_err_state_table(LHASH_OF(ERR_STATE) **hash) |
516 | { | 935 | { |
517 | err_fns_check(); | 936 | err_fns_check(); |
518 | ERRFN(thread_release)(hash); | 937 | ERRFN(thread_release)(hash); |
@@ -561,66 +980,37 @@ const char *ERR_reason_error_string(unsigned long e) | |||
561 | return((p == NULL)?NULL:p->string); | 980 | return((p == NULL)?NULL:p->string); |
562 | } | 981 | } |
563 | 982 | ||
564 | /* static unsigned long err_hash(ERR_STRING_DATA *a) */ | 983 | void ERR_remove_thread_state(const CRYPTO_THREADID *id) |
565 | static 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) */ | ||
575 | static 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) */ | ||
582 | static 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) */ | ||
588 | static 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 | ||
594 | static void int_err_remove_state(unsigned long pid) | ||
595 | #else | ||
596 | void ERR_remove_state(unsigned long pid) | ||
597 | #endif | ||
598 | { | 984 | { |
599 | ERR_STATE tmp; | 985 | ERR_STATE tmp; |
600 | 986 | ||
987 | if (id) | ||
988 | CRYPTO_THREADID_cpy(&tmp.tid, id); | ||
989 | else | ||
990 | CRYPTO_THREADID_current(&tmp.tid); | ||
601 | err_fns_check(); | 991 | 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 | 992 | /* thread_del_item automatically destroys the LHASH if the number of |
606 | * items reaches zero. */ | 993 | * items reaches zero. */ |
607 | ERRFN(thread_del_item)(&tmp); | 994 | ERRFN(thread_del_item)(&tmp); |
608 | } | 995 | } |
609 | 996 | ||
610 | #ifdef OPENSSL_FIPS | 997 | #ifndef OPENSSL_NO_DEPRECATED |
611 | static ERR_STATE *int_err_get_state(void) | 998 | void ERR_remove_state(unsigned long pid) |
612 | #else | 999 | { |
613 | ERR_STATE *ERR_get_state(void) | 1000 | ERR_remove_thread_state(NULL); |
1001 | } | ||
614 | #endif | 1002 | #endif |
1003 | |||
1004 | ERR_STATE *ERR_get_state(void) | ||
615 | { | 1005 | { |
616 | static ERR_STATE fallback; | 1006 | static ERR_STATE fallback; |
617 | ERR_STATE *ret,tmp,*tmpp=NULL; | 1007 | ERR_STATE *ret,tmp,*tmpp=NULL; |
618 | int i; | 1008 | int i; |
619 | unsigned long pid; | 1009 | CRYPTO_THREADID tid; |
620 | 1010 | ||
621 | err_fns_check(); | 1011 | err_fns_check(); |
622 | pid=(unsigned long)CRYPTO_thread_id(); | 1012 | CRYPTO_THREADID_current(&tid); |
623 | tmp.pid=pid; | 1013 | CRYPTO_THREADID_cpy(&tmp.tid, &tid); |
624 | ret=ERRFN(thread_get_item)(&tmp); | 1014 | ret=ERRFN(thread_get_item)(&tmp); |
625 | 1015 | ||
626 | /* ret == the error state, if NULL, make a new one */ | 1016 | /* ret == the error state, if NULL, make a new one */ |
@@ -628,7 +1018,7 @@ ERR_STATE *ERR_get_state(void) | |||
628 | { | 1018 | { |
629 | ret=(ERR_STATE *)OPENSSL_malloc(sizeof(ERR_STATE)); | 1019 | ret=(ERR_STATE *)OPENSSL_malloc(sizeof(ERR_STATE)); |
630 | if (ret == NULL) return(&fallback); | 1020 | if (ret == NULL) return(&fallback); |
631 | ret->pid=pid; | 1021 | CRYPTO_THREADID_cpy(&ret->tid, &tid); |
632 | ret->top=0; | 1022 | ret->top=0; |
633 | ret->bottom=0; | 1023 | ret->bottom=0; |
634 | for (i=0; i<ERR_NUM_ERRORS; i++) | 1024 | for (i=0; i<ERR_NUM_ERRORS; i++) |
@@ -651,15 +1041,95 @@ ERR_STATE *ERR_get_state(void) | |||
651 | return ret; | 1041 | return ret; |
652 | } | 1042 | } |
653 | 1043 | ||
654 | #ifdef OPENSSL_FIPS | ||
655 | void int_ERR_lib_init(void) | ||
656 | { | ||
657 | int_ERR_set_state_func(int_err_get_state, int_err_remove_state); | ||
658 | } | ||
659 | #endif | ||
660 | |||
661 | int ERR_get_next_error_library(void) | 1044 | int ERR_get_next_error_library(void) |
662 | { | 1045 | { |
663 | err_fns_check(); | 1046 | err_fns_check(); |
664 | return ERRFN(get_next_lib)(); | 1047 | return ERRFN(get_next_lib)(); |
665 | } | 1048 | } |
1049 | |||
1050 | void ERR_set_error_data(char *data, int flags) | ||
1051 | { | ||
1052 | ERR_STATE *es; | ||
1053 | int i; | ||
1054 | |||
1055 | es=ERR_get_state(); | ||
1056 | |||
1057 | i=es->top; | ||
1058 | if (i == 0) | ||
1059 | i=ERR_NUM_ERRORS-1; | ||
1060 | |||
1061 | err_clear_data(es,i); | ||
1062 | es->err_data[i]=data; | ||
1063 | es->err_data_flags[i]=flags; | ||
1064 | } | ||
1065 | |||
1066 | void ERR_add_error_data(int num, ...) | ||
1067 | { | ||
1068 | va_list args; | ||
1069 | int i,n,s; | ||
1070 | char *str,*p,*a; | ||
1071 | |||
1072 | s=80; | ||
1073 | str=OPENSSL_malloc(s+1); | ||
1074 | if (str == NULL) return; | ||
1075 | str[0]='\0'; | ||
1076 | |||
1077 | va_start(args, num); | ||
1078 | n=0; | ||
1079 | for (i=0; i<num; i++) | ||
1080 | { | ||
1081 | a=va_arg(args, char*); | ||
1082 | /* ignore NULLs, thanks to Bob Beck <beck@obtuse.com> */ | ||
1083 | if (a != NULL) | ||
1084 | { | ||
1085 | n+=strlen(a); | ||
1086 | if (n > s) | ||
1087 | { | ||
1088 | s=n+20; | ||
1089 | p=OPENSSL_realloc(str,s+1); | ||
1090 | if (p == NULL) | ||
1091 | { | ||
1092 | OPENSSL_free(str); | ||
1093 | goto err; | ||
1094 | } | ||
1095 | else | ||
1096 | str=p; | ||
1097 | } | ||
1098 | BUF_strlcat(str,a,(size_t)s+1); | ||
1099 | } | ||
1100 | } | ||
1101 | ERR_set_error_data(str,ERR_TXT_MALLOCED|ERR_TXT_STRING); | ||
1102 | |||
1103 | err: | ||
1104 | va_end(args); | ||
1105 | } | ||
1106 | |||
1107 | int ERR_set_mark(void) | ||
1108 | { | ||
1109 | ERR_STATE *es; | ||
1110 | |||
1111 | es=ERR_get_state(); | ||
1112 | |||
1113 | if (es->bottom == es->top) return 0; | ||
1114 | es->err_flags[es->top]|=ERR_FLAG_MARK; | ||
1115 | return 1; | ||
1116 | } | ||
1117 | |||
1118 | int ERR_pop_to_mark(void) | ||
1119 | { | ||
1120 | ERR_STATE *es; | ||
1121 | |||
1122 | es=ERR_get_state(); | ||
1123 | |||
1124 | while(es->bottom != es->top | ||
1125 | && (es->err_flags[es->top] & ERR_FLAG_MARK) == 0) | ||
1126 | { | ||
1127 | err_clear(es,es->top); | ||
1128 | es->top-=1; | ||
1129 | if (es->top == -1) es->top=ERR_NUM_ERRORS-1; | ||
1130 | } | ||
1131 | |||
1132 | if (es->bottom == es->top) return 0; | ||
1133 | es->err_flags[es->top]&=~ERR_FLAG_MARK; | ||
1134 | return 1; | ||
1135 | } | ||
diff --git a/src/lib/libcrypto/err/err.h b/src/lib/libcrypto/err/err.h new file mode 100644 index 0000000000..b9f8c16d47 --- /dev/null +++ b/src/lib/libcrypto/err/err.h | |||
@@ -0,0 +1,385 @@ | |||
1 | /* crypto/err/err.h */ | ||
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-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 | */ | ||
111 | |||
112 | #ifndef HEADER_ERR_H | ||
113 | #define HEADER_ERR_H | ||
114 | |||
115 | #include <openssl/e_os2.h> | ||
116 | |||
117 | #ifndef OPENSSL_NO_FP_API | ||
118 | #include <stdio.h> | ||
119 | #include <stdlib.h> | ||
120 | #endif | ||
121 | |||
122 | #include <openssl/ossl_typ.h> | ||
123 | #ifndef OPENSSL_NO_BIO | ||
124 | #include <openssl/bio.h> | ||
125 | #endif | ||
126 | #ifndef OPENSSL_NO_LHASH | ||
127 | #include <openssl/lhash.h> | ||
128 | #endif | ||
129 | |||
130 | #ifdef __cplusplus | ||
131 | extern "C" { | ||
132 | #endif | ||
133 | |||
134 | #ifndef OPENSSL_NO_ERR | ||
135 | #define ERR_PUT_error(a,b,c,d,e) ERR_put_error(a,b,c,d,e) | ||
136 | #else | ||
137 | #define ERR_PUT_error(a,b,c,d,e) ERR_put_error(a,b,c,NULL,0) | ||
138 | #endif | ||
139 | |||
140 | #include <errno.h> | ||
141 | |||
142 | #define ERR_TXT_MALLOCED 0x01 | ||
143 | #define ERR_TXT_STRING 0x02 | ||
144 | |||
145 | #define ERR_FLAG_MARK 0x01 | ||
146 | |||
147 | #define ERR_NUM_ERRORS 16 | ||
148 | typedef struct err_state_st | ||
149 | { | ||
150 | CRYPTO_THREADID tid; | ||
151 | int err_flags[ERR_NUM_ERRORS]; | ||
152 | unsigned long err_buffer[ERR_NUM_ERRORS]; | ||
153 | char *err_data[ERR_NUM_ERRORS]; | ||
154 | int err_data_flags[ERR_NUM_ERRORS]; | ||
155 | const char *err_file[ERR_NUM_ERRORS]; | ||
156 | int err_line[ERR_NUM_ERRORS]; | ||
157 | int top,bottom; | ||
158 | } ERR_STATE; | ||
159 | |||
160 | /* library */ | ||
161 | #define ERR_LIB_NONE 1 | ||
162 | #define ERR_LIB_SYS 2 | ||
163 | #define ERR_LIB_BN 3 | ||
164 | #define ERR_LIB_RSA 4 | ||
165 | #define ERR_LIB_DH 5 | ||
166 | #define ERR_LIB_EVP 6 | ||
167 | #define ERR_LIB_BUF 7 | ||
168 | #define ERR_LIB_OBJ 8 | ||
169 | #define ERR_LIB_PEM 9 | ||
170 | #define ERR_LIB_DSA 10 | ||
171 | #define ERR_LIB_X509 11 | ||
172 | /* #define ERR_LIB_METH 12 */ | ||
173 | #define ERR_LIB_ASN1 13 | ||
174 | #define ERR_LIB_CONF 14 | ||
175 | #define ERR_LIB_CRYPTO 15 | ||
176 | #define ERR_LIB_EC 16 | ||
177 | #define ERR_LIB_SSL 20 | ||
178 | /* #define ERR_LIB_SSL23 21 */ | ||
179 | /* #define ERR_LIB_SSL2 22 */ | ||
180 | /* #define ERR_LIB_SSL3 23 */ | ||
181 | /* #define ERR_LIB_RSAREF 30 */ | ||
182 | /* #define ERR_LIB_PROXY 31 */ | ||
183 | #define ERR_LIB_BIO 32 | ||
184 | #define ERR_LIB_PKCS7 33 | ||
185 | #define ERR_LIB_X509V3 34 | ||
186 | #define ERR_LIB_PKCS12 35 | ||
187 | #define ERR_LIB_RAND 36 | ||
188 | #define ERR_LIB_DSO 37 | ||
189 | #define ERR_LIB_ENGINE 38 | ||
190 | #define ERR_LIB_OCSP 39 | ||
191 | #define ERR_LIB_UI 40 | ||
192 | #define ERR_LIB_COMP 41 | ||
193 | #define ERR_LIB_ECDSA 42 | ||
194 | #define ERR_LIB_ECDH 43 | ||
195 | #define ERR_LIB_STORE 44 | ||
196 | #define ERR_LIB_FIPS 45 | ||
197 | #define ERR_LIB_CMS 46 | ||
198 | #define ERR_LIB_TS 47 | ||
199 | #define ERR_LIB_HMAC 48 | ||
200 | #define ERR_LIB_JPAKE 49 | ||
201 | |||
202 | #define ERR_LIB_USER 128 | ||
203 | |||
204 | #define SYSerr(f,r) ERR_PUT_error(ERR_LIB_SYS,(f),(r),__FILE__,__LINE__) | ||
205 | #define BNerr(f,r) ERR_PUT_error(ERR_LIB_BN,(f),(r),__FILE__,__LINE__) | ||
206 | #define RSAerr(f,r) ERR_PUT_error(ERR_LIB_RSA,(f),(r),__FILE__,__LINE__) | ||
207 | #define DHerr(f,r) ERR_PUT_error(ERR_LIB_DH,(f),(r),__FILE__,__LINE__) | ||
208 | #define EVPerr(f,r) ERR_PUT_error(ERR_LIB_EVP,(f),(r),__FILE__,__LINE__) | ||
209 | #define BUFerr(f,r) ERR_PUT_error(ERR_LIB_BUF,(f),(r),__FILE__,__LINE__) | ||
210 | #define OBJerr(f,r) ERR_PUT_error(ERR_LIB_OBJ,(f),(r),__FILE__,__LINE__) | ||
211 | #define PEMerr(f,r) ERR_PUT_error(ERR_LIB_PEM,(f),(r),__FILE__,__LINE__) | ||
212 | #define DSAerr(f,r) ERR_PUT_error(ERR_LIB_DSA,(f),(r),__FILE__,__LINE__) | ||
213 | #define X509err(f,r) ERR_PUT_error(ERR_LIB_X509,(f),(r),__FILE__,__LINE__) | ||
214 | #define ASN1err(f,r) ERR_PUT_error(ERR_LIB_ASN1,(f),(r),__FILE__,__LINE__) | ||
215 | #define CONFerr(f,r) ERR_PUT_error(ERR_LIB_CONF,(f),(r),__FILE__,__LINE__) | ||
216 | #define CRYPTOerr(f,r) ERR_PUT_error(ERR_LIB_CRYPTO,(f),(r),__FILE__,__LINE__) | ||
217 | #define ECerr(f,r) ERR_PUT_error(ERR_LIB_EC,(f),(r),__FILE__,__LINE__) | ||
218 | #define SSLerr(f,r) ERR_PUT_error(ERR_LIB_SSL,(f),(r),__FILE__,__LINE__) | ||
219 | #define BIOerr(f,r) ERR_PUT_error(ERR_LIB_BIO,(f),(r),__FILE__,__LINE__) | ||
220 | #define PKCS7err(f,r) ERR_PUT_error(ERR_LIB_PKCS7,(f),(r),__FILE__,__LINE__) | ||
221 | #define X509V3err(f,r) ERR_PUT_error(ERR_LIB_X509V3,(f),(r),__FILE__,__LINE__) | ||
222 | #define PKCS12err(f,r) ERR_PUT_error(ERR_LIB_PKCS12,(f),(r),__FILE__,__LINE__) | ||
223 | #define RANDerr(f,r) ERR_PUT_error(ERR_LIB_RAND,(f),(r),__FILE__,__LINE__) | ||
224 | #define DSOerr(f,r) ERR_PUT_error(ERR_LIB_DSO,(f),(r),__FILE__,__LINE__) | ||
225 | #define ENGINEerr(f,r) ERR_PUT_error(ERR_LIB_ENGINE,(f),(r),__FILE__,__LINE__) | ||
226 | #define OCSPerr(f,r) ERR_PUT_error(ERR_LIB_OCSP,(f),(r),__FILE__,__LINE__) | ||
227 | #define UIerr(f,r) ERR_PUT_error(ERR_LIB_UI,(f),(r),__FILE__,__LINE__) | ||
228 | #define COMPerr(f,r) ERR_PUT_error(ERR_LIB_COMP,(f),(r),__FILE__,__LINE__) | ||
229 | #define ECDSAerr(f,r) ERR_PUT_error(ERR_LIB_ECDSA,(f),(r),__FILE__,__LINE__) | ||
230 | #define ECDHerr(f,r) ERR_PUT_error(ERR_LIB_ECDH,(f),(r),__FILE__,__LINE__) | ||
231 | #define STOREerr(f,r) ERR_PUT_error(ERR_LIB_STORE,(f),(r),__FILE__,__LINE__) | ||
232 | #define FIPSerr(f,r) ERR_PUT_error(ERR_LIB_FIPS,(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__) | ||
236 | #define JPAKEerr(f,r) ERR_PUT_error(ERR_LIB_JPAKE,(f),(r),__FILE__,__LINE__) | ||
237 | |||
238 | /* Borland C seems too stupid to be able to shift and do longs in | ||
239 | * the pre-processor :-( */ | ||
240 | #define ERR_PACK(l,f,r) (((((unsigned long)l)&0xffL)*0x1000000)| \ | ||
241 | ((((unsigned long)f)&0xfffL)*0x1000)| \ | ||
242 | ((((unsigned long)r)&0xfffL))) | ||
243 | #define ERR_GET_LIB(l) (int)((((unsigned long)l)>>24L)&0xffL) | ||
244 | #define ERR_GET_FUNC(l) (int)((((unsigned long)l)>>12L)&0xfffL) | ||
245 | #define ERR_GET_REASON(l) (int)((l)&0xfffL) | ||
246 | #define ERR_FATAL_ERROR(l) (int)((l)&ERR_R_FATAL) | ||
247 | |||
248 | |||
249 | /* OS functions */ | ||
250 | #define SYS_F_FOPEN 1 | ||
251 | #define SYS_F_CONNECT 2 | ||
252 | #define SYS_F_GETSERVBYNAME 3 | ||
253 | #define SYS_F_SOCKET 4 | ||
254 | #define SYS_F_IOCTLSOCKET 5 | ||
255 | #define SYS_F_BIND 6 | ||
256 | #define SYS_F_LISTEN 7 | ||
257 | #define SYS_F_ACCEPT 8 | ||
258 | #define SYS_F_WSASTARTUP 9 /* Winsock stuff */ | ||
259 | #define SYS_F_OPENDIR 10 | ||
260 | #define SYS_F_FREAD 11 | ||
261 | |||
262 | |||
263 | /* reasons */ | ||
264 | #define ERR_R_SYS_LIB ERR_LIB_SYS /* 2 */ | ||
265 | #define ERR_R_BN_LIB ERR_LIB_BN /* 3 */ | ||
266 | #define ERR_R_RSA_LIB ERR_LIB_RSA /* 4 */ | ||
267 | #define ERR_R_DH_LIB ERR_LIB_DH /* 5 */ | ||
268 | #define ERR_R_EVP_LIB ERR_LIB_EVP /* 6 */ | ||
269 | #define ERR_R_BUF_LIB ERR_LIB_BUF /* 7 */ | ||
270 | #define ERR_R_OBJ_LIB ERR_LIB_OBJ /* 8 */ | ||
271 | #define ERR_R_PEM_LIB ERR_LIB_PEM /* 9 */ | ||
272 | #define ERR_R_DSA_LIB ERR_LIB_DSA /* 10 */ | ||
273 | #define ERR_R_X509_LIB ERR_LIB_X509 /* 11 */ | ||
274 | #define ERR_R_ASN1_LIB ERR_LIB_ASN1 /* 13 */ | ||
275 | #define ERR_R_CONF_LIB ERR_LIB_CONF /* 14 */ | ||
276 | #define ERR_R_CRYPTO_LIB ERR_LIB_CRYPTO /* 15 */ | ||
277 | #define ERR_R_EC_LIB ERR_LIB_EC /* 16 */ | ||
278 | #define ERR_R_SSL_LIB ERR_LIB_SSL /* 20 */ | ||
279 | #define ERR_R_BIO_LIB ERR_LIB_BIO /* 32 */ | ||
280 | #define ERR_R_PKCS7_LIB ERR_LIB_PKCS7 /* 33 */ | ||
281 | #define ERR_R_X509V3_LIB ERR_LIB_X509V3 /* 34 */ | ||
282 | #define ERR_R_PKCS12_LIB ERR_LIB_PKCS12 /* 35 */ | ||
283 | #define ERR_R_RAND_LIB ERR_LIB_RAND /* 36 */ | ||
284 | #define ERR_R_DSO_LIB ERR_LIB_DSO /* 37 */ | ||
285 | #define ERR_R_ENGINE_LIB ERR_LIB_ENGINE /* 38 */ | ||
286 | #define ERR_R_OCSP_LIB ERR_LIB_OCSP /* 39 */ | ||
287 | #define ERR_R_UI_LIB ERR_LIB_UI /* 40 */ | ||
288 | #define ERR_R_COMP_LIB ERR_LIB_COMP /* 41 */ | ||
289 | #define ERR_R_ECDSA_LIB ERR_LIB_ECDSA /* 42 */ | ||
290 | #define ERR_R_ECDH_LIB ERR_LIB_ECDH /* 43 */ | ||
291 | #define ERR_R_STORE_LIB ERR_LIB_STORE /* 44 */ | ||
292 | #define ERR_R_TS_LIB ERR_LIB_TS /* 45 */ | ||
293 | |||
294 | #define ERR_R_NESTED_ASN1_ERROR 58 | ||
295 | #define ERR_R_BAD_ASN1_OBJECT_HEADER 59 | ||
296 | #define ERR_R_BAD_GET_ASN1_OBJECT_CALL 60 | ||
297 | #define ERR_R_EXPECTING_AN_ASN1_SEQUENCE 61 | ||
298 | #define ERR_R_ASN1_LENGTH_MISMATCH 62 | ||
299 | #define ERR_R_MISSING_ASN1_EOS 63 | ||
300 | |||
301 | /* fatal error */ | ||
302 | #define ERR_R_FATAL 64 | ||
303 | #define ERR_R_MALLOC_FAILURE (1|ERR_R_FATAL) | ||
304 | #define ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED (2|ERR_R_FATAL) | ||
305 | #define ERR_R_PASSED_NULL_PARAMETER (3|ERR_R_FATAL) | ||
306 | #define ERR_R_INTERNAL_ERROR (4|ERR_R_FATAL) | ||
307 | #define ERR_R_DISABLED (5|ERR_R_FATAL) | ||
308 | |||
309 | /* 99 is the maximum possible ERR_R_... code, higher values | ||
310 | * are reserved for the individual libraries */ | ||
311 | |||
312 | |||
313 | typedef struct ERR_string_data_st | ||
314 | { | ||
315 | unsigned long error; | ||
316 | const char *string; | ||
317 | } ERR_STRING_DATA; | ||
318 | |||
319 | void ERR_put_error(int lib, int func,int reason,const char *file,int line); | ||
320 | void ERR_set_error_data(char *data,int flags); | ||
321 | |||
322 | unsigned long ERR_get_error(void); | ||
323 | unsigned long ERR_get_error_line(const char **file,int *line); | ||
324 | unsigned long ERR_get_error_line_data(const char **file,int *line, | ||
325 | const char **data, int *flags); | ||
326 | unsigned long ERR_peek_error(void); | ||
327 | unsigned long ERR_peek_error_line(const char **file,int *line); | ||
328 | unsigned long ERR_peek_error_line_data(const char **file,int *line, | ||
329 | const char **data,int *flags); | ||
330 | unsigned long ERR_peek_last_error(void); | ||
331 | unsigned long ERR_peek_last_error_line(const char **file,int *line); | ||
332 | unsigned long ERR_peek_last_error_line_data(const char **file,int *line, | ||
333 | const char **data,int *flags); | ||
334 | void ERR_clear_error(void ); | ||
335 | char *ERR_error_string(unsigned long e,char *buf); | ||
336 | void ERR_error_string_n(unsigned long e, char *buf, size_t len); | ||
337 | const char *ERR_lib_error_string(unsigned long e); | ||
338 | const char *ERR_func_error_string(unsigned long e); | ||
339 | const char *ERR_reason_error_string(unsigned long e); | ||
340 | void ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u), | ||
341 | void *u); | ||
342 | #ifndef OPENSSL_NO_FP_API | ||
343 | void ERR_print_errors_fp(FILE *fp); | ||
344 | #endif | ||
345 | #ifndef OPENSSL_NO_BIO | ||
346 | void ERR_print_errors(BIO *bp); | ||
347 | void ERR_add_error_data(int num, ...); | ||
348 | #endif | ||
349 | void ERR_load_strings(int lib,ERR_STRING_DATA str[]); | ||
350 | void ERR_unload_strings(int lib,ERR_STRING_DATA str[]); | ||
351 | void ERR_load_ERR_strings(void); | ||
352 | void ERR_load_crypto_strings(void); | ||
353 | void ERR_free_strings(void); | ||
354 | |||
355 | void ERR_remove_thread_state(const CRYPTO_THREADID *tid); | ||
356 | #ifndef OPENSSL_NO_DEPRECATED | ||
357 | void ERR_remove_state(unsigned long pid); /* if zero we look it up */ | ||
358 | #endif | ||
359 | ERR_STATE *ERR_get_state(void); | ||
360 | |||
361 | #ifndef OPENSSL_NO_LHASH | ||
362 | LHASH_OF(ERR_STRING_DATA) *ERR_get_string_table(void); | ||
363 | LHASH_OF(ERR_STATE) *ERR_get_err_state_table(void); | ||
364 | void ERR_release_err_state_table(LHASH_OF(ERR_STATE) **hash); | ||
365 | #endif | ||
366 | |||
367 | int ERR_get_next_error_library(void); | ||
368 | |||
369 | int ERR_set_mark(void); | ||
370 | int ERR_pop_to_mark(void); | ||
371 | |||
372 | /* Already defined in ossl_typ.h */ | ||
373 | /* typedef struct st_ERR_FNS ERR_FNS; */ | ||
374 | /* An application can use this function and provide the return value to loaded | ||
375 | * modules that should use the application's ERR state/functionality */ | ||
376 | const ERR_FNS *ERR_get_implementation(void); | ||
377 | /* A loaded module should call this function prior to any ERR operations using | ||
378 | * the application's "ERR_FNS". */ | ||
379 | int ERR_set_implementation(const ERR_FNS *fns); | ||
380 | |||
381 | #ifdef __cplusplus | ||
382 | } | ||
383 | #endif | ||
384 | |||
385 | #endif | ||
diff --git a/src/lib/libcrypto/err/err_all.c b/src/lib/libcrypto/err/err_all.c new file mode 100644 index 0000000000..fc049e8e88 --- /dev/null +++ b/src/lib/libcrypto/err/err_all.c | |||
@@ -0,0 +1,160 @@ | |||
1 | /* crypto/err/err_all.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 <openssl/asn1.h> | ||
61 | #include <openssl/bn.h> | ||
62 | #ifndef OPENSSL_NO_EC | ||
63 | #include <openssl/ec.h> | ||
64 | #endif | ||
65 | #include <openssl/buffer.h> | ||
66 | #include <openssl/bio.h> | ||
67 | #include <openssl/comp.h> | ||
68 | #ifndef OPENSSL_NO_RSA | ||
69 | #include <openssl/rsa.h> | ||
70 | #endif | ||
71 | #ifndef OPENSSL_NO_DH | ||
72 | #include <openssl/dh.h> | ||
73 | #endif | ||
74 | #ifndef OPENSSL_NO_DSA | ||
75 | #include <openssl/dsa.h> | ||
76 | #endif | ||
77 | #ifndef OPENSSL_NO_ECDSA | ||
78 | #include <openssl/ecdsa.h> | ||
79 | #endif | ||
80 | #ifndef OPENSSL_NO_ECDH | ||
81 | #include <openssl/ecdh.h> | ||
82 | #endif | ||
83 | #include <openssl/evp.h> | ||
84 | #include <openssl/objects.h> | ||
85 | #include <openssl/pem2.h> | ||
86 | #include <openssl/x509.h> | ||
87 | #include <openssl/x509v3.h> | ||
88 | #include <openssl/conf.h> | ||
89 | #include <openssl/pkcs12.h> | ||
90 | #include <openssl/rand.h> | ||
91 | #include <openssl/dso.h> | ||
92 | #ifndef OPENSSL_NO_ENGINE | ||
93 | #include <openssl/engine.h> | ||
94 | #endif | ||
95 | #include <openssl/ui.h> | ||
96 | #include <openssl/ocsp.h> | ||
97 | #include <openssl/err.h> | ||
98 | #include <openssl/ts.h> | ||
99 | #ifndef OPENSSL_NO_CMS | ||
100 | #include <openssl/cms.h> | ||
101 | #endif | ||
102 | #ifndef OPENSSL_NO_JPAKE | ||
103 | #include <openssl/jpake.h> | ||
104 | #endif | ||
105 | #include <openssl/comp.h> | ||
106 | |||
107 | void ERR_load_crypto_strings(void) | ||
108 | { | ||
109 | #ifndef OPENSSL_NO_ERR | ||
110 | ERR_load_ERR_strings(); /* include error strings for SYSerr */ | ||
111 | ERR_load_BN_strings(); | ||
112 | #ifndef OPENSSL_NO_RSA | ||
113 | ERR_load_RSA_strings(); | ||
114 | #endif | ||
115 | #ifndef OPENSSL_NO_DH | ||
116 | ERR_load_DH_strings(); | ||
117 | #endif | ||
118 | ERR_load_EVP_strings(); | ||
119 | ERR_load_BUF_strings(); | ||
120 | ERR_load_OBJ_strings(); | ||
121 | ERR_load_PEM_strings(); | ||
122 | #ifndef OPENSSL_NO_DSA | ||
123 | ERR_load_DSA_strings(); | ||
124 | #endif | ||
125 | ERR_load_X509_strings(); | ||
126 | ERR_load_ASN1_strings(); | ||
127 | ERR_load_CONF_strings(); | ||
128 | ERR_load_CRYPTO_strings(); | ||
129 | ERR_load_COMP_strings(); | ||
130 | #ifndef OPENSSL_NO_EC | ||
131 | ERR_load_EC_strings(); | ||
132 | #endif | ||
133 | #ifndef OPENSSL_NO_ECDSA | ||
134 | ERR_load_ECDSA_strings(); | ||
135 | #endif | ||
136 | #ifndef OPENSSL_NO_ECDH | ||
137 | ERR_load_ECDH_strings(); | ||
138 | #endif | ||
139 | /* skip ERR_load_SSL_strings() because it is not in this library */ | ||
140 | ERR_load_BIO_strings(); | ||
141 | ERR_load_PKCS7_strings(); | ||
142 | ERR_load_X509V3_strings(); | ||
143 | ERR_load_PKCS12_strings(); | ||
144 | ERR_load_RAND_strings(); | ||
145 | ERR_load_DSO_strings(); | ||
146 | ERR_load_TS_strings(); | ||
147 | #ifndef OPENSSL_NO_ENGINE | ||
148 | ERR_load_ENGINE_strings(); | ||
149 | #endif | ||
150 | ERR_load_OCSP_strings(); | ||
151 | ERR_load_UI_strings(); | ||
152 | #ifndef OPENSSL_NO_CMS | ||
153 | ERR_load_CMS_strings(); | ||
154 | #endif | ||
155 | #ifndef OPENSSL_NO_JPAKE | ||
156 | ERR_load_JPAKE_strings(); | ||
157 | #endif | ||
158 | ERR_load_COMP_strings(); | ||
159 | #endif | ||
160 | } | ||
diff --git a/src/lib/libcrypto/err/err_bio.c b/src/lib/libcrypto/err/err_prn.c index a42f804840..a0168ac8ed 100644 --- a/src/lib/libcrypto/err/err_bio.c +++ b/src/lib/libcrypto/err/err_prn.c | |||
@@ -63,6 +63,45 @@ | |||
63 | #include <openssl/buffer.h> | 63 | #include <openssl/buffer.h> |
64 | #include <openssl/err.h> | 64 | #include <openssl/err.h> |
65 | 65 | ||
66 | void ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u), | ||
67 | void *u) | ||
68 | { | ||
69 | unsigned long l; | ||
70 | char buf[256]; | ||
71 | char buf2[4096]; | ||
72 | const char *file,*data; | ||
73 | int line,flags; | ||
74 | unsigned long es; | ||
75 | CRYPTO_THREADID cur; | ||
76 | |||
77 | CRYPTO_THREADID_current(&cur); | ||
78 | es=CRYPTO_THREADID_hash(&cur); | ||
79 | while ((l=ERR_get_error_line_data(&file,&line,&data,&flags)) != 0) | ||
80 | { | ||
81 | ERR_error_string_n(l, buf, sizeof buf); | ||
82 | BIO_snprintf(buf2, sizeof(buf2), "%lu:%s:%s:%d:%s\n", es, buf, | ||
83 | file, line, (flags & ERR_TXT_STRING) ? data : ""); | ||
84 | if (cb(buf2, strlen(buf2), u) <= 0) | ||
85 | break; /* abort outputting the error report */ | ||
86 | } | ||
87 | } | ||
88 | |||
89 | #ifndef OPENSSL_NO_FP_API | ||
90 | static int print_fp(const char *str, size_t len, void *fp) | ||
91 | { | ||
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); | ||
98 | } | ||
99 | void ERR_print_errors_fp(FILE *fp) | ||
100 | { | ||
101 | ERR_print_errors_cb(print_fp, fp); | ||
102 | } | ||
103 | #endif | ||
104 | |||
66 | static int print_bio(const char *str, size_t len, void *bp) | 105 | static int print_bio(const char *str, size_t len, void *bp) |
67 | { | 106 | { |
68 | return BIO_write((BIO *)bp, str, len); | 107 | return BIO_write((BIO *)bp, str, len); |
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 | ||
123 | static 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 | |||
155 | static 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 | |||
173 | static 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 | |||
221 | static 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 | |||
231 | static 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 | |||
282 | void 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 new file mode 100644 index 0000000000..e0554b4342 --- /dev/null +++ b/src/lib/libcrypto/err/openssl.ec | |||
@@ -0,0 +1,96 @@ | |||
1 | # crypto/err/openssl.ec | ||
2 | |||
3 | # configuration file for util/mkerr.pl | ||
4 | |||
5 | # files that may have to be rewritten by util/mkerr.pl | ||
6 | L ERR NONE NONE | ||
7 | L BN crypto/bn/bn.h crypto/bn/bn_err.c | ||
8 | L RSA crypto/rsa/rsa.h crypto/rsa/rsa_err.c | ||
9 | L DH crypto/dh/dh.h crypto/dh/dh_err.c | ||
10 | L EVP crypto/evp/evp.h crypto/evp/evp_err.c | ||
11 | L BUF crypto/buffer/buffer.h crypto/buffer/buf_err.c | ||
12 | L OBJ crypto/objects/objects.h crypto/objects/obj_err.c | ||
13 | L PEM crypto/pem/pem.h crypto/pem/pem_err.c | ||
14 | L DSA crypto/dsa/dsa.h crypto/dsa/dsa_err.c | ||
15 | L X509 crypto/x509/x509.h crypto/x509/x509_err.c | ||
16 | L ASN1 crypto/asn1/asn1.h crypto/asn1/asn1_err.c | ||
17 | L CONF crypto/conf/conf.h crypto/conf/conf_err.c | ||
18 | L CRYPTO crypto/crypto.h crypto/cpt_err.c | ||
19 | L EC crypto/ec/ec.h crypto/ec/ec_err.c | ||
20 | L SSL ssl/ssl.h ssl/ssl_err.c | ||
21 | L BIO crypto/bio/bio.h crypto/bio/bio_err.c | ||
22 | L PKCS7 crypto/pkcs7/pkcs7.h crypto/pkcs7/pkcs7err.c | ||
23 | L X509V3 crypto/x509v3/x509v3.h crypto/x509v3/v3err.c | ||
24 | L PKCS12 crypto/pkcs12/pkcs12.h crypto/pkcs12/pk12err.c | ||
25 | L RAND crypto/rand/rand.h crypto/rand/rand_err.c | ||
26 | L DSO crypto/dso/dso.h crypto/dso/dso_err.c | ||
27 | L ENGINE crypto/engine/engine.h crypto/engine/eng_err.c | ||
28 | L OCSP crypto/ocsp/ocsp.h crypto/ocsp/ocsp_err.c | ||
29 | L UI crypto/ui/ui.h crypto/ui/ui_err.c | ||
30 | L COMP crypto/comp/comp.h crypto/comp/comp_err.c | ||
31 | L ECDSA crypto/ecdsa/ecdsa.h crypto/ecdsa/ecs_err.c | ||
32 | L ECDH crypto/ecdh/ecdh.h crypto/ecdh/ech_err.c | ||
33 | L STORE crypto/store/store.h crypto/store/str_err.c | ||
34 | L TS crypto/ts/ts.h crypto/ts/ts_err.c | ||
35 | L HMAC crypto/hmac/hmac.h crypto/hmac/hmac_err.c | ||
36 | L CMS crypto/cms/cms.h crypto/cms/cms_err.c | ||
37 | L JPAKE crypto/jpake/jpake.h crypto/jpake/jpake_err.c | ||
38 | |||
39 | # additional header files to be scanned for function names | ||
40 | L NONE crypto/x509/x509_vfy.h NONE | ||
41 | L NONE crypto/ec/ec_lcl.h NONE | ||
42 | L NONE crypto/asn1/asn_lcl.h NONE | ||
43 | L NONE crypto/cms/cms_lcl.h NONE | ||
44 | |||
45 | |||
46 | F RSAREF_F_RSA_BN2BIN | ||
47 | F RSAREF_F_RSA_PRIVATE_DECRYPT | ||
48 | F RSAREF_F_RSA_PRIVATE_ENCRYPT | ||
49 | F RSAREF_F_RSA_PUBLIC_DECRYPT | ||
50 | F RSAREF_F_RSA_PUBLIC_ENCRYPT | ||
51 | #F SSL_F_CLIENT_CERTIFICATE | ||
52 | |||
53 | R SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE 1010 | ||
54 | R SSL_R_SSLV3_ALERT_BAD_RECORD_MAC 1020 | ||
55 | R SSL_R_TLSV1_ALERT_DECRYPTION_FAILED 1021 | ||
56 | R SSL_R_TLSV1_ALERT_RECORD_OVERFLOW 1022 | ||
57 | R SSL_R_SSLV3_ALERT_DECOMPRESSION_FAILURE 1030 | ||
58 | R SSL_R_SSLV3_ALERT_HANDSHAKE_FAILURE 1040 | ||
59 | R SSL_R_SSLV3_ALERT_NO_CERTIFICATE 1041 | ||
60 | R SSL_R_SSLV3_ALERT_BAD_CERTIFICATE 1042 | ||
61 | R SSL_R_SSLV3_ALERT_UNSUPPORTED_CERTIFICATE 1043 | ||
62 | R SSL_R_SSLV3_ALERT_CERTIFICATE_REVOKED 1044 | ||
63 | R SSL_R_SSLV3_ALERT_CERTIFICATE_EXPIRED 1045 | ||
64 | R SSL_R_SSLV3_ALERT_CERTIFICATE_UNKNOWN 1046 | ||
65 | R SSL_R_SSLV3_ALERT_ILLEGAL_PARAMETER 1047 | ||
66 | R SSL_R_TLSV1_ALERT_UNKNOWN_CA 1048 | ||
67 | R SSL_R_TLSV1_ALERT_ACCESS_DENIED 1049 | ||
68 | R SSL_R_TLSV1_ALERT_DECODE_ERROR 1050 | ||
69 | R SSL_R_TLSV1_ALERT_DECRYPT_ERROR 1051 | ||
70 | R SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION 1060 | ||
71 | R SSL_R_TLSV1_ALERT_PROTOCOL_VERSION 1070 | ||
72 | R SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY 1071 | ||
73 | R SSL_R_TLSV1_ALERT_INTERNAL_ERROR 1080 | ||
74 | R SSL_R_TLSV1_ALERT_USER_CANCELLED 1090 | ||
75 | R SSL_R_TLSV1_ALERT_NO_RENEGOTIATION 1100 | ||
76 | R SSL_R_TLSV1_UNSUPPORTED_EXTENSION 1110 | ||
77 | R SSL_R_TLSV1_CERTIFICATE_UNOBTAINABLE 1111 | ||
78 | R SSL_R_TLSV1_UNRECOGNIZED_NAME 1112 | ||
79 | R SSL_R_TLSV1_BAD_CERTIFICATE_STATUS_RESPONSE 1113 | ||
80 | R SSL_R_TLSV1_BAD_CERTIFICATE_HASH_VALUE 1114 | ||
81 | |||
82 | R RSAREF_R_CONTENT_ENCODING 0x0400 | ||
83 | R RSAREF_R_DATA 0x0401 | ||
84 | R RSAREF_R_DIGEST_ALGORITHM 0x0402 | ||
85 | R RSAREF_R_ENCODING 0x0403 | ||
86 | R RSAREF_R_KEY 0x0404 | ||
87 | R RSAREF_R_KEY_ENCODING 0x0405 | ||
88 | R RSAREF_R_LEN 0x0406 | ||
89 | R RSAREF_R_MODULUS_LEN 0x0407 | ||
90 | R RSAREF_R_NEED_RANDOM 0x0408 | ||
91 | R RSAREF_R_PRIVATE_KEY 0x0409 | ||
92 | R RSAREF_R_PUBLIC_KEY 0x040a | ||
93 | R RSAREF_R_SIGNATURE 0x040b | ||
94 | R RSAREF_R_SIGNATURE_ENCODING 0x040c | ||
95 | R RSAREF_R_ENCRYPTION_ALGORITHM 0x040d | ||
96 | |||