X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Ferr%2Ferr.c;h=e28ec56ffa6a82ffc165cb9b58a9dfee3a6015d0;hb=80c808b90b79356c37ac41ee9bf748d39b4e53e3;hp=f56576d962d3755ab73a76d63f8a5b84fe299d5b;hpb=cf5bfbfc2109d86504e16df5ccd5f5ff121e1d6d;p=oweals%2Fopenssl.git

diff --git a/crypto/err/err.c b/crypto/err/err.c
index f56576d962..e28ec56ffa 100644
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -166,6 +166,7 @@ static ERR_STRING_DATA ERR_str_functs[]=
 	{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},
 	};
 
@@ -207,22 +208,25 @@ static ERR_STRING_DATA ERR_str_reasons[]=
 {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)(void);
+	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)(void);
+	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 *);
@@ -231,12 +235,13 @@ struct st_ERR_FNS
 	};
 
 /* Predeclarations of the "err_defaults" functions */
-static LHASH *int_err_get(void);
+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(void);
+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 *);
@@ -250,6 +255,7 @@ static const ERR_FNS err_defaults =
 	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,
@@ -267,11 +273,10 @@ static const ERR_FNS *err_fns = NULL;
  * "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;
-static int int_error_hash_set = 0;
-static LHASH *int_thread_hash;
-static int int_thread_hash_set = 0;
-static int int_err_library_number=ERR_LIB_USER;
+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. */
@@ -295,17 +300,18 @@ const ERR_FNS *ERR_get_implementation(void)
 
 int ERR_set_implementation(const ERR_FNS *fns)
 	{
-	int toret = 0;
+	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)
+	if (!err_fns)
 		{
 		err_fns = fns;
-		toret = 1;
+		ret = 1;
 		}
 	CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-	return toret;
+	return ret;
 	}
 
 /* These are the callbacks provided to "lh_new()" when creating the LHASH tables
@@ -319,34 +325,36 @@ static int err_cmp(const void *a_void, const void *b_void);
 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,const char **file,int *line,
+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(void)
+static LHASH *int_err_get(int create)
 	{
-	LHASH *toret = NULL;
+	LHASH *ret = NULL;
+
 	CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-	if(!int_error_hash_set)
-		int_error_hash = lh_new(err_hash, err_cmp);
-	if(int_error_hash)
+	if (!int_error_hash && create)
 		{
-		int_error_hash_set = 1;
-		toret = int_error_hash;
+		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(toret);
+
+	return ret;
 	}
 
 static void int_err_del(void)
 	{
 	CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-	if(int_error_hash_set)
+	if (int_error_hash)
 		{
 		lh_free(int_error_hash);
 		int_error_hash = NULL;
-		int_error_hash_set = 0;
 		}
 	CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
 	}
@@ -355,13 +363,16 @@ 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)();
-	if(!hash)
+	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;
 	}
 
@@ -369,13 +380,16 @@ 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)();
-	if(!hash)
+	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;
 	}
 
@@ -383,42 +397,77 @@ 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)();
-	if(!hash)
+	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(void)
+static LHASH *int_thread_get(int create)
 	{
-	LHASH *toret = NULL;
+	LHASH *ret = NULL;
+
 	CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-	if(!int_thread_hash_set)
+	if (!int_thread_hash && create)
+		{
+		CRYPTO_push_info("int_thread_get (err.c)");
 		int_thread_hash = lh_new(pid_hash, pid_cmp);
-	if(int_thread_hash)
+		CRYPTO_pop_info();
+		}
+	if (int_thread_hash)
 		{
-		int_thread_hash_set = 1;
-		toret = int_thread_hash;
+		int_thread_hash_references++;
+		ret = int_thread_hash;
 		}
 	CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-	return(toret);
+	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)();
-	if(!hash)
+	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;
 	}
 
@@ -426,13 +475,17 @@ static ERR_STATE *int_thread_set_item(ERR_STATE *d)
 	{
 	ERR_STATE *p;
 	LHASH *hash;
+
 	err_fns_check();
-	hash = ERRFN(thread_get)();
-	if(!hash)
+	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;
 	}
 
@@ -440,34 +493,41 @@ static void int_thread_del_item(const ERR_STATE *d)
 	{
 	ERR_STATE *p;
 	LHASH *hash;
+
 	err_fns_check();
-	hash = ERRFN(thread_get)();
-	if(!hash)
+	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_set && (lh_num_items(int_thread_hash) == 0))
+	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;
-		int_thread_hash_set = 0;
 		}
 	CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-	if(p)
+
+	ERRFN(thread_release)(&hash);
+	if (p)
 		ERR_STATE_free(p);
 	}
 
 static int int_err_get_next_lib(void)
 	{
-	int toret;
+	int ret;
+
 	CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-	toret = int_err_library_number++;
+	ret = int_err_library_number++;
 	CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-	return toret;
+
+	return ret;
 	}
 
 
+#ifndef OPENSSL_NO_ERR
 #define NUM_SYS_STR_REASONS 127
 #define LEN_SYS_STR_REASON 32
 
@@ -490,7 +550,7 @@ static void build_SYS_str_reasons()
 
 	if (!init) return;
 
-	CRYPTO_w_lock(CRYPTO_LOCK_ERR_HASH);
+	CRYPTO_w_lock(CRYPTO_LOCK_ERR);
 
 	for (i = 1; i <= NUM_SYS_STR_REASONS; i++)
 		{
@@ -517,24 +577,35 @@ static void build_SYS_str_reasons()
 
 	init = 0;
 	
-	CRYPTO_w_unlock(CRYPTO_LOCK_ERR_HASH);
+	CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
 	}
 #endif
 
 #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;
+	(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_STATE_free(ERR_STATE *s)
 	{
 	int i;
 
-	if(s == NULL)
+	if (s == NULL)
 	    return;
 
 	for (i=0; i<ERR_NUM_ERRORS; i++)
@@ -568,13 +639,13 @@ static void err_load_strings(int lib, ERR_STRING_DATA *str)
 
 void ERR_load_strings(int lib, ERR_STRING_DATA *str)
 	{
-	err_load_ERR_strings();
+	ERR_load_ERR_strings();
 	err_load_strings(lib, str);
 	}
 
 void ERR_unload_strings(int lib, ERR_STRING_DATA *str)
 	{
-	while(str->error)
+	while (str->error)
 		{
 		str->error|=ERR_PACK(lib,0,0);
 		ERRFN(err_del_item)(str);
@@ -619,6 +690,7 @@ void ERR_put_error(int lib, int func, int reason, const char *file,
 	es->top=(es->top+1)%ERR_NUM_ERRORS;
 	if (es->top == es->bottom)
 		es->bottom=(es->bottom+1)%ERR_NUM_ERRORS;
+	es->err_flags[es->top]=0;
 	es->err_buffer[es->top]=ERR_PACK(lib,func,reason);
 	es->err_file[es->top]=file;
 	es->err_line[es->top]=line;
@@ -634,40 +706,47 @@ void ERR_clear_error(void)
 
 	for (i=0; i<ERR_NUM_ERRORS; i++)
 		{
-		es->err_buffer[i]=0;
-		err_clear_data(es,i);
-		es->err_file[i]=NULL;
-		es->err_line[i]= -1;
+		err_clear(es,i);
 		}
 	es->top=es->bottom=0;
 	}
 
 
 unsigned long ERR_get_error(void)
-	{ return(get_error_values(1,NULL,NULL,NULL,NULL)); }
+	{ return(get_error_values(1,0,NULL,NULL,NULL,NULL)); }
 
 unsigned long ERR_get_error_line(const char **file,
 	     int *line)
-	{ return(get_error_values(1,file,line,NULL,NULL)); }
+	{ return(get_error_values(1,0,file,line,NULL,NULL)); }
 
 unsigned long ERR_get_error_line_data(const char **file, int *line,
 	     const char **data, int *flags)
-	{ return(get_error_values(1,file,line,
-	     data,flags)); }
+	{ return(get_error_values(1,0,file,line,data,flags)); }
+
 
 unsigned long ERR_peek_error(void)
-	{ return(get_error_values(0,NULL,NULL,NULL,NULL)); }
+	{ return(get_error_values(0,0,NULL,NULL,NULL,NULL)); }
 
-unsigned long ERR_peek_error_line(const char **file,
-	     int *line)
-	{ return(get_error_values(0,file,line,NULL,NULL)); }
+unsigned long ERR_peek_error_line(const char **file, int *line)
+	{ return(get_error_values(0,0,file,line,NULL,NULL)); }
 
 unsigned long ERR_peek_error_line_data(const char **file, int *line,
 	     const char **data, int *flags)
-	{ return(get_error_values(0,file,line,
-	     data,flags)); }
+	{ return(get_error_values(0,0,file,line,data,flags)); }
+
+
+unsigned long ERR_peek_last_error(void)
+	{ return(get_error_values(0,1,NULL,NULL,NULL,NULL)); }
+
+unsigned long ERR_peek_last_error_line(const char **file, int *line)
+	{ return(get_error_values(0,1,file,line,NULL,NULL)); }
 
-static unsigned long get_error_values(int inc, const char **file, int *line,
+unsigned long ERR_peek_last_error_line_data(const char **file, int *line,
+	     const char **data, int *flags)
+	{ return(get_error_values(0,1,file,line,data,flags)); }
+
+
+static unsigned long get_error_values(int inc, int top, const char **file, int *line,
 	     const char **data, int *flags)
 	{	
 	int i=0;
@@ -676,8 +755,21 @@ static unsigned long get_error_values(int inc, const char **file, int *line,
 
 	es=ERR_get_state();
 
-	if (es->bottom == es->top) return(0);
-	i=(es->bottom+1)%ERR_NUM_ERRORS;
+	if (inc && top)
+		{
+		if (file) *file = "";
+		if (line) *line = 0;
+		if (data) *data = "";
+		if (flags) *flags = 0;
+			
+		return ERR_R_INTERNAL_ERROR;
+		}
+
+	if (es->bottom == es->top) return 0;
+	if (top)
+		i=es->top;			 /* last error */
+	else
+		i=(es->bottom+1)%ERR_NUM_ERRORS; /* first error */
 
 	ret=es->err_buffer[i];
 	if (inc)
@@ -720,7 +812,7 @@ static unsigned long get_error_values(int inc, const char **file, int *line,
 			if (flags != NULL) *flags=es->err_data_flags[i];
 			}
 		}
-	return(ret);
+	return ret;
 	}
 
 void ERR_error_string_n(unsigned long e, char *buf, size_t len)
@@ -782,19 +874,25 @@ char *ERR_error_string(unsigned long e, char *ret)
 	if (ret == NULL) ret=buf;
 	ERR_error_string_n(e, ret, 256);
 
-	return(ret);
+	return ret;
 	}
 
 LHASH *ERR_get_string_table(void)
 	{
 	err_fns_check();
-	return ERRFN(err_get)();
+	return ERRFN(err_get)(0);
 	}
 
 LHASH *ERR_get_err_state_table(void)
 	{
 	err_fns_check();
-	return ERRFN(thread_get)();
+	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)
@@ -832,7 +930,7 @@ const char *ERR_reason_error_string(unsigned long e)
 	r=ERR_GET_REASON(e);
 	d.error=ERR_PACK(l,0,r);
 	p=ERRFN(err_get_item)(&d);
-	if(!p)
+	if (!p)
 		{
 		d.error=ERR_PACK(0,0,r);
 		p=ERRFN(err_get_item)(&d);
@@ -873,6 +971,7 @@ static int pid_cmp(const void *a_void, const void *b_void)
 void ERR_remove_state(unsigned long pid)
 	{
 	ERR_STATE tmp;
+
 	err_fns_check();
 	if (pid == 0)
 		pid=(unsigned long)CRYPTO_thread_id();
@@ -888,6 +987,7 @@ ERR_STATE *ERR_get_state(void)
 	ERR_STATE *ret,tmp,*tmpp=NULL;
 	int i;
 	unsigned long pid;
+
 	err_fns_check();
 	pid=(unsigned long)CRYPTO_thread_id();
 	tmp.pid=pid;
@@ -908,17 +1008,17 @@ ERR_STATE *ERR_get_state(void)
 			}
 		tmpp = ERRFN(thread_set_item)(ret);
 		/* To check if insertion failed, do a get. */
-		if(ERRFN(thread_get_item)(ret) != ret)
+		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)
+		if (tmpp)
 			ERR_STATE_free(tmpp);
 		}
-	return(ret);
+	return ret;
 	}
 
 int ERR_get_next_error_library(void)
@@ -970,15 +1070,46 @@ void ERR_add_error_data(int num, ...)
 				if (p == NULL)
 					{
 					OPENSSL_free(str);
-					return;
+					goto err;
 					}
 				else
 					str=p;
 				}
-			strcat(str,a);
+			BUF_strlcat(str,a,s+1);
 			}
 		}
 	ERR_set_error_data(str,ERR_TXT_MALLOCED|ERR_TXT_STRING);
 
+err:
 	va_end(args);
 	}
+
+int ERR_set_mark(void)
+	{
+	ERR_STATE *es;
+
+	es=ERR_get_state();
+
+	if (es->bottom == es->top) return 0;
+	es->err_flags[es->top]|=ERR_FLAG_MARK;
+	return 1;
+	}
+
+int ERR_pop_to_mark(void)
+	{
+	ERR_STATE *es;
+
+	es=ERR_get_state();
+
+	while(es->bottom != es->top
+		&& (es->err_flags[es->top] & ERR_FLAG_MARK) == 0)
+		{
+		err_clear(es,es->top);
+		es->top-=1;
+		if (es->top == -1) es->top=ERR_NUM_ERRORS;
+		}
+		
+	if (es->bottom == es->top) return 0;
+	es->err_flags[es->top]&=~ERR_FLAG_MARK;
+	return 1;
+	}