src - OpenBSD base system

diff options


context:
space:
mode:

author	Damien Miller <djm@cvs.openbsd.org>	2010-10-01 22:59:02 +0000
committer	Damien Miller <djm@cvs.openbsd.org>	2010-10-01 22:59:02 +0000
commit	367b2622e0527401666a65476f4111fdda2e3c12 (patch)
tree	dc507d2394eb3b616bd9eae56d17671899a24a05 /lib/libcrypto/err
parent	ae9cbeba0dc25f0e95e6a0e50b6c161bf6384e17 (diff)

resolve conflicts, fix local changes

Diffstat (limited to 'lib/libcrypto/err')

-rw-r--r--

lib/libcrypto/err/Makefile.ssl

119

-rw-r--r--

lib/libcrypto/err/err.c

789

-rw-r--r--

lib/libcrypto/err/err.h

-rw-r--r--

lib/libcrypto/err/err_all.c

-rw-r--r--

lib/libcrypto/err/err_bio.c

-rw-r--r--

lib/libcrypto/err/err_def.c

665

-rw-r--r--

lib/libcrypto/err/err_prn.c

-rw-r--r--

lib/libcrypto/err/err_str.c

295

-rw-r--r--

lib/libcrypto/err/openssl.ec

9 files changed, 851 insertions, 1268 deletions

diff --git a/lib/libcrypto/err/Makefile.ssl b/lib/libcrypto/err/Makefile.ssl
deleted file mode 100644
index b253061d072..00000000000
--- a/lib/libcrypto/err/Makefile.ssl
+++ /dev/null

@@ -1,119 +0,0 @@

-# SSLeay/crypto/err/Makefile

-DIR= err

-TOP= ../..

-CC= cc

-INCLUDES= -I.. -I$(TOP) -I../../include

-CFLAG=-g

-INSTALL_PREFIX=

-OPENSSLDIR= /usr/local/ssl

-INSTALLTOP=/usr/local/ssl

-MAKE= make -f Makefile.ssl

-MAKEDEPPROG= makedepend

-MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)

-MAKEFILE= Makefile.ssl

-AR= ar r

-CFLAGS= $(INCLUDES) $(CFLAG)

-GENERAL=Makefile

-TEST=

-APPS=

-LIB=$(TOP)/libcrypto.a

-LIBSRC=err.c err_all.c err_prn.c

-LIBOBJ=err.o err_all.o err_prn.o

-SRC= $(LIBSRC)

-EXHEADER= err.h

-HEADER= $(EXHEADER)

-ALL= $(GENERAL) $(SRC) $(HEADER)

-top:

- (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)

-all: lib

-lib: $(LIBOBJ)

- $(AR) $(LIB) $(LIBOBJ)

- $(RANLIB) $(LIB) || echo Never mind.

- @touch lib

-files:

- $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO

-links:

- @sh $(TOP)/util/point.sh Makefile.ssl Makefile

- @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)

- @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)

- @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)

-install:

- @for i in $(EXHEADER) ; \

- do \

- (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \

- chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \

- done;

-tags:

- ctags $(SRC)

-tests:

-lint:

- lint -DLINT $(INCLUDES) $(SRC)>fluff

-depend:

- $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

-dclean:

- $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

- mv -f Makefile.new $(MAKEFILE)

-clean:

- rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

-# DO NOT DELETE THIS LINE -- make depend depends on it.

-err.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/buffer.h

-err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h

-err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h

-err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h

-err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

-err.o: ../../include/openssl/symhacks.h ../cryptlib.h err.c

-err_all.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h

-err_all.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h

-err_all.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h

-err_all.o: ../../include/openssl/cast.h ../../include/openssl/conf.h

-err_all.o: ../../include/openssl/crypto.h ../../include/openssl/des.h

-err_all.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h

-err_all.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h

-err_all.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h

-err_all.o: ../../include/openssl/engine.h ../../include/openssl/err.h

-err_all.o: ../../include/openssl/evp.h ../../include/openssl/idea.h

-err_all.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h

-err_all.o: ../../include/openssl/md4.h ../../include/openssl/md5.h

-err_all.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h

-err_all.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h

-err_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h

-err_all.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem2.h

-err_all.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h

-err_all.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h

-err_all.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h

-err_all.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h

-err_all.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h

-err_all.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

-err_all.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h

-err_all.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h

-err_all.o: ../../include/openssl/x509v3.h err_all.c

-err_prn.o: ../../e_os.h ../../include/openssl/bio.h

-err_prn.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

-err_prn.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h

-err_prn.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h

-err_prn.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h

-err_prn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

-err_prn.o: ../cryptlib.h err_prn.c

diff --git a/lib/libcrypto/err/err.c b/lib/libcrypto/err/err.c
index 292404a2fb9..69713a6e2ff 100644
--- a/lib/libcrypto/err/err.c
+++ b/lib/libcrypto/err/err.c

@@ -56,7 +56,7 @@

* [including the GNU Public Licence.]

/* ====================================================================

* Redistribution and use in source and binary forms, with or without

* modification, are permitted provided that the following conditions

@@ -119,9 +119,507 @@

#include <openssl/bio.h>

#include <openssl/err.h>

-static unsigned long get_error_values(int inc,int top,

- const char **file,int *line,

- const char **data,int *flags);

+DECLARE_LHASH_OF(ERR_STRING_DATA);

+DECLARE_LHASH_OF(ERR_STATE);

+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_TS,0,0) ,"time stamp 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"},

+{ERR_PACK(ERR_LIB_HMAC,0,0) ,"HMAC 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_TS_LIB ,"TS 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_OF(ERR_STRING_DATA) *(*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_OF(ERR_STATE) *(*cb_thread_get)(int create);

+ void (*cb_thread_release)(LHASH_OF(ERR_STATE) **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_OF(ERR_STRING_DATA) *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_OF(ERR_STATE) *int_thread_get(int create);

+static void int_thread_release(LHASH_OF(ERR_STATE) **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_OF(ERR_STRING_DATA) *int_error_hash = NULL;

+static LHASH_OF(ERR_STATE) *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 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 unsigned long err_string_data_hash(const ERR_STRING_DATA *a)

+ {

+ unsigned long ret,l;

+ l=a->error;

+ ret=l^ERR_GET_LIB(l)^ERR_GET_FUNC(l);

+ return(ret^ret%19*13);

+ }

+static IMPLEMENT_LHASH_HASH_FN(err_string_data, ERR_STRING_DATA)

+static int err_string_data_cmp(const ERR_STRING_DATA *a,

+ const ERR_STRING_DATA *b)

+ {

+ return (int)(a->error - b->error);

+ }

+static IMPLEMENT_LHASH_COMP_FN(err_string_data, ERR_STRING_DATA)

+static LHASH_OF(ERR_STRING_DATA) *int_err_get(int create)

+ {

+ LHASH_OF(ERR_STRING_DATA) *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_ERR_STRING_DATA_new();

+ 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_ERR_STRING_DATA_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_OF(ERR_STRING_DATA) *hash;

+ err_fns_check();

+ hash = ERRFN(err_get)(0);

+ if (!hash)

+ return NULL;

+ CRYPTO_r_lock(CRYPTO_LOCK_ERR);

+ p = lh_ERR_STRING_DATA_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_OF(ERR_STRING_DATA) *hash;

+ err_fns_check();

+ hash = ERRFN(err_get)(1);

+ if (!hash)

+ return NULL;

+ CRYPTO_w_lock(CRYPTO_LOCK_ERR);

+ p = lh_ERR_STRING_DATA_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_OF(ERR_STRING_DATA) *hash;

+ err_fns_check();

+ hash = ERRFN(err_get)(0);

+ if (!hash)

+ return NULL;

+ CRYPTO_w_lock(CRYPTO_LOCK_ERR);

+ p = lh_ERR_STRING_DATA_delete(hash, d);

+ CRYPTO_w_unlock(CRYPTO_LOCK_ERR);

+ return p;

+ }

+static unsigned long err_state_hash(const ERR_STATE *a)

+ {

+ return CRYPTO_THREADID_hash(&a->tid) * 13;

+ }

+static IMPLEMENT_LHASH_HASH_FN(err_state, ERR_STATE)

+static int err_state_cmp(const ERR_STATE *a, const ERR_STATE *b)

+ {

+ return CRYPTO_THREADID_cmp(&a->tid, &b->tid);

+ }

+static IMPLEMENT_LHASH_COMP_FN(err_state, ERR_STATE)

+static LHASH_OF(ERR_STATE) *int_thread_get(int create)

+ {

+ LHASH_OF(ERR_STATE) *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_ERR_STATE_new();

+ 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_OF(ERR_STATE) **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_OF(ERR_STATE) *hash;

+ err_fns_check();

+ hash = ERRFN(thread_get)(0);

+ if (!hash)

+ return NULL;

+ CRYPTO_r_lock(CRYPTO_LOCK_ERR);

+ p = lh_ERR_STATE_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_OF(ERR_STATE) *hash;

+ err_fns_check();

+ hash = ERRFN(thread_get)(1);

+ if (!hash)

+ return NULL;

+ CRYPTO_w_lock(CRYPTO_LOCK_ERR);

+ p = lh_ERR_STATE_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_OF(ERR_STATE) *hash;

+ err_fns_check();

+ hash = ERRFN(thread_get)(0);

+ if (!hash)

+ return;

+ CRYPTO_w_lock(CRYPTO_LOCK_ERR);

+ p = lh_ERR_STATE_delete(hash, d);

+ /* make sure we don't leak memory */

+ if (int_thread_hash_references == 1

+ && int_thread_hash && lh_ERR_STATE_num_items(int_thread_hash) == 0)

+ {

+ lh_ERR_STATE_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

#define err_clear_data(p,i) \

do { \

@@ -143,6 +641,68 @@ static unsigned long get_error_values(int inc,int top,

(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)

{

@@ -297,6 +857,196 @@ 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_OF(ERR_STRING_DATA) *ERR_get_string_table(void)

+ {

+ err_fns_check();

+ return ERRFN(err_get)(0);

+ }

+LHASH_OF(ERR_STATE) *ERR_get_err_state_table(void)

+ {

+ err_fns_check();

+ return ERRFN(thread_get)(0);

+ }

+void ERR_release_err_state_table(LHASH_OF(ERR_STATE) **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);

+ }

+void ERR_remove_thread_state(const CRYPTO_THREADID *id)

+ {

+ ERR_STATE tmp;

+ if (id)

+ CRYPTO_THREADID_cpy(&tmp.tid, id);

+ else

+ CRYPTO_THREADID_current(&tmp.tid);

+ err_fns_check();

+ /* thread_del_item automatically destroys the LHASH if the number of

+ * items reaches zero. */

+ ERRFN(thread_del_item)(&tmp);

+ }

+#ifndef OPENSSL_NO_DEPRECATED

+void ERR_remove_state(unsigned long pid)

+ {

+ ERR_remove_thread_state(NULL);

+ }

+#endif

+ERR_STATE *ERR_get_state(void)

+ {

+ static ERR_STATE fallback;

+ ERR_STATE *ret,tmp,*tmpp=NULL;

+ int i;

+ CRYPTO_THREADID tid;

+ err_fns_check();

+ CRYPTO_THREADID_current(&tid);

+ CRYPTO_THREADID_cpy(&tmp.tid, &tid);

+ 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);

+ CRYPTO_THREADID_cpy(&ret->tid, &tid);

+ 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;

@@ -383,34 +1133,3 @@ 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

diff --git a/lib/libcrypto/err/err.h b/lib/libcrypto/err/err.h
index dcac4152310..b9f8c16d47d 100644
--- a/lib/libcrypto/err/err.h
+++ b/lib/libcrypto/err/err.h

@@ -55,6 +55,59 @@

* copied and put under another distribution licence

* [including the GNU Public Licence.]

+/* ====================================================================

+ *

+ * 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).

+ *

+ */

#ifndef HEADER_ERR_H

#define HEADER_ERR_H

@@ -94,7 +147,7 @@ extern "C" {

#define ERR_NUM_ERRORS 16

typedef struct err_state_st

{

- unsigned long pid;

+ CRYPTO_THREADID tid;

int err_flags[ERR_NUM_ERRORS];

unsigned long err_buffer[ERR_NUM_ERRORS];

char *err_data[ERR_NUM_ERRORS];

@@ -142,7 +195,9 @@ typedef struct err_state_st

#define ERR_LIB_STORE 44

#define ERR_LIB_FIPS 45

#define ERR_LIB_CMS 46

-#define ERR_LIB_JPAKE 47

+#define ERR_LIB_TS 47

+#define ERR_LIB_HMAC 48

+#define ERR_LIB_JPAKE 49

#define ERR_LIB_USER 128

@@ -176,6 +231,8 @@ typedef struct err_state_st

#define STOREerr(f,r) ERR_PUT_error(ERR_LIB_STORE,(f),(r),__FILE__,__LINE__)

#define FIPSerr(f,r) ERR_PUT_error(ERR_LIB_FIPS,(f),(r),__FILE__,__LINE__)

#define CMSerr(f,r) ERR_PUT_error(ERR_LIB_CMS,(f),(r),__FILE__,__LINE__)

+#define TSerr(f,r) ERR_PUT_error(ERR_LIB_TS,(f),(r),__FILE__,__LINE__)

+#define HMACerr(f,r) ERR_PUT_error(ERR_LIB_HMAC,(f),(r),__FILE__,__LINE__)

#define JPAKEerr(f,r) ERR_PUT_error(ERR_LIB_JPAKE,(f),(r),__FILE__,__LINE__)

/* Borland C seems too stupid to be able to shift and do longs in

@@ -232,6 +289,7 @@ typedef struct err_state_st

#define ERR_R_ECDSA_LIB ERR_LIB_ECDSA /* 42 */

#define ERR_R_ECDH_LIB ERR_LIB_ECDH /* 43 */

#define ERR_R_STORE_LIB ERR_LIB_STORE /* 44 */

+#define ERR_R_TS_LIB ERR_LIB_TS /* 45 */

#define ERR_R_NESTED_ASN1_ERROR 58

#define ERR_R_BAD_ASN1_OBJECT_HEADER 59

@@ -294,13 +352,16 @@ void ERR_load_ERR_strings(void);

void ERR_load_crypto_strings(void);

void ERR_free_strings(void);

+void ERR_remove_thread_state(const CRYPTO_THREADID *tid);

+#ifndef OPENSSL_NO_DEPRECATED

void ERR_remove_state(unsigned long pid); /* if zero we look it up */

+#endif

ERR_STATE *ERR_get_state(void);

#ifndef OPENSSL_NO_LHASH

-LHASH *ERR_get_string_table(void);

-LHASH *ERR_get_err_state_table(void);

-void ERR_release_err_state_table(LHASH **hash);

+LHASH_OF(ERR_STRING_DATA) *ERR_get_string_table(void);

+LHASH_OF(ERR_STATE) *ERR_get_err_state_table(void);

+void ERR_release_err_state_table(LHASH_OF(ERR_STATE) **hash);

#endif

int ERR_get_next_error_library(void);

@@ -308,12 +369,6 @@ 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

diff --git a/lib/libcrypto/err/err_all.c b/lib/libcrypto/err/err_all.c
index f21a5276ed7..fc049e8e88b 100644
--- a/lib/libcrypto/err/err_all.c
+++ b/lib/libcrypto/err/err_all.c

@@ -64,6 +64,7 @@

#endif

#include <openssl/buffer.h>

#include <openssl/bio.h>

+#include <openssl/comp.h>

#ifndef OPENSSL_NO_RSA

#include <openssl/rsa.h>

#endif

@@ -94,16 +95,14 @@

#include <openssl/ui.h>

#include <openssl/ocsp.h>

#include <openssl/err.h>

-#ifdef OPENSSL_FIPS

-#include <openssl/fips.h>

-#endif

+#include <openssl/ts.h>

#ifndef OPENSSL_NO_CMS

#include <openssl/cms.h>

#endif

#ifndef OPENSSL_NO_JPAKE

#include <openssl/jpake.h>

#endif

+#include <openssl/comp.h>

void ERR_load_crypto_strings(void)

{

@@ -127,6 +126,7 @@ void ERR_load_crypto_strings(void)

ERR_load_ASN1_strings();

ERR_load_CONF_strings();

ERR_load_CRYPTO_strings();

+ ERR_load_COMP_strings();

#ifndef OPENSSL_NO_EC

ERR_load_EC_strings();

#endif

@@ -143,19 +143,18 @@ void ERR_load_crypto_strings(void)

ERR_load_PKCS12_strings();

ERR_load_RAND_strings();

ERR_load_DSO_strings();

+ ERR_load_TS_strings();

#ifndef OPENSSL_NO_ENGINE

ERR_load_ENGINE_strings();

#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

#ifndef OPENSSL_NO_JPAKE

ERR_load_JPAKE_strings();

#endif

+ ERR_load_COMP_strings();

#endif

}

diff --git a/lib/libcrypto/err/err_bio.c b/lib/libcrypto/err/err_bio.c
deleted file mode 100644
index a42f804840b..00000000000
--- a/lib/libcrypto/err/err_bio.c
+++ /dev/null

@@ -1,75 +0,0 @@

-/* crypto/err/err_prn.c */

- *

- * 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/lib/libcrypto/err/err_def.c b/lib/libcrypto/err/err_def.c
deleted file mode 100644
index 7ed3d849553..00000000000
--- a/lib/libcrypto/err/err_def.c
+++ /dev/null

@@ -1,665 +0,0 @@

-/* crypto/err/err_def.c */