The majority of the OCSP code from CertCo.

[openssl.git] / crypto / err / err.c

diff --git a/crypto/err/err.c b/crypto/err/err.c
index 0944cc220ef6b30255f1b941da6b6eb001d1e20a..99272e437c7cde3144b7dc5de94c9ee8a5e49c29 100644 (file)
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -137,6 +137,7 @@ static ERR_STRING_DATA ERR_str_libraries[]=
 {ERR_PACK(ERR_LIB_SYS,0,0)             ,"system library"},
 {ERR_PACK(ERR_LIB_BN,0,0)              ,"bignum routines"},
 {ERR_PACK(ERR_LIB_RSA,0,0)             ,"rsa routines"},
+{ERR_PACK(ERR_LIB_DSA,0,0)             ,"dsa routines"},
 {ERR_PACK(ERR_LIB_DH,0,0)              ,"Diffie-Hellman routines"},
 {ERR_PACK(ERR_LIB_EVP,0,0)             ,"digital envelope routines"},
 {ERR_PACK(ERR_LIB_BUF,0,0)             ,"memory buffer routines"},
@@ -156,6 +157,7 @@ static ERR_STRING_DATA ERR_str_libraries[]=
 {ERR_PACK(ERR_LIB_PKCS12,0,0)          ,"PKCS12 routines"},
 {ERR_PACK(ERR_LIB_RAND,0,0)            ,"random number generator"},
 {ERR_PACK(ERR_LIB_DSO,0,0)             ,"DSO support routines"},
+{ERR_PACK(ERR_LIB_ENGINE,0,0)          ,"engine routines"},
 {0,NULL},
        };
 
@@ -207,6 +209,7 @@ static ERR_STRING_DATA ERR_str_reasons[]=
 {ERR_R_ASN1_LENGTH_MISMATCH            ,"asn1 length mismatch"},
 {ERR_R_MISSING_ASN1_EOS                        ,"missing asn1 eos"},
 {ERR_R_DSO_LIB                         ,"DSO lib"},
+{ERR_R_ENGINE_LIB                      ,"ENGINE lib"},
 
 {0,NULL},
        };
@@ -227,7 +230,7 @@ static ERR_STRING_DATA SYS_str_reasons[NUM_SYS_STR_REASONS + 1];
 
 static void build_SYS_str_reasons()
        {
-       /* Malloc cannot be used here, use static storage instead */
+       /* OPENSSL_malloc cannot be used here, use static storage instead */
        static char strerror_tab[NUM_SYS_STR_REASONS][LEN_SYS_STR_REASON];
        int i;
 
@@ -264,7 +267,7 @@ static void build_SYS_str_reasons()
        if (((p)->err_data[i] != NULL) && \
                (p)->err_data_flags[i] & ERR_TXT_MALLOCED) \
                {  \
-               Free((p)->err_data[i]); \
+               OPENSSL_free((p)->err_data[i]); \
                (p)->err_data[i]=NULL; \
                } \
        (p)->err_data_flags[i]=0;
@@ -280,7 +283,7 @@ static void ERR_STATE_free(ERR_STATE *s)
                {
                err_clear_data(s,i);
                }
-       Free(s);
+       OPENSSL_free(s);
        }
 
 void ERR_load_ERR_strings(void)
@@ -534,7 +537,7 @@ char *ERR_error_string(unsigned long e, char *ret)
        static char buf[256];
 
        if (ret == NULL) ret=buf;
-       ERR_error_string_n(e, buf, 256);
+       ERR_error_string_n(e, ret, 256);
 
        return(ret);
        }
@@ -557,7 +560,7 @@ const char *ERR_lib_error_string(unsigned long e)
 
        l=ERR_GET_LIB(e);
 
-       CRYPTO_r_lock(CRYPTO_LOCK_ERR_HASH);
+       CRYPTO_w_lock(CRYPTO_LOCK_ERR_HASH);
 
        if (error_hash != NULL)
                {
@@ -565,7 +568,7 @@ const char *ERR_lib_error_string(unsigned long e)
                p=(ERR_STRING_DATA *)lh_retrieve(error_hash,&d);
                }
 
-       CRYPTO_r_unlock(CRYPTO_LOCK_ERR_HASH);
+       CRYPTO_w_unlock(CRYPTO_LOCK_ERR_HASH);
 
        return((p == NULL)?NULL:p->string);
        }
@@ -578,7 +581,7 @@ const char *ERR_func_error_string(unsigned long e)
        l=ERR_GET_LIB(e);
        f=ERR_GET_FUNC(e);
 
-       CRYPTO_r_lock(CRYPTO_LOCK_ERR_HASH);
+       CRYPTO_w_lock(CRYPTO_LOCK_ERR_HASH);
 
        if (error_hash != NULL)
                {
@@ -586,7 +589,7 @@ const char *ERR_func_error_string(unsigned long e)
                p=(ERR_STRING_DATA *)lh_retrieve(error_hash,&d);
                }
 
-       CRYPTO_r_unlock(CRYPTO_LOCK_ERR_HASH);
+       CRYPTO_w_unlock(CRYPTO_LOCK_ERR_HASH);
 
        return((p == NULL)?NULL:p->string);
        }
@@ -599,7 +602,7 @@ const char *ERR_reason_error_string(unsigned long e)
        l=ERR_GET_LIB(e);
        r=ERR_GET_REASON(e);
 
-       CRYPTO_r_lock(CRYPTO_LOCK_ERR_HASH);
+       CRYPTO_w_lock(CRYPTO_LOCK_ERR_HASH);
 
        if (error_hash != NULL)
                {
@@ -612,7 +615,7 @@ const char *ERR_reason_error_string(unsigned long e)
                        }
                }
 
-       CRYPTO_r_unlock(CRYPTO_LOCK_ERR_HASH);
+       CRYPTO_w_unlock(CRYPTO_LOCK_ERR_HASH);
 
        return((p == NULL)?NULL:p->string);
        }
@@ -643,7 +646,7 @@ static int pid_cmp(ERR_STATE *a, ERR_STATE *b)
 
 void ERR_remove_state(unsigned long pid)
        {
-       ERR_STATE *p,tmp;
+       ERR_STATE *p = NULL,tmp;
 
        if (thread_hash == NULL)
                return;
@@ -651,12 +654,15 @@ void ERR_remove_state(unsigned long pid)
                pid=(unsigned long)CRYPTO_thread_id();
        tmp.pid=pid;
        CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-       p=(ERR_STATE *)lh_delete(thread_hash,&tmp);
-       if (lh_num_items(thread_hash) == 0)
+       if (thread_hash)
                {
-               /* make sure we don't leak memory */
-               lh_free(thread_hash);
-               thread_hash = NULL;
+               p=(ERR_STATE *)lh_delete(thread_hash,&tmp);
+               if (lh_num_items(thread_hash) == 0)
+                       {
+                       /* make sure we don't leak memory */
+                       lh_free(thread_hash);
+                       thread_hash = NULL;
+                       }
                }
        CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
 
@@ -673,18 +679,18 @@ ERR_STATE *ERR_get_state(void)
 
        pid=(unsigned long)CRYPTO_thread_id();
 
-       CRYPTO_r_lock(CRYPTO_LOCK_ERR);
+       CRYPTO_w_lock(CRYPTO_LOCK_ERR);
        if (thread_hash != NULL)
                {
                tmp.pid=pid;
                ret=(ERR_STATE *)lh_retrieve(thread_hash,&tmp);
                }
-       CRYPTO_r_unlock(CRYPTO_LOCK_ERR);
+       CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
 
        /* ret == the error state, if NULL, make a new one */
        if (ret == NULL)
                {
-               ret=(ERR_STATE *)Malloc(sizeof(ERR_STATE));
+               ret=(ERR_STATE *)OPENSSL_malloc(sizeof(ERR_STATE));
                if (ret == NULL) return(&fallback);
                ret->pid=pid;
                ret->top=0;
@@ -754,7 +760,7 @@ void ERR_add_error_data(int num, ...)
        char *str,*p,*a;
 
        s=64;
-       str=Malloc(s+1);
+       str=OPENSSL_malloc(s+1);
        if (str == NULL) return;
        str[0]='\0';
 
@@ -770,10 +776,10 @@ void ERR_add_error_data(int num, ...)
                        if (n > s)
                                {
                                s=n+20;
-                               p=Realloc(str,s+1);
+                               p=OPENSSL_realloc(str,s+1);
                                if (p == NULL)
                                        {
-                                       Free(str);
+                                       OPENSSL_free(str);
                                        return;
                                        }
                                else