ERR library FIPS merge. Reorganise functions and add FIPS error
authorDr. Stephen Henson <steve@openssl.org>
Tue, 16 Sep 2008 11:26:29 +0000 (11:26 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Tue, 16 Sep 2008 11:26:29 +0000 (11:26 +0000)
definitions.

crypto/err/Makefile
crypto/err/err.c
crypto/err/err.h
crypto/err/err_all.c
crypto/err/err_bio.c [new file with mode: 0644]
crypto/err/err_def.c [new file with mode: 0644]
crypto/err/err_prn.c
crypto/err/err_str.c [new file with mode: 0644]
crypto/err/openssl.ec

index 23e38409c8af8ed174d24ee26378017b90b24ddb..fc680e2f6a055689b5c77cea771e19e55532094b 100644 (file)
@@ -17,8 +17,8 @@ TEST=
 APPS=
 
 LIB=$(TOP)/libcrypto.a
-LIBSRC=err.c err_all.c err_prn.c
-LIBOBJ=err.o err_all.o err_prn.o
+LIBSRC=err.c err_def.c err_all.c err_prn.c err_str.c err_bio.c
+LIBOBJ=err.o err_def.o err_all.o err_prn.o err_str.o err_bio.o
 
 SRC= $(LIBSRC)
 
index 7952e70ab0eda80ab2a424146802090cf3ff5771..292404a2fb998681283ff5775d113fff49df4929 100644 (file)
 #include <openssl/bio.h>
 #include <openssl/err.h>
 
-static void err_load_strings(int lib, ERR_STRING_DATA *str);
-
-static void ERR_STATE_free(ERR_STATE *s);
-#ifndef OPENSSL_NO_ERR
-static ERR_STRING_DATA ERR_str_libraries[]=
-       {
-{ERR_PACK(ERR_LIB_NONE,0,0)            ,"unknown library"},
-{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_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"},
-{ERR_PACK(ERR_LIB_OBJ,0,0)             ,"object identifier routines"},
-{ERR_PACK(ERR_LIB_PEM,0,0)             ,"PEM routines"},
-{ERR_PACK(ERR_LIB_DSA,0,0)             ,"dsa routines"},
-{ERR_PACK(ERR_LIB_X509,0,0)            ,"x509 certificate routines"},
-{ERR_PACK(ERR_LIB_ASN1,0,0)            ,"asn1 encoding routines"},
-{ERR_PACK(ERR_LIB_CONF,0,0)            ,"configuration file routines"},
-{ERR_PACK(ERR_LIB_CRYPTO,0,0)          ,"common libcrypto routines"},
-{ERR_PACK(ERR_LIB_EC,0,0)              ,"elliptic curve routines"},
-{ERR_PACK(ERR_LIB_SSL,0,0)             ,"SSL routines"},
-{ERR_PACK(ERR_LIB_BIO,0,0)             ,"BIO routines"},
-{ERR_PACK(ERR_LIB_PKCS7,0,0)           ,"PKCS7 routines"},
-{ERR_PACK(ERR_LIB_X509V3,0,0)          ,"X509 V3 routines"},
-{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"},
-{ERR_PACK(ERR_LIB_OCSP,0,0)            ,"OCSP routines"},
-{ERR_PACK(ERR_LIB_FIPS,0,0)            ,"FIPS routines"},
-{ERR_PACK(ERR_LIB_CMS,0,0)             ,"CMS routines"},
-{0,NULL},
-       };
-
-static ERR_STRING_DATA ERR_str_functs[]=
-       {
-       {ERR_PACK(0,SYS_F_FOPEN,0),             "fopen"},
-       {ERR_PACK(0,SYS_F_CONNECT,0),           "connect"},
-       {ERR_PACK(0,SYS_F_GETSERVBYNAME,0),     "getservbyname"},
-       {ERR_PACK(0,SYS_F_SOCKET,0),            "socket"}, 
-       {ERR_PACK(0,SYS_F_IOCTLSOCKET,0),       "ioctlsocket"},
-       {ERR_PACK(0,SYS_F_BIND,0),              "bind"},
-       {ERR_PACK(0,SYS_F_LISTEN,0),            "listen"},
-       {ERR_PACK(0,SYS_F_ACCEPT,0),            "accept"},
-#ifdef OPENSSL_SYS_WINDOWS
-       {ERR_PACK(0,SYS_F_WSASTARTUP,0),        "WSAstartup"},
-#endif
-       {ERR_PACK(0,SYS_F_OPENDIR,0),           "opendir"},
-       {ERR_PACK(0,SYS_F_FREAD,0),             "fread"},
-       {0,NULL},
-       };
-
-static ERR_STRING_DATA ERR_str_reasons[]=
-       {
-{ERR_R_SYS_LIB                         ,"system lib"},
-{ERR_R_BN_LIB                          ,"BN lib"},
-{ERR_R_RSA_LIB                         ,"RSA lib"},
-{ERR_R_DH_LIB                          ,"DH lib"},
-{ERR_R_EVP_LIB                         ,"EVP lib"},
-{ERR_R_BUF_LIB                         ,"BUF lib"},
-{ERR_R_OBJ_LIB                         ,"OBJ lib"},
-{ERR_R_PEM_LIB                         ,"PEM lib"},
-{ERR_R_DSA_LIB                         ,"DSA lib"},
-{ERR_R_X509_LIB                                ,"X509 lib"},
-{ERR_R_ASN1_LIB                                ,"ASN1 lib"},
-{ERR_R_CONF_LIB                                ,"CONF lib"},
-{ERR_R_CRYPTO_LIB                      ,"CRYPTO lib"},
-{ERR_R_EC_LIB                          ,"EC lib"},
-{ERR_R_SSL_LIB                         ,"SSL lib"},
-{ERR_R_BIO_LIB                         ,"BIO lib"},
-{ERR_R_PKCS7_LIB                       ,"PKCS7 lib"},
-{ERR_R_X509V3_LIB                      ,"X509V3 lib"},
-{ERR_R_PKCS12_LIB                      ,"PKCS12 lib"},
-{ERR_R_RAND_LIB                                ,"RAND lib"},
-{ERR_R_DSO_LIB                         ,"DSO lib"},
-{ERR_R_ENGINE_LIB                      ,"ENGINE lib"},
-{ERR_R_OCSP_LIB                                ,"OCSP lib"},
-
-{ERR_R_NESTED_ASN1_ERROR               ,"nested asn1 error"},
-{ERR_R_BAD_ASN1_OBJECT_HEADER          ,"bad asn1 object header"},
-{ERR_R_BAD_GET_ASN1_OBJECT_CALL                ,"bad get asn1 object call"},
-{ERR_R_EXPECTING_AN_ASN1_SEQUENCE      ,"expecting an asn1 sequence"},
-{ERR_R_ASN1_LENGTH_MISMATCH            ,"asn1 length mismatch"},
-{ERR_R_MISSING_ASN1_EOS                        ,"missing asn1 eos"},
-
-{ERR_R_FATAL                            ,"fatal"},
-{ERR_R_MALLOC_FAILURE                  ,"malloc failure"},
-{ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED     ,"called a function you should not call"},
-{ERR_R_PASSED_NULL_PARAMETER           ,"passed a null parameter"},
-{ERR_R_INTERNAL_ERROR                  ,"internal error"},
-{ERR_R_DISABLED                                ,"called a function that was disabled at compile-time"},
-
-{0,NULL},
-       };
-#endif
-
-
-/* Define the predeclared (but externally opaque) "ERR_FNS" type */
-struct st_ERR_FNS
-       {
-       /* Works on the "error_hash" string table */
-       LHASH *(*cb_err_get)(int create);
-       void (*cb_err_del)(void);
-       ERR_STRING_DATA *(*cb_err_get_item)(const ERR_STRING_DATA *);
-       ERR_STRING_DATA *(*cb_err_set_item)(ERR_STRING_DATA *);
-       ERR_STRING_DATA *(*cb_err_del_item)(ERR_STRING_DATA *);
-       /* Works on the "thread_hash" error-state table */
-       LHASH *(*cb_thread_get)(int create);
-       void (*cb_thread_release)(LHASH **hash);
-       ERR_STATE *(*cb_thread_get_item)(const ERR_STATE *);
-       ERR_STATE *(*cb_thread_set_item)(ERR_STATE *);
-       void (*cb_thread_del_item)(const ERR_STATE *);
-       /* Returns the next available error "library" numbers */
-       int (*cb_get_next_lib)(void);
-       };
-
-/* Predeclarations of the "err_defaults" functions */
-static LHASH *int_err_get(int create);
-static void int_err_del(void);
-static ERR_STRING_DATA *int_err_get_item(const ERR_STRING_DATA *);
-static ERR_STRING_DATA *int_err_set_item(ERR_STRING_DATA *);
-static ERR_STRING_DATA *int_err_del_item(ERR_STRING_DATA *);
-static LHASH *int_thread_get(int create);
-static void int_thread_release(LHASH **hash);
-static ERR_STATE *int_thread_get_item(const ERR_STATE *);
-static ERR_STATE *int_thread_set_item(ERR_STATE *);
-static void int_thread_del_item(const ERR_STATE *);
-static int int_err_get_next_lib(void);
-/* The static ERR_FNS table using these defaults functions */
-static const ERR_FNS err_defaults =
-       {
-       int_err_get,
-       int_err_del,
-       int_err_get_item,
-       int_err_set_item,
-       int_err_del_item,
-       int_thread_get,
-       int_thread_release,
-       int_thread_get_item,
-       int_thread_set_item,
-       int_thread_del_item,
-       int_err_get_next_lib
-       };
-
-/* The replacable table of ERR_FNS functions we use at run-time */
-static const ERR_FNS *err_fns = NULL;
-
-/* Eg. rather than using "err_get()", use "ERRFN(err_get)()". */
-#define ERRFN(a) err_fns->cb_##a
-
-/* The internal state used by "err_defaults" - as such, the setting, reading,
- * creating, and deleting of this data should only be permitted via the
- * "err_defaults" functions. This way, a linked module can completely defer all
- * ERR state operation (together with requisite locking) to the implementations
- * and state in the loading application. */
-static LHASH *int_error_hash = NULL;
-static LHASH *int_thread_hash = NULL;
-static int int_thread_hash_references = 0;
-static int int_err_library_number= ERR_LIB_USER;
-
-/* Internal function that checks whether "err_fns" is set and if not, sets it to
- * the defaults. */
-static void err_fns_check(void)
-       {
-       if (err_fns) return;
-       
-       CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-       if (!err_fns)
-               err_fns = &err_defaults;
-       CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-       }
-
-/* API functions to get or set the underlying ERR functions. */
-
-const ERR_FNS *ERR_get_implementation(void)
-       {
-       err_fns_check();
-       return err_fns;
-       }
-
-int ERR_set_implementation(const ERR_FNS *fns)
-       {
-       int ret = 0;
-
-       CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-       /* It's too late if 'err_fns' is non-NULL. BTW: not much point setting
-        * an error is there?! */
-       if (!err_fns)
-               {
-               err_fns = fns;
-               ret = 1;
-               }
-       CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-       return ret;
-       }
-
-/* These are the callbacks provided to "lh_new()" when creating the LHASH tables
- * internal to the "err_defaults" implementation. */
-
-/* static unsigned long err_hash(ERR_STRING_DATA *a); */
-static unsigned long err_hash(const void *a_void);
-/* static int err_cmp(ERR_STRING_DATA *a, ERR_STRING_DATA *b); */
-static int err_cmp(const void *a_void, const void *b_void);
-/* static unsigned long pid_hash(ERR_STATE *pid); */
-static unsigned long pid_hash(const void *pid_void);
-/* static int pid_cmp(ERR_STATE *a,ERR_STATE *pid); */
-static int pid_cmp(const void *a_void,const void *pid_void);
-static unsigned long get_error_values(int inc,int top,const char **file,int *line,
-                                     const char **data,int *flags);
-
-/* The internal functions used in the "err_defaults" implementation */
-
-static LHASH *int_err_get(int create)
-       {
-       LHASH *ret = NULL;
-
-       CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-       if (!int_error_hash && create)
-               {
-               CRYPTO_push_info("int_err_get (err.c)");
-               int_error_hash = lh_new(err_hash, err_cmp);
-               CRYPTO_pop_info();
-               }
-       if (int_error_hash)
-               ret = int_error_hash;
-       CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-
-       return ret;
-       }
-
-static void int_err_del(void)
-       {
-       CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-       if (int_error_hash)
-               {
-               lh_free(int_error_hash);
-               int_error_hash = NULL;
-               }
-       CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-       }
-
-static ERR_STRING_DATA *int_err_get_item(const ERR_STRING_DATA *d)
-       {
-       ERR_STRING_DATA *p;
-       LHASH *hash;
-
-       err_fns_check();
-       hash = ERRFN(err_get)(0);
-       if (!hash)
-               return NULL;
-
-       CRYPTO_r_lock(CRYPTO_LOCK_ERR);
-       p = (ERR_STRING_DATA *)lh_retrieve(hash, d);
-       CRYPTO_r_unlock(CRYPTO_LOCK_ERR);
-
-       return p;
-       }
-
-static ERR_STRING_DATA *int_err_set_item(ERR_STRING_DATA *d)
-       {
-       ERR_STRING_DATA *p;
-       LHASH *hash;
-
-       err_fns_check();
-       hash = ERRFN(err_get)(1);
-       if (!hash)
-               return NULL;
-
-       CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-       p = (ERR_STRING_DATA *)lh_insert(hash, d);
-       CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-
-       return p;
-       }
-
-static ERR_STRING_DATA *int_err_del_item(ERR_STRING_DATA *d)
-       {
-       ERR_STRING_DATA *p;
-       LHASH *hash;
-
-       err_fns_check();
-       hash = ERRFN(err_get)(0);
-       if (!hash)
-               return NULL;
-
-       CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-       p = (ERR_STRING_DATA *)lh_delete(hash, d);
-       CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-
-       return p;
-       }
-
-static LHASH *int_thread_get(int create)
-       {
-       LHASH *ret = NULL;
-
-       CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-       if (!int_thread_hash && create)
-               {
-               CRYPTO_push_info("int_thread_get (err.c)");
-               int_thread_hash = lh_new(pid_hash, pid_cmp);
-               CRYPTO_pop_info();
-               }
-       if (int_thread_hash)
-               {
-               int_thread_hash_references++;
-               ret = int_thread_hash;
-               }
-       CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-       return ret;
-       }
-
-static void int_thread_release(LHASH **hash)
-       {
-       int i;
-
-       if (hash == NULL || *hash == NULL)
-               return;
-
-       i = CRYPTO_add(&int_thread_hash_references, -1, CRYPTO_LOCK_ERR);
-
-#ifdef REF_PRINT
-       fprintf(stderr,"%4d:%s\n",int_thread_hash_references,"ERR");
-#endif
-       if (i > 0) return;
-#ifdef REF_CHECK
-       if (i < 0)
-               {
-               fprintf(stderr,"int_thread_release, bad reference count\n");
-               abort(); /* ok */
-               }
-#endif
-       *hash = NULL;
-       }
-
-static ERR_STATE *int_thread_get_item(const ERR_STATE *d)
-       {
-       ERR_STATE *p;
-       LHASH *hash;
-
-       err_fns_check();
-       hash = ERRFN(thread_get)(0);
-       if (!hash)
-               return NULL;
-
-       CRYPTO_r_lock(CRYPTO_LOCK_ERR);
-       p = (ERR_STATE *)lh_retrieve(hash, d);
-       CRYPTO_r_unlock(CRYPTO_LOCK_ERR);
-
-       ERRFN(thread_release)(&hash);
-       return p;
-       }
-
-static ERR_STATE *int_thread_set_item(ERR_STATE *d)
-       {
-       ERR_STATE *p;
-       LHASH *hash;
-
-       err_fns_check();
-       hash = ERRFN(thread_get)(1);
-       if (!hash)
-               return NULL;
-
-       CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-       p = (ERR_STATE *)lh_insert(hash, d);
-       CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-
-       ERRFN(thread_release)(&hash);
-       return p;
-       }
-
-static void int_thread_del_item(const ERR_STATE *d)
-       {
-       ERR_STATE *p;
-       LHASH *hash;
-
-       err_fns_check();
-       hash = ERRFN(thread_get)(0);
-       if (!hash)
-               return;
-
-       CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-       p = (ERR_STATE *)lh_delete(hash, d);
-       /* make sure we don't leak memory */
-       if (int_thread_hash_references == 1
-               && int_thread_hash && (lh_num_items(int_thread_hash) == 0))
-               {
-               lh_free(int_thread_hash);
-               int_thread_hash = NULL;
-               }
-       CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-
-       ERRFN(thread_release)(&hash);
-       if (p)
-               ERR_STATE_free(p);
-       }
-
-static int int_err_get_next_lib(void)
-       {
-       int ret;
-
-       CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-       ret = int_err_library_number++;
-       CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-
-       return ret;
-       }
-
-
-#ifndef OPENSSL_NO_ERR
-#define NUM_SYS_STR_REASONS 127
-#define LEN_SYS_STR_REASON 32
-
-static ERR_STRING_DATA SYS_str_reasons[NUM_SYS_STR_REASONS + 1];
-/* SYS_str_reasons is filled with copies of strerror() results at
- * initialization.
- * 'errno' values up to 127 should cover all usual errors,
- * others will be displayed numerically by ERR_error_string.
- * It is crucial that we have something for each reason code
- * that occurs in ERR_str_reasons, or bogus reason strings
- * will be returned for SYSerr(), which always gets an errno
- * value and never one of those 'standard' reason codes. */
-
-static void build_SYS_str_reasons(void)
-       {
-       /* OPENSSL_malloc cannot be used here, use static storage instead */
-       static char strerror_tab[NUM_SYS_STR_REASONS][LEN_SYS_STR_REASON];
-       int i;
-       static int init = 1;
-
-       CRYPTO_r_lock(CRYPTO_LOCK_ERR);
-       if (!init)
-               {
-               CRYPTO_r_unlock(CRYPTO_LOCK_ERR);
-               return;
-               }
-       
-       CRYPTO_r_unlock(CRYPTO_LOCK_ERR);
-       CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-       if (!init)
-               {
-               CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-               return;
-               }
-
-       for (i = 1; i <= NUM_SYS_STR_REASONS; i++)
-               {
-               ERR_STRING_DATA *str = &SYS_str_reasons[i - 1];
-
-               str->error = (unsigned long)i;
-               if (str->string == NULL)
-                       {
-                       char (*dest)[LEN_SYS_STR_REASON] = &(strerror_tab[i - 1]);
-                       char *src = strerror(i);
-                       if (src != NULL)
-                               {
-                               strncpy(*dest, src, sizeof *dest);
-                               (*dest)[sizeof *dest - 1] = '\0';
-                               str->string = *dest;
-                               }
-                       }
-               if (str->string == NULL)
-                       str->string = "unknown";
-               }
-
-       /* Now we still have SYS_str_reasons[NUM_SYS_STR_REASONS] = {0, NULL},
-        * as required by ERR_load_strings. */
-
-       init = 0;
-       
-       CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-       }
-#endif
+static unsigned long get_error_values(int inc,int top,
+                                       const char **file,int *line,
+                                       const char **data,int *flags);
 
 #define err_clear_data(p,i) \
        do { \
@@ -614,68 +143,6 @@ static void build_SYS_str_reasons(void)
        (p)->err_line[i]= -1; \
        } while(0)
 
-static void ERR_STATE_free(ERR_STATE *s)
-       {
-       int i;
-
-       if (s == NULL)
-           return;
-
-       for (i=0; i<ERR_NUM_ERRORS; i++)
-               {
-               err_clear_data(s,i);
-               }
-       OPENSSL_free(s);
-       }
-
-void ERR_load_ERR_strings(void)
-       {
-       err_fns_check();
-#ifndef OPENSSL_NO_ERR
-       err_load_strings(0,ERR_str_libraries);
-       err_load_strings(0,ERR_str_reasons);
-       err_load_strings(ERR_LIB_SYS,ERR_str_functs);
-       build_SYS_str_reasons();
-       err_load_strings(ERR_LIB_SYS,SYS_str_reasons);
-#endif
-       }
-
-static void err_load_strings(int lib, ERR_STRING_DATA *str)
-       {
-       while (str->error)
-               {
-               if (lib)
-                       str->error|=ERR_PACK(lib,0,0);
-               ERRFN(err_set_item)(str);
-               str++;
-               }
-       }
-
-void ERR_load_strings(int lib, ERR_STRING_DATA *str)
-       {
-       ERR_load_ERR_strings();
-       err_load_strings(lib, str);
-       }
-
-void ERR_unload_strings(int lib, ERR_STRING_DATA *str)
-       {
-       while (str->error)
-               {
-               if (lib)
-                       str->error|=ERR_PACK(lib,0,0);
-               ERRFN(err_del_item)(str);
-               str++;
-               }
-       }
-
-void ERR_free_strings(void)
-       {
-       err_fns_check();
-       ERRFN(err_del)();
-       }
-
-/********************************************************/
-
 void ERR_put_error(int lib, int func, int reason, const char *file,
             int line)
        {
@@ -830,218 +297,6 @@ static unsigned long get_error_values(int inc, int top, const char **file, int *
        return ret;
        }
 
-void ERR_error_string_n(unsigned long e, char *buf, size_t len)
-       {
-       char lsbuf[64], fsbuf[64], rsbuf[64];
-       const char *ls,*fs,*rs;
-       unsigned long l,f,r;
-
-       l=ERR_GET_LIB(e);
-       f=ERR_GET_FUNC(e);
-       r=ERR_GET_REASON(e);
-
-       ls=ERR_lib_error_string(e);
-       fs=ERR_func_error_string(e);
-       rs=ERR_reason_error_string(e);
-
-       if (ls == NULL) 
-               BIO_snprintf(lsbuf, sizeof(lsbuf), "lib(%lu)", l);
-       if (fs == NULL)
-               BIO_snprintf(fsbuf, sizeof(fsbuf), "func(%lu)", f);
-       if (rs == NULL)
-               BIO_snprintf(rsbuf, sizeof(rsbuf), "reason(%lu)", r);
-
-       BIO_snprintf(buf, len,"error:%08lX:%s:%s:%s", e, ls?ls:lsbuf, 
-               fs?fs:fsbuf, rs?rs:rsbuf);
-       if (strlen(buf) == len-1)
-               {
-               /* output may be truncated; make sure we always have 5 
-                * colon-separated fields, i.e. 4 colons ... */
-#define NUM_COLONS 4
-               if (len > NUM_COLONS) /* ... if possible */
-                       {
-                       int i;
-                       char *s = buf;
-                       
-                       for (i = 0; i < NUM_COLONS; i++)
-                               {
-                               char *colon = strchr(s, ':');
-                               if (colon == NULL || colon > &buf[len-1] - NUM_COLONS + i)
-                                       {
-                                       /* set colon no. i at last possible position
-                                        * (buf[len-1] is the terminating 0)*/
-                                       colon = &buf[len-1] - NUM_COLONS + i;
-                                       *colon = ':';
-                                       }
-                               s = colon + 1;
-                               }
-                       }
-               }
-       }
-
-/* BAD for multi-threading: uses a local buffer if ret == NULL */
-/* ERR_error_string_n should be used instead for ret != NULL
- * as ERR_error_string cannot know how large the buffer is */
-char *ERR_error_string(unsigned long e, char *ret)
-       {
-       static char buf[256];
-
-       if (ret == NULL) ret=buf;
-       ERR_error_string_n(e, ret, 256);
-
-       return ret;
-       }
-
-LHASH *ERR_get_string_table(void)
-       {
-       err_fns_check();
-       return ERRFN(err_get)(0);
-       }
-
-LHASH *ERR_get_err_state_table(void)
-       {
-       err_fns_check();
-       return ERRFN(thread_get)(0);
-       }
-
-void ERR_release_err_state_table(LHASH **hash)
-       {
-       err_fns_check();
-       ERRFN(thread_release)(hash);
-       }
-
-const char *ERR_lib_error_string(unsigned long e)
-       {
-       ERR_STRING_DATA d,*p;
-       unsigned long l;
-
-       err_fns_check();
-       l=ERR_GET_LIB(e);
-       d.error=ERR_PACK(l,0,0);
-       p=ERRFN(err_get_item)(&d);
-       return((p == NULL)?NULL:p->string);
-       }
-
-const char *ERR_func_error_string(unsigned long e)
-       {
-       ERR_STRING_DATA d,*p;
-       unsigned long l,f;
-
-       err_fns_check();
-       l=ERR_GET_LIB(e);
-       f=ERR_GET_FUNC(e);
-       d.error=ERR_PACK(l,f,0);
-       p=ERRFN(err_get_item)(&d);
-       return((p == NULL)?NULL:p->string);
-       }
-
-const char *ERR_reason_error_string(unsigned long e)
-       {
-       ERR_STRING_DATA d,*p=NULL;
-       unsigned long l,r;
-
-       err_fns_check();
-       l=ERR_GET_LIB(e);
-       r=ERR_GET_REASON(e);
-       d.error=ERR_PACK(l,0,r);
-       p=ERRFN(err_get_item)(&d);
-       if (!p)
-               {
-               d.error=ERR_PACK(0,0,r);
-               p=ERRFN(err_get_item)(&d);
-               }
-       return((p == NULL)?NULL:p->string);
-       }
-
-/* static unsigned long err_hash(ERR_STRING_DATA *a) */
-static unsigned long err_hash(const void *a_void)
-       {
-       unsigned long ret,l;
-
-       l=((const ERR_STRING_DATA *)a_void)->error;
-       ret=l^ERR_GET_LIB(l)^ERR_GET_FUNC(l);
-       return(ret^ret%19*13);
-       }
-
-/* static int err_cmp(ERR_STRING_DATA *a, ERR_STRING_DATA *b) */
-static int err_cmp(const void *a_void, const void *b_void)
-       {
-       return((int)(((const ERR_STRING_DATA *)a_void)->error -
-                       ((const ERR_STRING_DATA *)b_void)->error));
-       }
-
-/* static unsigned long pid_hash(ERR_STATE *a) */
-static unsigned long pid_hash(const void *a_void)
-       {
-       return(((const ERR_STATE *)a_void)->pid*13);
-       }
-
-/* static int pid_cmp(ERR_STATE *a, ERR_STATE *b) */
-static int pid_cmp(const void *a_void, const void *b_void)
-       {
-       return((int)((long)((const ERR_STATE *)a_void)->pid -
-                       (long)((const ERR_STATE *)b_void)->pid));
-       }
-
-void ERR_remove_state(unsigned long pid)
-       {
-       ERR_STATE tmp;
-
-       err_fns_check();
-       if (pid == 0)
-               pid=(unsigned long)CRYPTO_thread_id();
-       tmp.pid=pid;
-       /* thread_del_item automatically destroys the LHASH if the number of
-        * items reaches zero. */
-       ERRFN(thread_del_item)(&tmp);
-       }
-
-ERR_STATE *ERR_get_state(void)
-       {
-       static ERR_STATE fallback;
-       ERR_STATE *ret,tmp,*tmpp=NULL;
-       int i;
-       unsigned long pid;
-
-       err_fns_check();
-       pid=(unsigned long)CRYPTO_thread_id();
-       tmp.pid=pid;
-       ret=ERRFN(thread_get_item)(&tmp);
-
-       /* ret == the error state, if NULL, make a new one */
-       if (ret == NULL)
-               {
-               ret=(ERR_STATE *)OPENSSL_malloc(sizeof(ERR_STATE));
-               if (ret == NULL) return(&fallback);
-               ret->pid=pid;
-               ret->top=0;
-               ret->bottom=0;
-               for (i=0; i<ERR_NUM_ERRORS; i++)
-                       {
-                       ret->err_data[i]=NULL;
-                       ret->err_data_flags[i]=0;
-                       }
-               tmpp = ERRFN(thread_set_item)(ret);
-               /* To check if insertion failed, do a get. */
-               if (ERRFN(thread_get_item)(ret) != ret)
-                       {
-                       ERR_STATE_free(ret); /* could not insert it */
-                       return(&fallback);
-                       }
-               /* If a race occured in this function and we came second, tmpp
-                * is the first one that we just replaced. */
-               if (tmpp)
-                       ERR_STATE_free(tmpp);
-               }
-       return ret;
-       }
-
-int ERR_get_next_error_library(void)
-       {
-       err_fns_check();
-       return ERRFN(get_next_lib)();
-       }
-
 void ERR_set_error_data(char *data, int flags)
        {
        ERR_STATE *es;
@@ -1128,3 +383,34 @@ int ERR_pop_to_mark(void)
        es->err_flags[es->top]&=~ERR_FLAG_MARK;
        return 1;
        }
+
+#ifdef OPENSSL_FIPS
+
+static ERR_STATE *fget_state(void)
+       {
+       static ERR_STATE fstate;
+       return &fstate;
+       }
+
+ERR_STATE *(*get_state_func)(void) = fget_state;
+void (*remove_state_func)(unsigned long pid);
+
+ERR_STATE *ERR_get_state(void)
+       {
+       return get_state_func();
+       }
+
+void int_ERR_set_state_func(ERR_STATE *(*get_func)(void),
+                               void (*remove_func)(unsigned long pid))
+       {
+       get_state_func = get_func;
+       remove_state_func = remove_func;
+       }
+
+void ERR_remove_state(unsigned long pid)
+       {
+       if (remove_state_func)
+               remove_state_func(pid);
+       }
+
+#endif
index 8d9f0da172e51f33bd54dedf73fe6a042038a555..287d535c17f81fc2f7def45cf2f0b40f8e5f4f54 100644 (file)
@@ -306,6 +306,12 @@ int ERR_get_next_error_library(void);
 int ERR_set_mark(void);
 int ERR_pop_to_mark(void);
 
+#ifdef OPENSSL_FIPS
+void int_ERR_set_state_func(ERR_STATE *(*get_func)(void),
+                               void (*remove_func)(unsigned long pid));
+void int_ERR_lib_init(void);
+#endif
+
 /* Already defined in ossl_typ.h */
 /* typedef struct st_ERR_FNS ERR_FNS; */
 /* An application can use this function and provide the return value to loaded
index 5813060ce2407ce3045339568525fd609491355f..ba87456eb64145a647777da0bafa0bd2e3c72543 100644 (file)
 #include <openssl/ui.h>
 #include <openssl/ocsp.h>
 #include <openssl/err.h>
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif
+
 #ifndef OPENSSL_NO_CMS
 #include <openssl/cms.h>
 #endif
@@ -141,6 +145,9 @@ void ERR_load_crypto_strings(void)
 #endif
        ERR_load_OCSP_strings();
        ERR_load_UI_strings();
+#ifdef OPENSSL_FIPS
+       ERR_load_FIPS_strings();
+#endif
 #ifndef OPENSSL_NO_CMS
        ERR_load_CMS_strings();
 #endif
diff --git a/crypto/err/err_bio.c b/crypto/err/err_bio.c
new file mode 100644 (file)
index 0000000..a42f804
--- /dev/null
@@ -0,0 +1,75 @@
+/* crypto/err/err_prn.c */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include <openssl/lhash.h>
+#include <openssl/crypto.h>
+#include <openssl/buffer.h>
+#include <openssl/err.h>
+
+static int print_bio(const char *str, size_t len, void *bp)
+       {
+       return BIO_write((BIO *)bp, str, len);
+       }
+void ERR_print_errors(BIO *bp)
+       {
+       ERR_print_errors_cb(print_bio, bp);
+       }
+
+       
diff --git a/crypto/err/err_def.c b/crypto/err/err_def.c
new file mode 100644 (file)
index 0000000..7ed3d84
--- /dev/null
@@ -0,0 +1,665 @@
+/* crypto/err/err_def.c */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+/* ====================================================================
+ * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <string.h>
+#include "cryptlib.h"
+#include <openssl/lhash.h>
+#include <openssl/crypto.h>
+#include <openssl/buffer.h>
+#include <openssl/bio.h>
+#include <openssl/err.h>
+
+#define err_clear_data(p,i) \
+       do { \
+       if (((p)->err_data[i] != NULL) && \
+               (p)->err_data_flags[i] & ERR_TXT_MALLOCED) \
+               {  \
+               OPENSSL_free((p)->err_data[i]); \
+               (p)->err_data[i]=NULL; \
+               } \
+       (p)->err_data_flags[i]=0; \
+       } while(0)
+
+#define err_clear(p,i) \
+       do { \
+       (p)->err_flags[i]=0; \
+       (p)->err_buffer[i]=0; \
+       err_clear_data(p,i); \
+       (p)->err_file[i]=NULL; \
+       (p)->err_line[i]= -1; \
+       } while(0)
+
+static void err_load_strings(int lib, ERR_STRING_DATA *str);
+
+static void ERR_STATE_free(ERR_STATE *s);
+
+/* Define the predeclared (but externally opaque) "ERR_FNS" type */
+struct st_ERR_FNS
+       {
+       /* Works on the "error_hash" string table */
+       LHASH *(*cb_err_get)(int create);
+       void (*cb_err_del)(void);
+       ERR_STRING_DATA *(*cb_err_get_item)(const ERR_STRING_DATA *);
+       ERR_STRING_DATA *(*cb_err_set_item)(ERR_STRING_DATA *);
+       ERR_STRING_DATA *(*cb_err_del_item)(ERR_STRING_DATA *);
+       /* Works on the "thread_hash" error-state table */
+       LHASH *(*cb_thread_get)(int create);
+       void (*cb_thread_release)(LHASH **hash);
+       ERR_STATE *(*cb_thread_get_item)(const ERR_STATE *);
+       ERR_STATE *(*cb_thread_set_item)(ERR_STATE *);
+       void (*cb_thread_del_item)(const ERR_STATE *);
+       /* Returns the next available error "library" numbers */
+       int (*cb_get_next_lib)(void);
+       };
+
+/* Predeclarations of the "err_defaults" functions */
+static LHASH *int_err_get(int create);
+static void int_err_del(void);
+static ERR_STRING_DATA *int_err_get_item(const ERR_STRING_DATA *);
+static ERR_STRING_DATA *int_err_set_item(ERR_STRING_DATA *);
+static ERR_STRING_DATA *int_err_del_item(ERR_STRING_DATA *);
+static LHASH *int_thread_get(int create);
+static void int_thread_release(LHASH **hash);
+static ERR_STATE *int_thread_get_item(const ERR_STATE *);
+static ERR_STATE *int_thread_set_item(ERR_STATE *);
+static void int_thread_del_item(const ERR_STATE *);
+static int int_err_get_next_lib(void);
+/* The static ERR_FNS table using these defaults functions */
+static const ERR_FNS err_defaults =
+       {
+       int_err_get,
+       int_err_del,
+       int_err_get_item,
+       int_err_set_item,
+       int_err_del_item,
+       int_thread_get,
+       int_thread_release,
+       int_thread_get_item,
+       int_thread_set_item,
+       int_thread_del_item,
+       int_err_get_next_lib
+       };
+
+/* The replacable table of ERR_FNS functions we use at run-time */
+static const ERR_FNS *err_fns = NULL;
+
+/* Eg. rather than using "err_get()", use "ERRFN(err_get)()". */
+#define ERRFN(a) err_fns->cb_##a
+
+/* The internal state used by "err_defaults" - as such, the setting, reading,
+ * creating, and deleting of this data should only be permitted via the
+ * "err_defaults" functions. This way, a linked module can completely defer all
+ * ERR state operation (together with requisite locking) to the implementations
+ * and state in the loading application. */
+static LHASH *int_error_hash = NULL;
+static LHASH *int_thread_hash = NULL;
+static int int_thread_hash_references = 0;
+static int int_err_library_number= ERR_LIB_USER;
+
+/* Internal function that checks whether "err_fns" is set and if not, sets it to
+ * the defaults. */
+static void err_fns_check(void)
+       {
+       if (err_fns) return;
+       
+       CRYPTO_w_lock(CRYPTO_LOCK_ERR);
+       if (!err_fns)
+               err_fns = &err_defaults;
+       CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
+       }
+
+/* API functions to get or set the underlying ERR functions. */
+
+const ERR_FNS *ERR_get_implementation(void)
+       {
+       err_fns_check();
+       return err_fns;
+       }
+
+int ERR_set_implementation(const ERR_FNS *fns)
+       {
+       int ret = 0;
+
+       CRYPTO_w_lock(CRYPTO_LOCK_ERR);
+       /* It's too late if 'err_fns' is non-NULL. BTW: not much point setting
+        * an error is there?! */
+       if (!err_fns)
+               {
+               err_fns = fns;
+               ret = 1;
+               }
+       CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
+       return ret;
+       }
+
+/* These are the callbacks provided to "lh_new()" when creating the LHASH tables
+ * internal to the "err_defaults" implementation. */
+
+/* static unsigned long err_hash(ERR_STRING_DATA *a); */
+static unsigned long err_hash(const void *a_void);
+/* static int err_cmp(ERR_STRING_DATA *a, ERR_STRING_DATA *b); */
+static int err_cmp(const void *a_void, const void *b_void);
+/* static unsigned long pid_hash(ERR_STATE *pid); */
+static unsigned long pid_hash(const void *pid_void);
+/* static int pid_cmp(ERR_STATE *a,ERR_STATE *pid); */
+static int pid_cmp(const void *a_void,const void *pid_void);
+
+/* The internal functions used in the "err_defaults" implementation */
+
+static LHASH *int_err_get(int create)
+       {
+       LHASH *ret = NULL;
+
+       CRYPTO_w_lock(CRYPTO_LOCK_ERR);
+       if (!int_error_hash && create)
+               {
+               CRYPTO_push_info("int_err_get (err.c)");
+               int_error_hash = lh_new(err_hash, err_cmp);
+               CRYPTO_pop_info();
+               }
+       if (int_error_hash)
+               ret = int_error_hash;
+       CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
+
+       return ret;
+       }
+
+static void int_err_del(void)
+       {
+       CRYPTO_w_lock(CRYPTO_LOCK_ERR);
+       if (int_error_hash)
+               {
+               lh_free(int_error_hash);
+               int_error_hash = NULL;
+               }
+       CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
+       }
+
+static ERR_STRING_DATA *int_err_get_item(const ERR_STRING_DATA *d)
+       {
+       ERR_STRING_DATA *p;
+       LHASH *hash;
+
+       err_fns_check();
+       hash = ERRFN(err_get)(0);
+       if (!hash)
+               return NULL;
+
+       CRYPTO_r_lock(CRYPTO_LOCK_ERR);
+       p = (ERR_STRING_DATA *)lh_retrieve(hash, d);
+       CRYPTO_r_unlock(CRYPTO_LOCK_ERR);
+
+       return p;
+       }
+
+static ERR_STRING_DATA *int_err_set_item(ERR_STRING_DATA *d)
+       {
+       ERR_STRING_DATA *p;
+       LHASH *hash;
+
+       err_fns_check();
+       hash = ERRFN(err_get)(1);
+       if (!hash)
+               return NULL;
+
+       CRYPTO_w_lock(CRYPTO_LOCK_ERR);
+       p = (ERR_STRING_DATA *)lh_insert(hash, d);
+       CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
+
+       return p;
+       }
+
+static ERR_STRING_DATA *int_err_del_item(ERR_STRING_DATA *d)
+       {
+       ERR_STRING_DATA *p;
+       LHASH *hash;
+
+       err_fns_check();
+       hash = ERRFN(err_get)(0);
+       if (!hash)
+               return NULL;
+
+       CRYPTO_w_lock(CRYPTO_LOCK_ERR);
+       p = (ERR_STRING_DATA *)lh_delete(hash, d);
+       CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
+
+       return p;
+       }
+
+static LHASH *int_thread_get(int create)
+       {
+       LHASH *ret = NULL;
+
+       CRYPTO_w_lock(CRYPTO_LOCK_ERR);
+       if (!int_thread_hash && create)
+               {
+               CRYPTO_push_info("int_thread_get (err.c)");
+               int_thread_hash = lh_new(pid_hash, pid_cmp);
+               CRYPTO_pop_info();
+               }
+       if (int_thread_hash)
+               {
+               int_thread_hash_references++;
+               ret = int_thread_hash;
+               }
+       CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
+       return ret;
+       }
+
+static void int_thread_release(LHASH **hash)
+       {
+       int i;
+
+       if (hash == NULL || *hash == NULL)
+               return;
+
+       i = CRYPTO_add(&int_thread_hash_references, -1, CRYPTO_LOCK_ERR);
+
+#ifdef REF_PRINT
+       fprintf(stderr,"%4d:%s\n",int_thread_hash_references,"ERR");
+#endif
+       if (i > 0) return;
+#ifdef REF_CHECK
+       if (i < 0)
+               {
+               fprintf(stderr,"int_thread_release, bad reference count\n");
+               abort(); /* ok */
+               }
+#endif
+       *hash = NULL;
+       }
+
+static ERR_STATE *int_thread_get_item(const ERR_STATE *d)
+       {
+       ERR_STATE *p;
+       LHASH *hash;
+
+       err_fns_check();
+       hash = ERRFN(thread_get)(0);
+       if (!hash)
+               return NULL;
+
+       CRYPTO_r_lock(CRYPTO_LOCK_ERR);
+       p = (ERR_STATE *)lh_retrieve(hash, d);
+       CRYPTO_r_unlock(CRYPTO_LOCK_ERR);
+
+       ERRFN(thread_release)(&hash);
+       return p;
+       }
+
+static ERR_STATE *int_thread_set_item(ERR_STATE *d)
+       {
+       ERR_STATE *p;
+       LHASH *hash;
+
+       err_fns_check();
+       hash = ERRFN(thread_get)(1);
+       if (!hash)
+               return NULL;
+
+       CRYPTO_w_lock(CRYPTO_LOCK_ERR);
+       p = (ERR_STATE *)lh_insert(hash, d);
+       CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
+
+       ERRFN(thread_release)(&hash);
+       return p;
+       }
+
+static void int_thread_del_item(const ERR_STATE *d)
+       {
+       ERR_STATE *p;
+       LHASH *hash;
+
+       err_fns_check();
+       hash = ERRFN(thread_get)(0);
+       if (!hash)
+               return;
+
+       CRYPTO_w_lock(CRYPTO_LOCK_ERR);
+       p = (ERR_STATE *)lh_delete(hash, d);
+       /* make sure we don't leak memory */
+       if (int_thread_hash_references == 1
+               && int_thread_hash && (lh_num_items(int_thread_hash) == 0))
+               {
+               lh_free(int_thread_hash);
+               int_thread_hash = NULL;
+               }
+       CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
+
+       ERRFN(thread_release)(&hash);
+       if (p)
+               ERR_STATE_free(p);
+       }
+
+static int int_err_get_next_lib(void)
+       {
+       int ret;
+
+       CRYPTO_w_lock(CRYPTO_LOCK_ERR);
+       ret = int_err_library_number++;
+       CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
+
+       return ret;
+       }
+
+static void ERR_STATE_free(ERR_STATE *s)
+       {
+       int i;
+
+       if (s == NULL)
+           return;
+
+       for (i=0; i<ERR_NUM_ERRORS; i++)
+               {
+               err_clear_data(s,i);
+               }
+       OPENSSL_free(s);
+       }
+
+static void err_load_strings(int lib, ERR_STRING_DATA *str)
+       {
+       while (str->error)
+               {
+               if (lib)
+                       str->error|=ERR_PACK(lib,0,0);
+               ERRFN(err_set_item)(str);
+               str++;
+               }
+       }
+
+void ERR_load_strings(int lib, ERR_STRING_DATA *str)
+       {
+       err_fns_check();
+       err_load_strings(lib, str);
+       }
+
+void ERR_unload_strings(int lib, ERR_STRING_DATA *str)
+       {
+       while (str->error)
+               {
+               if (lib)
+                       str->error|=ERR_PACK(lib,0,0);
+               ERRFN(err_del_item)(str);
+               str++;
+               }
+       }
+
+void ERR_free_strings(void)
+       {
+       err_fns_check();
+       ERRFN(err_del)();
+       }
+
+LHASH *ERR_get_string_table(void)
+       {
+       err_fns_check();
+       return ERRFN(err_get)(0);
+       }
+
+LHASH *ERR_get_err_state_table(void)
+       {
+       err_fns_check();
+       return ERRFN(thread_get)(0);
+       }
+
+void ERR_release_err_state_table(LHASH **hash)
+       {
+       err_fns_check();
+       ERRFN(thread_release)(hash);
+       }
+
+const char *ERR_lib_error_string(unsigned long e)
+       {
+       ERR_STRING_DATA d,*p;
+       unsigned long l;
+
+       err_fns_check();
+       l=ERR_GET_LIB(e);
+       d.error=ERR_PACK(l,0,0);
+       p=ERRFN(err_get_item)(&d);
+       return((p == NULL)?NULL:p->string);
+       }
+
+const char *ERR_func_error_string(unsigned long e)
+       {
+       ERR_STRING_DATA d,*p;
+       unsigned long l,f;
+
+       err_fns_check();
+       l=ERR_GET_LIB(e);
+       f=ERR_GET_FUNC(e);
+       d.error=ERR_PACK(l,f,0);
+       p=ERRFN(err_get_item)(&d);
+       return((p == NULL)?NULL:p->string);
+       }
+
+const char *ERR_reason_error_string(unsigned long e)
+       {
+       ERR_STRING_DATA d,*p=NULL;
+       unsigned long l,r;
+
+       err_fns_check();
+       l=ERR_GET_LIB(e);
+       r=ERR_GET_REASON(e);
+       d.error=ERR_PACK(l,0,r);
+       p=ERRFN(err_get_item)(&d);
+       if (!p)
+               {
+               d.error=ERR_PACK(0,0,r);
+               p=ERRFN(err_get_item)(&d);
+               }
+       return((p == NULL)?NULL:p->string);
+       }
+
+/* static unsigned long err_hash(ERR_STRING_DATA *a) */
+static unsigned long err_hash(const void *a_void)
+       {
+       unsigned long ret,l;
+
+       l=((const ERR_STRING_DATA *)a_void)->error;
+       ret=l^ERR_GET_LIB(l)^ERR_GET_FUNC(l);
+       return(ret^ret%19*13);
+       }
+
+/* static int err_cmp(ERR_STRING_DATA *a, ERR_STRING_DATA *b) */
+static int err_cmp(const void *a_void, const void *b_void)
+       {
+       return((int)(((const ERR_STRING_DATA *)a_void)->error -
+                       ((const ERR_STRING_DATA *)b_void)->error));
+       }
+
+/* static unsigned long pid_hash(ERR_STATE *a) */
+static unsigned long pid_hash(const void *a_void)
+       {
+       return(((const ERR_STATE *)a_void)->pid*13);
+       }
+
+/* static int pid_cmp(ERR_STATE *a, ERR_STATE *b) */
+static int pid_cmp(const void *a_void, const void *b_void)
+       {
+       return((int)((long)((const ERR_STATE *)a_void)->pid -
+                       (long)((const ERR_STATE *)b_void)->pid));
+       }
+#ifdef OPENSSL_FIPS
+static void int_err_remove_state(unsigned long pid)
+#else
+void ERR_remove_state(unsigned long pid)
+#endif
+       {
+       ERR_STATE tmp;
+
+       err_fns_check();
+       if (pid == 0)
+               pid=(unsigned long)CRYPTO_thread_id();
+       tmp.pid=pid;
+       /* thread_del_item automatically destroys the LHASH if the number of
+        * items reaches zero. */
+       ERRFN(thread_del_item)(&tmp);
+       }
+
+#ifdef OPENSSL_FIPS
+       static ERR_STATE *int_err_get_state(void)
+#else
+ERR_STATE *ERR_get_state(void)
+#endif
+       {
+       static ERR_STATE fallback;
+       ERR_STATE *ret,tmp,*tmpp=NULL;
+       int i;
+       unsigned long pid;
+
+       err_fns_check();
+       pid=(unsigned long)CRYPTO_thread_id();
+       tmp.pid=pid;
+       ret=ERRFN(thread_get_item)(&tmp);
+
+       /* ret == the error state, if NULL, make a new one */
+       if (ret == NULL)
+               {
+               ret=(ERR_STATE *)OPENSSL_malloc(sizeof(ERR_STATE));
+               if (ret == NULL) return(&fallback);
+               ret->pid=pid;
+               ret->top=0;
+               ret->bottom=0;
+               for (i=0; i<ERR_NUM_ERRORS; i++)
+                       {
+                       ret->err_data[i]=NULL;
+                       ret->err_data_flags[i]=0;
+                       }
+               tmpp = ERRFN(thread_set_item)(ret);
+               /* To check if insertion failed, do a get. */
+               if (ERRFN(thread_get_item)(ret) != ret)
+                       {
+                       ERR_STATE_free(ret); /* could not insert it */
+                       return(&fallback);
+                       }
+               /* If a race occured in this function and we came second, tmpp
+                * is the first one that we just replaced. */
+               if (tmpp)
+                       ERR_STATE_free(tmpp);
+               }
+       return ret;
+       }
+
+#ifdef OPENSSL_FIPS
+void int_ERR_lib_init(void)
+       {
+       int_ERR_set_state_func(int_err_get_state, int_err_remove_state);
+       }
+#endif
+
+int ERR_get_next_error_library(void)
+       {
+       err_fns_check();
+       return ERRFN(get_next_lib)();
+       }
index 2224a901e5ea30a30e4332f2290c980faf20cc1b..4cdf342fa634c2dbbe1df484eb831181e53fafab 100644 (file)
@@ -86,12 +86,7 @@ void ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u),
 #ifndef OPENSSL_NO_FP_API
 static int print_fp(const char *str, size_t len, void *fp)
        {
-       BIO bio;
-
-       BIO_set(&bio,BIO_s_file());
-       BIO_set_fp(&bio,fp,BIO_NOCLOSE);
-
-       return BIO_printf(&bio, "%s", str);
+       return fwrite(str, 1, len, fp);
        }
 void ERR_print_errors_fp(FILE *fp)
        {
@@ -99,13 +94,64 @@ void ERR_print_errors_fp(FILE *fp)
        }
 #endif
 
-static int print_bio(const char *str, size_t len, void *bp)
+void ERR_error_string_n(unsigned long e, char *buf, size_t len)
        {
-       return BIO_write((BIO *)bp, str, len);
+       char lsbuf[64], fsbuf[64], rsbuf[64];
+       const char *ls,*fs,*rs;
+       unsigned long l,f,r;
+
+       l=ERR_GET_LIB(e);
+       f=ERR_GET_FUNC(e);
+       r=ERR_GET_REASON(e);
+
+       ls=ERR_lib_error_string(e);
+       fs=ERR_func_error_string(e);
+       rs=ERR_reason_error_string(e);
+
+       if (ls == NULL) 
+               BIO_snprintf(lsbuf, sizeof(lsbuf), "lib(%lu)", l);
+       if (fs == NULL)
+               BIO_snprintf(fsbuf, sizeof(fsbuf), "func(%lu)", f);
+       if (rs == NULL)
+               BIO_snprintf(rsbuf, sizeof(rsbuf), "reason(%lu)", r);
+
+       BIO_snprintf(buf, len,"error:%08lX:%s:%s:%s", e, ls?ls:lsbuf, 
+               fs?fs:fsbuf, rs?rs:rsbuf);
+       if (strlen(buf) == len-1)
+               {
+               /* output may be truncated; make sure we always have 5 
+                * colon-separated fields, i.e. 4 colons ... */
+#define NUM_COLONS 4
+               if (len > NUM_COLONS) /* ... if possible */
+                       {
+                       int i;
+                       char *s = buf;
+                       
+                       for (i = 0; i < NUM_COLONS; i++)
+                               {
+                               char *colon = strchr(s, ':');
+                               if (colon == NULL || colon > &buf[len-1] - NUM_COLONS + i)
+                                       {
+                                       /* set colon no. i at last possible position
+                                        * (buf[len-1] is the terminating 0)*/
+                                       colon = &buf[len-1] - NUM_COLONS + i;
+                                       *colon = ':';
+                                       }
+                               s = colon + 1;
+                               }
+                       }
+               }
        }
-void ERR_print_errors(BIO *bp)
+
+/* BAD for multi-threading: uses a local buffer if ret == NULL */
+/* ERR_error_string_n should be used instead for ret != NULL
+ * as ERR_error_string cannot know how large the buffer is */
+char *ERR_error_string(unsigned long e, char *ret)
        {
-       ERR_print_errors_cb(print_bio, bp);
-       }
+       static char buf[256];
+
+       if (ret == NULL) ret=buf;
+       ERR_error_string_n(e, ret, 256);
 
-       
+       return ret;
+       }
diff --git a/crypto/err/err_str.c b/crypto/err/err_str.c
new file mode 100644 (file)
index 0000000..11aa7b7
--- /dev/null
@@ -0,0 +1,294 @@
+/* crypto/err/err_str.c */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+/* ====================================================================
+ * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <string.h>
+#include "cryptlib.h"
+#include <openssl/lhash.h>
+#include <openssl/crypto.h>
+#include <openssl/buffer.h>
+#include <openssl/bio.h>
+#include <openssl/err.h>
+
+#ifndef OPENSSL_NO_ERR
+static ERR_STRING_DATA ERR_str_libraries[]=
+       {
+{ERR_PACK(ERR_LIB_NONE,0,0)            ,"unknown library"},
+{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_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"},
+{ERR_PACK(ERR_LIB_OBJ,0,0)             ,"object identifier routines"},
+{ERR_PACK(ERR_LIB_PEM,0,0)             ,"PEM routines"},
+{ERR_PACK(ERR_LIB_DSA,0,0)             ,"dsa routines"},
+{ERR_PACK(ERR_LIB_X509,0,0)            ,"x509 certificate routines"},
+{ERR_PACK(ERR_LIB_ASN1,0,0)            ,"asn1 encoding routines"},
+{ERR_PACK(ERR_LIB_CONF,0,0)            ,"configuration file routines"},
+{ERR_PACK(ERR_LIB_CRYPTO,0,0)          ,"common libcrypto routines"},
+{ERR_PACK(ERR_LIB_EC,0,0)              ,"elliptic curve routines"},
+{ERR_PACK(ERR_LIB_SSL,0,0)             ,"SSL routines"},
+{ERR_PACK(ERR_LIB_BIO,0,0)             ,"BIO routines"},
+{ERR_PACK(ERR_LIB_PKCS7,0,0)           ,"PKCS7 routines"},
+{ERR_PACK(ERR_LIB_X509V3,0,0)          ,"X509 V3 routines"},
+{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"},
+{ERR_PACK(ERR_LIB_OCSP,0,0)            ,"OCSP routines"},
+{ERR_PACK(ERR_LIB_FIPS,0,0)            ,"FIPS routines"},
+{ERR_PACK(ERR_LIB_CMS,0,0)             ,"CMS routines"},
+{0,NULL},
+       };
+
+static ERR_STRING_DATA ERR_str_functs[]=
+       {
+       {ERR_PACK(0,SYS_F_FOPEN,0),             "fopen"},
+       {ERR_PACK(0,SYS_F_CONNECT,0),           "connect"},
+       {ERR_PACK(0,SYS_F_GETSERVBYNAME,0),     "getservbyname"},
+       {ERR_PACK(0,SYS_F_SOCKET,0),            "socket"}, 
+       {ERR_PACK(0,SYS_F_IOCTLSOCKET,0),       "ioctlsocket"},
+       {ERR_PACK(0,SYS_F_BIND,0),              "bind"},
+       {ERR_PACK(0,SYS_F_LISTEN,0),            "listen"},
+       {ERR_PACK(0,SYS_F_ACCEPT,0),            "accept"},
+#ifdef OPENSSL_SYS_WINDOWS
+       {ERR_PACK(0,SYS_F_WSASTARTUP,0),        "WSAstartup"},
+#endif
+       {ERR_PACK(0,SYS_F_OPENDIR,0),           "opendir"},
+       {ERR_PACK(0,SYS_F_FREAD,0),             "fread"},
+       {0,NULL},
+       };
+
+static ERR_STRING_DATA ERR_str_reasons[]=
+       {
+{ERR_R_SYS_LIB                         ,"system lib"},
+{ERR_R_BN_LIB                          ,"BN lib"},
+{ERR_R_RSA_LIB                         ,"RSA lib"},
+{ERR_R_DH_LIB                          ,"DH lib"},
+{ERR_R_EVP_LIB                         ,"EVP lib"},
+{ERR_R_BUF_LIB                         ,"BUF lib"},
+{ERR_R_OBJ_LIB                         ,"OBJ lib"},
+{ERR_R_PEM_LIB                         ,"PEM lib"},
+{ERR_R_DSA_LIB                         ,"DSA lib"},
+{ERR_R_X509_LIB                                ,"X509 lib"},
+{ERR_R_ASN1_LIB                                ,"ASN1 lib"},
+{ERR_R_CONF_LIB                                ,"CONF lib"},
+{ERR_R_CRYPTO_LIB                      ,"CRYPTO lib"},
+{ERR_R_EC_LIB                          ,"EC lib"},
+{ERR_R_SSL_LIB                         ,"SSL lib"},
+{ERR_R_BIO_LIB                         ,"BIO lib"},
+{ERR_R_PKCS7_LIB                       ,"PKCS7 lib"},
+{ERR_R_X509V3_LIB                      ,"X509V3 lib"},
+{ERR_R_PKCS12_LIB                      ,"PKCS12 lib"},
+{ERR_R_RAND_LIB                                ,"RAND lib"},
+{ERR_R_DSO_LIB                         ,"DSO lib"},
+{ERR_R_ENGINE_LIB                      ,"ENGINE lib"},
+{ERR_R_OCSP_LIB                                ,"OCSP lib"},
+
+{ERR_R_NESTED_ASN1_ERROR               ,"nested asn1 error"},
+{ERR_R_BAD_ASN1_OBJECT_HEADER          ,"bad asn1 object header"},
+{ERR_R_BAD_GET_ASN1_OBJECT_CALL                ,"bad get asn1 object call"},
+{ERR_R_EXPECTING_AN_ASN1_SEQUENCE      ,"expecting an asn1 sequence"},
+{ERR_R_ASN1_LENGTH_MISMATCH            ,"asn1 length mismatch"},
+{ERR_R_MISSING_ASN1_EOS                        ,"missing asn1 eos"},
+
+{ERR_R_FATAL                            ,"fatal"},
+{ERR_R_MALLOC_FAILURE                  ,"malloc failure"},
+{ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED     ,"called a function you should not call"},
+{ERR_R_PASSED_NULL_PARAMETER           ,"passed a null parameter"},
+{ERR_R_INTERNAL_ERROR                  ,"internal error"},
+{ERR_R_DISABLED                                ,"called a function that was disabled at compile-time"},
+
+{0,NULL},
+       };
+#endif
+
+#ifndef OPENSSL_NO_ERR
+#define NUM_SYS_STR_REASONS 127
+#define LEN_SYS_STR_REASON 32
+
+static ERR_STRING_DATA SYS_str_reasons[NUM_SYS_STR_REASONS + 1];
+/* SYS_str_reasons is filled with copies of strerror() results at
+ * initialization.
+ * 'errno' values up to 127 should cover all usual errors,
+ * others will be displayed numerically by ERR_error_string.
+ * It is crucial that we have something for each reason code
+ * that occurs in ERR_str_reasons, or bogus reason strings
+ * will be returned for SYSerr, which always gets an errno
+ * value and never one of those 'standard' reason codes. */
+
+static void build_SYS_str_reasons(void)
+       {
+       /* OPENSSL_malloc cannot be used here, use static storage instead */
+       static char strerror_tab[NUM_SYS_STR_REASONS][LEN_SYS_STR_REASON];
+       int i;
+       static int init = 1;
+
+       CRYPTO_r_lock(CRYPTO_LOCK_ERR);
+       if (!init)
+               {
+               CRYPTO_r_unlock(CRYPTO_LOCK_ERR);
+               return;
+               }
+       
+       CRYPTO_r_unlock(CRYPTO_LOCK_ERR);
+       CRYPTO_w_lock(CRYPTO_LOCK_ERR);
+       if (!init)
+               {
+               CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
+               return;
+               }
+
+       for (i = 1; i <= NUM_SYS_STR_REASONS; i++)
+               {
+               ERR_STRING_DATA *str = &SYS_str_reasons[i - 1];
+
+               str->error = (unsigned long)i;
+               if (str->string == NULL)
+                       {
+                       char (*dest)[LEN_SYS_STR_REASON] = &(strerror_tab[i - 1]);
+                       char *src = strerror(i);
+                       if (src != NULL)
+                               {
+                               strncpy(*dest, src, sizeof *dest);
+                               (*dest)[sizeof *dest - 1] = '\0';
+                               str->string = *dest;
+                               }
+                       }
+               if (str->string == NULL)
+                       str->string = "unknown";
+               }
+
+       /* Now we still have SYS_str_reasons[NUM_SYS_STR_REASONS] = {0, NULL},
+        * as required by ERR_load_strings. */
+
+       init = 0;
+       
+       CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
+       }
+#endif
+
+void ERR_load_ERR_strings(void)
+       {
+#ifndef OPENSSL_NO_ERR
+       if (ERR_func_error_string(ERR_str_functs[0].error) == NULL)
+               {
+               ERR_load_strings(0,ERR_str_libraries);
+               ERR_load_strings(0,ERR_str_reasons);
+               ERR_load_strings(ERR_LIB_SYS,ERR_str_functs);
+               build_SYS_str_reasons();
+               ERR_load_strings(ERR_LIB_SYS,SYS_str_reasons);
+               }
+#endif
+       }
+
index 1938f081ac5490f9401fb83228ed9158747762f0..b754d29686e61dc76bb6943325f7bfab71745596 100644 (file)
@@ -31,6 +31,7 @@ L COMP                crypto/comp/comp.h              crypto/comp/comp_err.c
 L ECDSA                crypto/ecdsa/ecdsa.h            crypto/ecdsa/ecs_err.c
 L ECDH         crypto/ecdh/ecdh.h              crypto/ecdh/ech_err.c
 L STORE                crypto/store/store.h            crypto/store/str_err.c
+L FIPS         fips/fips.h                     crypto/fips_err.h
 L CMS          crypto/cms/cms.h                crypto/cms/cms_err.c
 
 # additional header files to be scanned for function names