diff options
Diffstat (limited to 'src/lib/libcrypto/err/err.c')
-rw-r--r-- | src/lib/libcrypto/err/err.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/libcrypto/err/err.c b/src/lib/libcrypto/err/err.c index 8810d838c6..93c64cbc4f 100644 --- a/src/lib/libcrypto/err/err.c +++ b/src/lib/libcrypto/err/err.c | |||
@@ -91,7 +91,7 @@ static ERR_STRING_DATA ERR_str_libraries[]= | |||
91 | {ERR_PACK(ERR_LIB_PEM,0,0) ,"PEM routines"}, | 91 | {ERR_PACK(ERR_LIB_PEM,0,0) ,"PEM routines"}, |
92 | {ERR_PACK(ERR_LIB_ASN1,0,0) ,"asn1 encoding routines"}, | 92 | {ERR_PACK(ERR_LIB_ASN1,0,0) ,"asn1 encoding routines"}, |
93 | {ERR_PACK(ERR_LIB_X509,0,0) ,"x509 certificate routines"}, | 93 | {ERR_PACK(ERR_LIB_X509,0,0) ,"x509 certificate routines"}, |
94 | {ERR_PACK(ERR_LIB_CONF,0,0) ,"configuation file routines"}, | 94 | {ERR_PACK(ERR_LIB_CONF,0,0) ,"configuration file routines"}, |
95 | {ERR_PACK(ERR_LIB_METH,0,0) ,"X509 lookup 'method' routines"}, | 95 | {ERR_PACK(ERR_LIB_METH,0,0) ,"X509 lookup 'method' routines"}, |
96 | {ERR_PACK(ERR_LIB_SSL,0,0) ,"SSL routines"}, | 96 | {ERR_PACK(ERR_LIB_SSL,0,0) ,"SSL routines"}, |
97 | {ERR_PACK(ERR_LIB_RSAREF,0,0) ,"RSAref routines"}, | 97 | {ERR_PACK(ERR_LIB_RSAREF,0,0) ,"RSAref routines"}, |
@@ -100,6 +100,7 @@ static ERR_STRING_DATA ERR_str_libraries[]= | |||
100 | {ERR_PACK(ERR_LIB_PKCS7,0,0) ,"PKCS7 routines"}, | 100 | {ERR_PACK(ERR_LIB_PKCS7,0,0) ,"PKCS7 routines"}, |
101 | {ERR_PACK(ERR_LIB_X509V3,0,0) ,"X509 V3 routines"}, | 101 | {ERR_PACK(ERR_LIB_X509V3,0,0) ,"X509 V3 routines"}, |
102 | {ERR_PACK(ERR_LIB_PKCS12,0,0) ,"PKCS12 routines"}, | 102 | {ERR_PACK(ERR_LIB_PKCS12,0,0) ,"PKCS12 routines"}, |
103 | {ERR_PACK(ERR_LIB_RAND,0,0) ,"random number generator"}, | ||
103 | {0,NULL}, | 104 | {0,NULL}, |
104 | }; | 105 | }; |
105 | 106 | ||
@@ -221,7 +222,7 @@ void ERR_load_strings(int lib, ERR_STRING_DATA *str) | |||
221 | while (str->error) | 222 | while (str->error) |
222 | { | 223 | { |
223 | str->error|=ERR_PACK(lib,0,0); | 224 | str->error|=ERR_PACK(lib,0,0); |
224 | lh_insert(error_hash,(char *)str); | 225 | lh_insert(error_hash,str); |
225 | str++; | 226 | str++; |
226 | } | 227 | } |
227 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR_HASH); | 228 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR_HASH); |
@@ -427,7 +428,7 @@ const char *ERR_lib_error_string(unsigned long e) | |||
427 | if (error_hash != NULL) | 428 | if (error_hash != NULL) |
428 | { | 429 | { |
429 | d.error=ERR_PACK(l,0,0); | 430 | d.error=ERR_PACK(l,0,0); |
430 | p=(ERR_STRING_DATA *)lh_retrieve(error_hash,(char *)&d); | 431 | p=(ERR_STRING_DATA *)lh_retrieve(error_hash,&d); |
431 | } | 432 | } |
432 | 433 | ||
433 | CRYPTO_r_unlock(CRYPTO_LOCK_ERR_HASH); | 434 | CRYPTO_r_unlock(CRYPTO_LOCK_ERR_HASH); |
@@ -448,7 +449,7 @@ const char *ERR_func_error_string(unsigned long e) | |||
448 | if (error_hash != NULL) | 449 | if (error_hash != NULL) |
449 | { | 450 | { |
450 | d.error=ERR_PACK(l,f,0); | 451 | d.error=ERR_PACK(l,f,0); |
451 | p=(ERR_STRING_DATA *)lh_retrieve(error_hash,(char *)&d); | 452 | p=(ERR_STRING_DATA *)lh_retrieve(error_hash,&d); |
452 | } | 453 | } |
453 | 454 | ||
454 | CRYPTO_r_unlock(CRYPTO_LOCK_ERR_HASH); | 455 | CRYPTO_r_unlock(CRYPTO_LOCK_ERR_HASH); |
@@ -469,12 +470,11 @@ const char *ERR_reason_error_string(unsigned long e) | |||
469 | if (error_hash != NULL) | 470 | if (error_hash != NULL) |
470 | { | 471 | { |
471 | d.error=ERR_PACK(l,0,r); | 472 | d.error=ERR_PACK(l,0,r); |
472 | p=(ERR_STRING_DATA *)lh_retrieve(error_hash,(char *)&d); | 473 | p=(ERR_STRING_DATA *)lh_retrieve(error_hash,&d); |
473 | if (p == NULL) | 474 | if (p == NULL) |
474 | { | 475 | { |
475 | d.error=ERR_PACK(0,0,r); | 476 | d.error=ERR_PACK(0,0,r); |
476 | p=(ERR_STRING_DATA *)lh_retrieve(error_hash, | 477 | p=(ERR_STRING_DATA *)lh_retrieve(error_hash,&d); |
477 | (char *)&d); | ||
478 | } | 478 | } |
479 | } | 479 | } |
480 | 480 | ||
@@ -517,7 +517,7 @@ void ERR_remove_state(unsigned long pid) | |||
517 | pid=(unsigned long)CRYPTO_thread_id(); | 517 | pid=(unsigned long)CRYPTO_thread_id(); |
518 | tmp.pid=pid; | 518 | tmp.pid=pid; |
519 | CRYPTO_w_lock(CRYPTO_LOCK_ERR); | 519 | CRYPTO_w_lock(CRYPTO_LOCK_ERR); |
520 | p=(ERR_STATE *)lh_delete(thread_hash,(char *)&tmp); | 520 | p=(ERR_STATE *)lh_delete(thread_hash,&tmp); |
521 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR); | 521 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR); |
522 | 522 | ||
523 | if (p != NULL) ERR_STATE_free(p); | 523 | if (p != NULL) ERR_STATE_free(p); |
@@ -551,7 +551,7 @@ ERR_STATE *ERR_get_state(void) | |||
551 | else | 551 | else |
552 | { | 552 | { |
553 | tmp.pid=pid; | 553 | tmp.pid=pid; |
554 | ret=(ERR_STATE *)lh_retrieve(thread_hash,(char *)&tmp); | 554 | ret=(ERR_STATE *)lh_retrieve(thread_hash,&tmp); |
555 | CRYPTO_r_unlock(CRYPTO_LOCK_ERR); | 555 | CRYPTO_r_unlock(CRYPTO_LOCK_ERR); |
556 | } | 556 | } |
557 | 557 | ||
@@ -569,7 +569,7 @@ ERR_STATE *ERR_get_state(void) | |||
569 | ret->err_data_flags[i]=0; | 569 | ret->err_data_flags[i]=0; |
570 | } | 570 | } |
571 | CRYPTO_w_lock(CRYPTO_LOCK_ERR); | 571 | CRYPTO_w_lock(CRYPTO_LOCK_ERR); |
572 | tmpp=(ERR_STATE *)lh_insert(thread_hash,(char *)ret); | 572 | tmpp=(ERR_STATE *)lh_insert(thread_hash,ret); |
573 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR); | 573 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR); |
574 | if (tmpp != NULL) /* old entry - should not happen */ | 574 | if (tmpp != NULL) /* old entry - should not happen */ |
575 | { | 575 | { |