import openssl-0.9.7-beta1

5 files changed, 900 insertions, 477 deletions

diff --git a/src/lib/libcrypto/err/err.c b/src/lib/libcrypto/err/err.c
index 5aef6a1259..04773d65a6 100644
--- a/src/lib/libcrypto/err/err.c
+++ b/src/lib/libcrypto/err/err.c
@@ -55,37 +55,74 @@
  * 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 "lhash.h"
-#include "crypto.h"
+#include <stdarg.h>
+#include <string.h>
+#include <openssl/lhash.h>
+#include <openssl/crypto.h>
 #include "cryptlib.h"
-#include "buffer.h"
-#include "err.h"
-#include "crypto.h"
+#include <openssl/buffer.h>
+#include <openssl/bio.h>
+#include <openssl/err.h>
 
+static void err_load_strings(int lib, ERR_STRING_DATA *str);
 
-static LHASH *error_hash=NULL;
-static LHASH *thread_hash=NULL;
-
-#ifndef NOPROTO
-static unsigned long err_hash(ERR_STRING_DATA *a);
-static int err_cmp(ERR_STRING_DATA *a, ERR_STRING_DATA *b);
-static unsigned long pid_hash(ERR_STATE *pid);
-static int pid_cmp(ERR_STATE *a,ERR_STATE *pid);
-static unsigned long get_error_values(int inc,char **file,int *line,
-        char **data,int *flags);
 static void ERR_STATE_free(ERR_STATE *s);
-#else
-static unsigned long err_hash();
-static int err_cmp();
-static unsigned long pid_hash();
-static int pid_cmp();
-static void ERR_STATE_free();
-ERR_STATE *s;
-#endif
-
-#ifndef NO_ERR
+#ifndef OPENSSL_NO_ERR
 static ERR_STRING_DATA ERR_str_libraries[]=
         {
 {ERR_PACK(ERR_LIB_NONE,0,0)             ,"unknown library"},
@@ -95,18 +132,23 @@ static ERR_STRING_DATA ERR_str_libraries[]=
 {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_BIO,0,0)              ,"BIO routines"},
 {ERR_PACK(ERR_LIB_OBJ,0,0)              ,"object identifier routines"},
 {ERR_PACK(ERR_LIB_PEM,0,0)              ,"PEM routines"},
-{ERR_PACK(ERR_LIB_ASN1,0,0)             ,"asn1 encoding routines"},
+{ERR_PACK(ERR_LIB_DSA,0,0)              ,"dsa routines"},
 {ERR_PACK(ERR_LIB_X509,0,0)             ,"x509 certificate routines"},
-{ERR_PACK(ERR_LIB_CONF,0,0)             ,"configuation file routines"},
-{ERR_PACK(ERR_LIB_METH,0,0)             ,"X509 lookup 'method' 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_RSAREF,0,0)           ,"RSAref routines"},
-{ERR_PACK(ERR_LIB_PROXY,0,0)            ,"Proxy 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"},
 {0,NULL},
         };
 
@@ -120,132 +162,480 @@ static ERR_STRING_DATA ERR_str_functs[]=
         {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 WINDOWS
+#ifdef OPENSSL_SYS_WINDOWS
         {ERR_PACK(0,SYS_F_WSASTARTUP,0),        "WSAstartup"},
 #endif
+        {ERR_PACK(0,SYS_F_OPENDIR,0),           "opendir"},
         {0,NULL},
         };
 
 static ERR_STRING_DATA ERR_str_reasons[]=
         {
-{ERR_R_FATAL                             ,"fatal"},
 {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_BIO_LIB                          ,"BIO 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_METH_LIB                         ,"METH 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_PROXY_LIB                        ,"PROXY lib"},
 {ERR_R_BIO_LIB                          ,"BIO lib"},
 {ERR_R_PKCS7_LIB                        ,"PKCS7 lib"},
-{ERR_R_MALLOC_FAILURE                   ,"Malloc failure"},
-{ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED      ,"called a fuction you should not call"},
+{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"},
+
 {0,NULL},
         };
+
+
+/* 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);
+        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 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_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_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)
+                ret = int_thread_hash;
+        CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
+        return ret;
+        }
+
+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);
+
+        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);
+
+        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 && (lh_num_items(int_thread_hash) == 0))
+                {
+                lh_free(int_thread_hash);
+                int_thread_hash = NULL;
+                }
+        CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
+
+        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;
+        }
+
+
+#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()
+        {
+        /* 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;
+
+        if (!init) return;
+
+        CRYPTO_w_lock(CRYPTO_LOCK_ERR);
+
+        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) \
         if (((p)->err_data[i] != NULL) && \
                 (p)->err_data_flags[i] & ERR_TXT_MALLOCED) \
                 {  \
-                Free((p)->err_data[i]); \
+                OPENSSL_free((p)->err_data[i]); \
                 (p)->err_data[i]=NULL; \
                 } \
         (p)->err_data_flags[i]=0;
 
-static void ERR_STATE_free(s)
-ERR_STATE *s;
+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);
                 }
-        Free(s);
+        OPENSSL_free(s);
         }
 
-void ERR_load_ERR_strings()
+void ERR_load_ERR_strings(void)
         {
-        static int init=1;
-
-        if (init)
-                {
-                CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-                if (init == 0)
-                        {
-                        CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-                        return;
-                        }
-                init=0;
-                CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-
-#ifndef 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);
+        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
-                }
         }
 
-void ERR_load_strings(lib,str)
-int lib;
-ERR_STRING_DATA *str;
+static void err_load_strings(int lib, ERR_STRING_DATA *str)
         {
-        if (error_hash == NULL)
-                {
-                CRYPTO_w_lock(CRYPTO_LOCK_ERR_HASH);
-                error_hash=lh_new(err_hash,err_cmp);
-                if (error_hash == NULL)
-                        {
-                        CRYPTO_w_unlock(CRYPTO_LOCK_ERR_HASH);
-                        return;
-                        }
-                CRYPTO_w_unlock(CRYPTO_LOCK_ERR_HASH);
-
-                ERR_load_ERR_strings();
-                }
-
-        CRYPTO_w_lock(CRYPTO_LOCK_ERR_HASH);
         while (str->error)
                 {
                 str->error|=ERR_PACK(lib,0,0);
-                lh_insert(error_hash,(char *)str);
+                ERRFN(err_set_item)(str);
                 str++;
                 }
-        CRYPTO_w_unlock(CRYPTO_LOCK_ERR_HASH);
         }
 
-void ERR_free_strings()
+void ERR_load_strings(int lib, ERR_STRING_DATA *str)
         {
-        CRYPTO_w_lock(CRYPTO_LOCK_ERR);
+        ERR_load_ERR_strings();
+        err_load_strings(lib, str);
+        }
 
-        if (error_hash != NULL)
+void ERR_unload_strings(int lib, ERR_STRING_DATA *str)
+        {
+        while (str->error)
                 {
-                lh_free(error_hash);
-                error_hash=NULL;
+                str->error|=ERR_PACK(lib,0,0);
+                ERRFN(err_del_item)(str);
+                str++;
                 }
+        }
 
-        CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
+void ERR_free_strings(void)
+        {
+        err_fns_check();
+        ERRFN(err_del)();
         }
 
 /********************************************************/
 
-void ERR_put_error(lib,func,reason,file,line)
-int lib,func,reason;
-char *file;
-int line;
+void ERR_put_error(int lib, int func, int reason, const char *file,
+             int line)
         {
         ERR_STATE *es;
 
+#ifdef _OSD_POSIX
+        /* In the BS2000-OSD POSIX subsystem, the compiler generates
+         * path names in the form "*POSIX(/etc/passwd)".
+         * This dirty hack strips them to something sensible.
+         * @@@ We shouldn't modify a const string, though.
+         */
+        if (strncmp(file,"*POSIX(", sizeof("*POSIX(")-1) == 0) {
+                char *end;
+
+                /* Skip the "*POSIX(" prefix */
+                file += sizeof("*POSIX(")-1;
+                end = &file[strlen(file)-1];
+                if (*end == ')')
+                        *end = '\0';
+                /* Optional: use the basename of the path only. */
+                if ((end = strrchr(file, '/')) != NULL)
+                        file = &end[1];
+        }
+#endif
         es=ERR_get_state();
 
         es->top=(es->top+1)%ERR_NUM_ERRORS;
@@ -257,62 +647,60 @@ int line;
         err_clear_data(es,es->top);
         }
 
-void ERR_clear_error()
+void ERR_clear_error(void)
         {
+        int i;
         ERR_STATE *es;
 
         es=ERR_get_state();
 
-#if 0
-        /* hmm... is this needed */
         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_data(es,i);
                 }
-#endif
         es->top=es->bottom=0;
         }
 
 
-unsigned long ERR_get_error()
-        { return(get_error_values(1,NULL,NULL,NULL,NULL)); }
+unsigned long ERR_get_error(void)
+        { 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,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,0,file,line,data,flags)); }
+
 
-unsigned long ERR_get_error_line(file,line)
-char **file;
-int *line;
-        { return(get_error_values(1,file,line,NULL,NULL)); }
+unsigned long ERR_peek_error(void)
+        { return(get_error_values(0,0,NULL,NULL,NULL,NULL)); }
 
-unsigned long ERR_get_error_line_data(file,line,data,flags)
-char **file;
-int *line;
-char **data;
-int *flags;
-        { return(get_error_values(1,file,line,data,flags)); }
+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()
-        { return(get_error_values(0,NULL,NULL,NULL,NULL)); }
+unsigned long ERR_peek_error_line_data(const char **file, int *line,
+             const char **data, int *flags)
+        { return(get_error_values(0,0,file,line,data,flags)); }
 
-unsigned long ERR_peek_error_line(file,line)
-char **file;
-int *line;
-        { return(get_error_values(0,file,line,NULL,NULL)); }
 
-unsigned long ERR_peek_error_line_data(file,line,data,flags)
-char **file;
-int *line;
-char **data;
-int *flags;
-        { return(get_error_values(0,file,line,data,flags)); }
+unsigned long ERR_peek_last_error(void)
+        { return(get_error_values(0,1,NULL,NULL,NULL,NULL)); }
 
-static unsigned long get_error_values(inc,file,line,data,flags)
-int inc;
-char **file;
-int *line;
-char **data;
-int *flags;
+unsigned long ERR_peek_last_error_line(const char **file, int *line)
+        { return(get_error_values(0,1,file,line,NULL,NULL)); }
+
+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;
         ERR_STATE *es;
@@ -320,8 +708,21 @@ int *flags;
 
         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)
@@ -344,7 +745,14 @@ int *flags;
                         }
                 }
 
-        if (data != NULL)
+        if (data == NULL)
+                {
+                if (inc)
+                        {
+                        err_clear_data(es, i);
+                        }
+                }
+        else
                 {
                 if (es->err_data[i] == NULL)
                         {
@@ -357,18 +765,14 @@ int *flags;
                         if (flags != NULL) *flags=es->err_data_flags[i];
                         }
                 }
-        return(ret);
+        return ret;
         }
 
-/* BAD for multi-threaded, uses a local buffer if ret == NULL */
-char *ERR_error_string(e,ret)
-unsigned long e;
-char *ret;
+void ERR_error_string_n(unsigned long e, char *buf, size_t len)
         {
-        static char buf[256];
-        char *ls,*fs,*rs;
+        char lsbuf[64], fsbuf[64], rsbuf[64];
+        const char *ls,*fs,*rs;
         unsigned long l,f,r;
-        int i;
 
         l=ERR_GET_LIB(e);
         f=ERR_GET_FUNC(e);
@@ -378,185 +782,168 @@ char *ret;
         fs=ERR_func_error_string(e);
         rs=ERR_reason_error_string(e);
 
-        if (ret == NULL) ret=buf;
-
-        sprintf(&(ret[0]),"error:%08lX:",e);
-        i=strlen(ret);
-        if (ls == NULL)
-                sprintf(&(ret[i]),":lib(%lu) ",l);
-        else    sprintf(&(ret[i]),"%s",ls);
-        i=strlen(ret);
+        if (ls == NULL) 
+                BIO_snprintf(lsbuf, sizeof(lsbuf), "lib(%lu)", l);
         if (fs == NULL)
-                sprintf(&(ret[i]),":func(%lu) ",f);
-        else    sprintf(&(ret[i]),":%s",fs);
-        i=strlen(ret);
+                BIO_snprintf(fsbuf, sizeof(fsbuf), "func(%lu)", f);
         if (rs == NULL)
-                sprintf(&(ret[i]),":reason(%lu)",r);
-        else    sprintf(&(ret[i]),":%s",rs);
+                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);
+        return ret;
         }
 
-LHASH *ERR_get_string_table()
+LHASH *ERR_get_string_table(void)
         {
-        return(error_hash);
+        err_fns_check();
+        return ERRFN(err_get)(0);
         }
 
-LHASH *ERR_get_err_state_table()
+LHASH *ERR_get_err_state_table(void)
         {
-        return(thread_hash);
+        err_fns_check();
+        return ERRFN(thread_get)(0);
         }
 
-char *ERR_lib_error_string(e)
-unsigned long e;
+const char *ERR_lib_error_string(unsigned long e)
         {
-        ERR_STRING_DATA d,*p=NULL;
+        ERR_STRING_DATA d,*p;
         unsigned long l;
 
+        err_fns_check();
         l=ERR_GET_LIB(e);
-
-        CRYPTO_r_lock(CRYPTO_LOCK_ERR_HASH);
-
-        if (error_hash != NULL)
-                {
-                d.error=ERR_PACK(l,0,0);
-                p=(ERR_STRING_DATA *)lh_retrieve(error_hash,(char *)&d);
-                }
-
-        CRYPTO_r_unlock(CRYPTO_LOCK_ERR_HASH);
-
+        d.error=ERR_PACK(l,0,0);
+        p=ERRFN(err_get_item)(&d);
         return((p == NULL)?NULL:p->string);
         }
 
-char *ERR_func_error_string(e)
-unsigned long e;
+const char *ERR_func_error_string(unsigned long e)
         {
-        ERR_STRING_DATA d,*p=NULL;
+        ERR_STRING_DATA d,*p;
         unsigned long l,f;
 
+        err_fns_check();
         l=ERR_GET_LIB(e);
         f=ERR_GET_FUNC(e);
-
-        CRYPTO_r_lock(CRYPTO_LOCK_ERR_HASH);
-
-        if (error_hash != NULL)
-                {
-                d.error=ERR_PACK(l,f,0);
-                p=(ERR_STRING_DATA *)lh_retrieve(error_hash,(char *)&d);
-                }
-
-        CRYPTO_r_unlock(CRYPTO_LOCK_ERR_HASH);
-
+        d.error=ERR_PACK(l,f,0);
+        p=ERRFN(err_get_item)(&d);
         return((p == NULL)?NULL:p->string);
         }
 
-char *ERR_reason_error_string(e)
-unsigned long e;
+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);
-
-        CRYPTO_r_lock(CRYPTO_LOCK_ERR_HASH);
-
-        if (error_hash != NULL)
+        d.error=ERR_PACK(l,0,r);
+        p=ERRFN(err_get_item)(&d);
+        if (!p)
                 {
-                d.error=ERR_PACK(l,0,r);
-                p=(ERR_STRING_DATA *)lh_retrieve(error_hash,(char *)&d);
-                if (p == NULL)
-                        {
-                        d.error=ERR_PACK(0,0,r);
-                        p=(ERR_STRING_DATA *)lh_retrieve(error_hash,
-                                (char *)&d);
-                        }
+                d.error=ERR_PACK(0,0,r);
+                p=ERRFN(err_get_item)(&d);
                 }
-
-        CRYPTO_r_unlock(CRYPTO_LOCK_ERR_HASH);
-
         return((p == NULL)?NULL:p->string);
         }
 
-static unsigned long err_hash(a)
-ERR_STRING_DATA *a;
+/* static unsigned long err_hash(ERR_STRING_DATA *a) */
+static unsigned long err_hash(const void *a_void)
         {
         unsigned long ret,l;
 
-        l=a->error;
+        l=((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(a,b)
-ERR_STRING_DATA *a,*b;
+/* 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)(a->error-b->error));
+        return((int)(((ERR_STRING_DATA *)a_void)->error -
+                        ((ERR_STRING_DATA *)b_void)->error));
         }
 
-static unsigned long pid_hash(a)
-ERR_STATE *a;
+/* static unsigned long pid_hash(ERR_STATE *a) */
+static unsigned long pid_hash(const void *a_void)
         {
-        return(a->pid*13);
+        return(((ERR_STATE *)a_void)->pid*13);
         }
 
-static int pid_cmp(a,b)
-ERR_STATE *a,*b;
+/* 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)a->pid - (long)b->pid));
+        return((int)((long)((ERR_STATE *)a_void)->pid -
+                        (long)((ERR_STATE *)b_void)->pid));
         }
 
-void ERR_remove_state(pid)
-unsigned long pid;
+void ERR_remove_state(unsigned long pid)
         {
-        ERR_STATE *p,tmp;
+        ERR_STATE tmp;
 
-        if (thread_hash == NULL)
-                return;
+        err_fns_check();
         if (pid == 0)
                 pid=(unsigned long)CRYPTO_thread_id();
         tmp.pid=pid;
-        CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-        p=(ERR_STATE *)lh_delete(thread_hash,(char *)&tmp);
-        CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-
-        if (p != NULL) ERR_STATE_free(p);
+        /* thread_del_item automatically destroys the LHASH if the number of
+         * items reaches zero. */
+        ERRFN(thread_del_item)(&tmp);
         }
 
-ERR_STATE *ERR_get_state()
+ERR_STATE *ERR_get_state(void)
         {
         static ERR_STATE fallback;
-        ERR_STATE *ret=NULL,tmp,*tmpp;
+        ERR_STATE *ret,tmp,*tmpp=NULL;
         int i;
         unsigned long pid;
 
+        err_fns_check();
         pid=(unsigned long)CRYPTO_thread_id();
-
-        CRYPTO_r_lock(CRYPTO_LOCK_ERR);
-        if (thread_hash == NULL)
-                {
-                CRYPTO_r_unlock(CRYPTO_LOCK_ERR);
-                CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-                if (thread_hash == NULL)
-                        {
-                        thread_hash=lh_new(pid_hash,pid_cmp);
-                        CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-                        if (thread_hash == NULL) return(&fallback);
-                        }
-                else
-                        CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-                }
-        else
-                {
-                tmp.pid=pid;
-                ret=(ERR_STATE *)lh_retrieve(thread_hash,(char *)&tmp);
-                CRYPTO_r_unlock(CRYPTO_LOCK_ERR);
-                }
+        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 *)Malloc(sizeof(ERR_STATE));
+                ret=(ERR_STATE *)OPENSSL_malloc(sizeof(ERR_STATE));
                 if (ret == NULL) return(&fallback);
                 ret->pid=pid;
                 ret->top=0;
@@ -566,27 +953,28 @@ ERR_STATE *ERR_get_state()
                         ret->err_data[i]=NULL;
                         ret->err_data_flags[i]=0;
                         }
-                CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-                tmpp=(ERR_STATE *)lh_insert(thread_hash,(char *)ret);
-                CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-                if (tmpp != NULL) /* old entry - should not happen */
+                tmpp = ERRFN(thread_set_item)(ret);
+                /* To check if insertion failed, do a get. */
+                if (ERRFN(thread_get_item)(ret) != ret)
                         {
-                        ERR_STATE_free(tmpp);
+                        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);
+        return ret;
         }
 
-int ERR_get_next_error_library()
+int ERR_get_next_error_library(void)
         {
-        static int value=ERR_LIB_USER;
-
-        return(value++);
+        err_fns_check();
+        return ERRFN(get_next_lib)();
         }
 
-void ERR_set_error_data(data,flags)
-char *data;
-int flags;
+void ERR_set_error_data(char *data, int flags)
         {
         ERR_STATE *es;
         int i;
@@ -597,37 +985,39 @@ int flags;
         if (i == 0)
                 i=ERR_NUM_ERRORS-1;
 
+        err_clear_data(es,i);
         es->err_data[i]=data;
-        es->err_data_flags[es->top]=flags;
+        es->err_data_flags[i]=flags;
         }
 
-void ERR_add_error_data( VAR_PLIST(int , num))
-VAR_ALIST
-        {
-        VAR_BDEFN(args, int, num);
+void ERR_add_error_data(int num, ...)
+        {
+        va_list args;
         int i,n,s;
         char *str,*p,*a;
 
-        s=64;
-        str=Malloc(s+1);
+        s=80;
+        str=OPENSSL_malloc(s+1);
         if (str == NULL) return;
         str[0]='\0';
 
-        VAR_INIT(args,int,num);
+        va_start(args, num);
         n=0;
         for (i=0; i<num; i++)
                 {
-                VAR_ARG(args,char *,a);
-                if (a != NULL) {
+                a=va_arg(args, char*);
+                /* ignore NULLs, thanks to Bob Beck <beck@obtuse.com> */
+                if (a != NULL)
+                        {
                         n+=strlen(a);
                         if (n > s)
                                 {
                                 s=n+20;
-                                p=Realloc(str,s+1);
+                                p=OPENSSL_realloc(str,s+1);
                                 if (p == NULL)
                                         {
-                                        Free(str);
-                                        return;
+                                        OPENSSL_free(str);
+                                        goto err;
                                         }
                                 else
                                         str=p;
@@ -637,6 +1027,6 @@ VAR_ALIST
                 }
         ERR_set_error_data(str,ERR_TXT_MALLOCED|ERR_TXT_STRING);
 
-        VAR_END( args );
+err:
+        va_end(args);
         }
-
diff --git a/src/lib/libcrypto/err/err.h b/src/lib/libcrypto/err/err.h
index 75f931be11..cc9bb649ea 100644
--- a/src/lib/libcrypto/err/err.h
+++ b/src/lib/libcrypto/err/err.h
@@ -59,17 +59,23 @@
 #ifndef HEADER_ERR_H
 #define HEADER_ERR_H
 
-#ifdef  __cplusplus
-extern "C" {
+#ifndef OPENSSL_NO_FP_API
+#include <stdio.h>
+#include <stdlib.h>
 #endif
 
-/* The following is a bit of a trick to help the object files only contain
- * the 'name of the file' string once.  Since 'err.h' is protected by the
- * HEADER_ERR_H stuff, this should be included only once per file. */
+#ifndef OPENSSL_NO_BIO
+#include <openssl/bio.h>
+#endif
+#ifndef OPENSSL_NO_LHASH
+#include <openssl/lhash.h>
+#endif
 
-#define ERR_file_name   __FILE__
+#ifdef  __cplusplus
+extern "C" {
+#endif
 
-#ifndef NO_ERR
+#ifndef OPENSSL_NO_ERR
 #define ERR_PUT_error(a,b,c,d,e)        ERR_put_error(a,b,c,d,e)
 #else
 #define ERR_PUT_error(a,b,c,d,e)        ERR_put_error(a,b,c,NULL,0)
@@ -87,7 +93,7 @@ typedef struct err_state_st
         unsigned long err_buffer[ERR_NUM_ERRORS];
         char *err_data[ERR_NUM_ERRORS];
         int err_data_flags[ERR_NUM_ERRORS];
-        char *err_file[ERR_NUM_ERRORS];
+        const char *err_file[ERR_NUM_ERRORS];
         int err_line[ERR_NUM_ERRORS];
         int top,bottom;
         } ERR_STATE;
@@ -104,43 +110,55 @@ typedef struct err_state_st
 #define ERR_LIB_PEM             9
 #define ERR_LIB_DSA             10
 #define ERR_LIB_X509            11
-#define ERR_LIB_METH            12
+/* #define ERR_LIB_METH         12 */
 #define ERR_LIB_ASN1            13
 #define ERR_LIB_CONF            14
 #define ERR_LIB_CRYPTO          15
+#define ERR_LIB_EC              16
 #define ERR_LIB_SSL             20
-#define ERR_LIB_SSL23           21
-#define ERR_LIB_SSL2            22
-#define ERR_LIB_SSL3            23
-#define ERR_LIB_RSAREF          30
-#define ERR_LIB_PROXY           31
+/* #define ERR_LIB_SSL23        21 */
+/* #define ERR_LIB_SSL2         22 */
+/* #define ERR_LIB_SSL3         23 */
+/* #define ERR_LIB_RSAREF       30 */
+/* #define ERR_LIB_PROXY        31 */
 #define ERR_LIB_BIO             32
 #define ERR_LIB_PKCS7           33
+#define ERR_LIB_X509V3          34
+#define ERR_LIB_PKCS12          35
+#define ERR_LIB_RAND            36
+#define ERR_LIB_DSO             37
+#define ERR_LIB_ENGINE          38
+#define ERR_LIB_OCSP            39
+#define ERR_LIB_UI              40
+#define ERR_LIB_COMP            41
 
 #define ERR_LIB_USER            128
 
-#define SYSerr(f,r)  ERR_PUT_error(ERR_LIB_SYS,(f),(r),ERR_file_name,__LINE__)
-#define BNerr(f,r)   ERR_PUT_error(ERR_LIB_BN,(f),(r),ERR_file_name,__LINE__)
-#define RSAerr(f,r)  ERR_PUT_error(ERR_LIB_RSA,(f),(r),ERR_file_name,__LINE__)
-#define DHerr(f,r)   ERR_PUT_error(ERR_LIB_DH,(f),(r),ERR_file_name,__LINE__)
-#define EVPerr(f,r)  ERR_PUT_error(ERR_LIB_EVP,(f),(r),ERR_file_name,__LINE__)
-#define BUFerr(f,r)  ERR_PUT_error(ERR_LIB_BUF,(f),(r),ERR_file_name,__LINE__)
-#define BIOerr(f,r)  ERR_PUT_error(ERR_LIB_BIO,(f),(r),ERR_file_name,__LINE__)
-#define OBJerr(f,r)  ERR_PUT_error(ERR_LIB_OBJ,(f),(r),ERR_file_name,__LINE__)
-#define PEMerr(f,r)  ERR_PUT_error(ERR_LIB_PEM,(f),(r),ERR_file_name,__LINE__)
-#define DSAerr(f,r)  ERR_PUT_error(ERR_LIB_DSA,(f),(r),ERR_file_name,__LINE__)
-#define X509err(f,r) ERR_PUT_error(ERR_LIB_X509,(f),(r),ERR_file_name,__LINE__)
-#define METHerr(f,r) ERR_PUT_error(ERR_LIB_METH,(f),(r),ERR_file_name,__LINE__)
-#define ASN1err(f,r) ERR_PUT_error(ERR_LIB_ASN1,(f),(r),ERR_file_name,__LINE__)
-#define CONFerr(f,r) ERR_PUT_error(ERR_LIB_CONF,(f),(r),ERR_file_name,__LINE__)
-#define CRYPTOerr(f,r) ERR_PUT_error(ERR_LIB_CRYPTO,(f),(r),ERR_file_name,__LINE__)
-#define SSLerr(f,r)  ERR_PUT_error(ERR_LIB_SSL,(f),(r),ERR_file_name,__LINE__)
-#define SSL23err(f,r) ERR_PUT_error(ERR_LIB_SSL23,(f),(r),ERR_file_name,__LINE__)
-#define SSL2err(f,r) ERR_PUT_error(ERR_LIB_SSL2,(f),(r),ERR_file_name,__LINE__)
-#define SSL3err(f,r) ERR_PUT_error(ERR_LIB_SSL3,(f),(r),ERR_file_name,__LINE__)
-#define RSAREFerr(f,r) ERR_PUT_error(ERR_LIB_RSAREF,(f),(r),ERR_file_name,__LINE__)
-#define PROXYerr(f,r) ERR_PUT_error(ERR_LIB_PROXY,(f),(r),ERR_file_name,__LINE__)
-#define PKCS7err(f,r) ERR_PUT_error(ERR_LIB_PKCS7,(f),(r),ERR_file_name,__LINE__)
+#define SYSerr(f,r)  ERR_PUT_error(ERR_LIB_SYS,(f),(r),__FILE__,__LINE__)
+#define BNerr(f,r)   ERR_PUT_error(ERR_LIB_BN,(f),(r),__FILE__,__LINE__)
+#define RSAerr(f,r)  ERR_PUT_error(ERR_LIB_RSA,(f),(r),__FILE__,__LINE__)
+#define DHerr(f,r)   ERR_PUT_error(ERR_LIB_DH,(f),(r),__FILE__,__LINE__)
+#define EVPerr(f,r)  ERR_PUT_error(ERR_LIB_EVP,(f),(r),__FILE__,__LINE__)
+#define BUFerr(f,r)  ERR_PUT_error(ERR_LIB_BUF,(f),(r),__FILE__,__LINE__)
+#define OBJerr(f,r)  ERR_PUT_error(ERR_LIB_OBJ,(f),(r),__FILE__,__LINE__)
+#define PEMerr(f,r)  ERR_PUT_error(ERR_LIB_PEM,(f),(r),__FILE__,__LINE__)
+#define DSAerr(f,r)  ERR_PUT_error(ERR_LIB_DSA,(f),(r),__FILE__,__LINE__)
+#define X509err(f,r) ERR_PUT_error(ERR_LIB_X509,(f),(r),__FILE__,__LINE__)
+#define ASN1err(f,r) ERR_PUT_error(ERR_LIB_ASN1,(f),(r),__FILE__,__LINE__)
+#define CONFerr(f,r) ERR_PUT_error(ERR_LIB_CONF,(f),(r),__FILE__,__LINE__)
+#define CRYPTOerr(f,r) ERR_PUT_error(ERR_LIB_CRYPTO,(f),(r),__FILE__,__LINE__)
+#define ECerr(f,r)   ERR_PUT_error(ERR_LIB_EC,(f),(r),__FILE__,__LINE__)
+#define SSLerr(f,r)  ERR_PUT_error(ERR_LIB_SSL,(f),(r),__FILE__,__LINE__)
+#define BIOerr(f,r)  ERR_PUT_error(ERR_LIB_BIO,(f),(r),__FILE__,__LINE__)
+#define PKCS7err(f,r) ERR_PUT_error(ERR_LIB_PKCS7,(f),(r),__FILE__,__LINE__)
+#define X509V3err(f,r) ERR_PUT_error(ERR_LIB_X509V3,(f),(r),__FILE__,__LINE__)
+#define PKCS12err(f,r) ERR_PUT_error(ERR_LIB_PKCS12,(f),(r),__FILE__,__LINE__)
+#define RANDerr(f,r) ERR_PUT_error(ERR_LIB_RAND,(f),(r),__FILE__,__LINE__)
+#define DSOerr(f,r) ERR_PUT_error(ERR_LIB_DSO,(f),(r),__FILE__,__LINE__)
+#define ENGINEerr(f,r) ERR_PUT_error(ERR_LIB_ENGINE,(f),(r),__FILE__,__LINE__)
+#define OCSPerr(f,r) ERR_PUT_error(ERR_LIB_OCSP,(f),(r),__FILE__,__LINE__)
+#define UIerr(f,r) ERR_PUT_error(ERR_LIB_UI,(f),(r),__FILE__,__LINE__)
+#define COMPerr(f,r) ERR_PUT_error(ERR_LIB_COMP,(f),(r),__FILE__,__LINE__)
 
 /* Borland C seems too stupid to be able to shift and do longs in
  * the pre-processor :-( */
@@ -152,7 +170,8 @@ typedef struct err_state_st
 #define ERR_GET_REASON(l)       (int)((l)&0xfffL)
 #define ERR_FATAL_ERROR(l)      (int)((l)&ERR_R_FATAL)
 
-/* OS fuctions */
+
+/* OS functions */
 #define SYS_F_FOPEN             1
 #define SYS_F_CONNECT           2
 #define SYS_F_GETSERVBYNAME     3
@@ -162,123 +181,114 @@ typedef struct err_state_st
 #define SYS_F_LISTEN            7
 #define SYS_F_ACCEPT            8
 #define SYS_F_WSASTARTUP        9 /* Winsock stuff */
+#define SYS_F_OPENDIR           10
+
 
-#define ERR_R_FATAL             32      
 /* reasons */
-#define ERR_R_SYS_LIB   ERR_LIB_SYS
-#define ERR_R_BN_LIB    ERR_LIB_BN
-#define ERR_R_RSA_LIB   ERR_LIB_RSA
-#define ERR_R_DSA_LIB   ERR_LIB_DSA
-#define ERR_R_DH_LIB    ERR_LIB_DH
-#define ERR_R_EVP_LIB   ERR_LIB_EVP
-#define ERR_R_BUF_LIB   ERR_LIB_BUF
-#define ERR_R_BIO_LIB   ERR_LIB_BIO
-#define ERR_R_OBJ_LIB   ERR_LIB_OBJ
-#define ERR_R_PEM_LIB   ERR_LIB_PEM
-#define ERR_R_X509_LIB  ERR_LIB_X509
-#define ERR_R_METH_LIB  ERR_LIB_METH
-#define ERR_R_ASN1_LIB  ERR_LIB_ASN1
-#define ERR_R_CONF_LIB  ERR_LIB_CONF
-#define ERR_R_CRYPTO_LIB ERR_LIB_CRYPTO
-#define ERR_R_SSL_LIB   ERR_LIB_SSL
-#define ERR_R_SSL23_LIB ERR_LIB_SSL23
-#define ERR_R_SSL2_LIB  ERR_LIB_SSL2
-#define ERR_R_SSL3_LIB  ERR_LIB_SSL3
-#define ERR_R_PROXY_LIB ERR_LIB_PROXY
-#define ERR_R_BIO_LIB   ERR_LIB_BIO
-#define ERR_R_PKCS7_LIB ERR_LIB_PKCS7
+#define ERR_R_SYS_LIB   ERR_LIB_SYS       /* 2 */
+#define ERR_R_BN_LIB    ERR_LIB_BN        /* 3 */
+#define ERR_R_RSA_LIB   ERR_LIB_RSA       /* 4 */
+#define ERR_R_DH_LIB    ERR_LIB_DH        /* 5 */
+#define ERR_R_EVP_LIB   ERR_LIB_EVP       /* 6 */
+#define ERR_R_BUF_LIB   ERR_LIB_BUF       /* 7 */
+#define ERR_R_OBJ_LIB   ERR_LIB_OBJ       /* 8 */
+#define ERR_R_PEM_LIB   ERR_LIB_PEM       /* 9 */
+#define ERR_R_DSA_LIB   ERR_LIB_DSA      /* 10 */
+#define ERR_R_X509_LIB  ERR_LIB_X509     /* 11 */
+#define ERR_R_ASN1_LIB  ERR_LIB_ASN1     /* 13 */
+#define ERR_R_CONF_LIB  ERR_LIB_CONF     /* 14 */
+#define ERR_R_CRYPTO_LIB ERR_LIB_CRYPTO  /* 15 */
+#define ERR_R_EC_LIB    ERR_LIB_EC       /* 16 */
+#define ERR_R_SSL_LIB   ERR_LIB_SSL      /* 20 */
+#define ERR_R_BIO_LIB   ERR_LIB_BIO      /* 32 */
+#define ERR_R_PKCS7_LIB ERR_LIB_PKCS7    /* 33 */
+#define ERR_R_X509V3_LIB ERR_LIB_X509V3  /* 34 */
+#define ERR_R_PKCS12_LIB ERR_LIB_PKCS12  /* 35 */
+#define ERR_R_RAND_LIB  ERR_LIB_RAND     /* 36 */
+#define ERR_R_DSO_LIB   ERR_LIB_DSO      /* 37 */
+#define ERR_R_ENGINE_LIB ERR_LIB_ENGINE  /* 38 */
+#define ERR_R_OCSP_LIB  ERR_LIB_OCSP     /* 39 */
+#define ERR_R_UI_LIB    ERR_LIB_UI       /* 40 */
+#define ERR_R_COMP_LIB  ERR_LIB_COMP     /* 41 */
+
+#define ERR_R_NESTED_ASN1_ERROR                 58
+#define ERR_R_BAD_ASN1_OBJECT_HEADER            59
+#define ERR_R_BAD_GET_ASN1_OBJECT_CALL          60
+#define ERR_R_EXPECTING_AN_ASN1_SEQUENCE        61
+#define ERR_R_ASN1_LENGTH_MISMATCH              62
+#define ERR_R_MISSING_ASN1_EOS                  63
 
 /* fatal error */
+#define ERR_R_FATAL                             64
 #define ERR_R_MALLOC_FAILURE                    (1|ERR_R_FATAL)
 #define ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED       (2|ERR_R_FATAL)
 #define ERR_R_PASSED_NULL_PARAMETER             (3|ERR_R_FATAL)
+#define ERR_R_INTERNAL_ERROR                    (4|ERR_R_FATAL)
+
+/* 99 is the maximum possible ERR_R_... code, higher values
+ * are reserved for the individual libraries */
+
 
 typedef struct ERR_string_data_st
         {
         unsigned long error;
-        char *string;
+        const char *string;
         } ERR_STRING_DATA;
 
-#ifndef NOPROTO
-void ERR_put_error(int lib, int func,int reason,char *file,int line);
+void ERR_put_error(int lib, int func,int reason,const char *file,int line);
 void ERR_set_error_data(char *data,int flags);
 
-unsigned long ERR_get_error(void );
-unsigned long ERR_get_error_line(char **file,int *line);
-unsigned long ERR_get_error_line_data(char **file,int *line,
-                char **data, int *flags);
-unsigned long ERR_peek_error(void );
-unsigned long ERR_peek_error_line(char **file,int *line);
-unsigned long ERR_peek_error_line_data(char **file,int *line,
-                char **data,int *flags);
+unsigned long ERR_get_error(void);
+unsigned long ERR_get_error_line(const char **file,int *line);
+unsigned long ERR_get_error_line_data(const char **file,int *line,
+                                      const char **data, int *flags);
+unsigned long ERR_peek_error(void);
+unsigned long ERR_peek_error_line(const char **file,int *line);
+unsigned long ERR_peek_error_line_data(const char **file,int *line,
+                                       const char **data,int *flags);
+unsigned long ERR_peek_last_error(void);
+unsigned long ERR_peek_last_error_line(const char **file,int *line);
+unsigned long ERR_peek_last_error_line_data(const char **file,int *line,
+                                       const char **data,int *flags);
 void ERR_clear_error(void );
 char *ERR_error_string(unsigned long e,char *buf);
-char *ERR_lib_error_string(unsigned long e);
-char *ERR_func_error_string(unsigned long e);
-char *ERR_reason_error_string(unsigned long e);
-#ifndef NO_FP_API
+void ERR_error_string_n(unsigned long e, char *buf, size_t len);
+const char *ERR_lib_error_string(unsigned long e);
+const char *ERR_func_error_string(unsigned long e);
+const char *ERR_reason_error_string(unsigned long e);
+void ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u),
+                         void *u);
+#ifndef OPENSSL_NO_FP_API
 void ERR_print_errors_fp(FILE *fp);
 #endif
-#ifdef HEADER_BIO_H
+#ifndef OPENSSL_NO_BIO
 void ERR_print_errors(BIO *bp);
-void ERR_add_error_data( VAR_PLIST( int, num ) );
+void ERR_add_error_data(int num, ...);
 #endif
 void ERR_load_strings(int lib,ERR_STRING_DATA str[]);
-void ERR_load_ERR_strings(void );
-void ERR_load_crypto_strings(void );
-void ERR_free_strings(void );
+void ERR_unload_strings(int lib,ERR_STRING_DATA str[]);
+void ERR_load_ERR_strings(void);
+void ERR_load_crypto_strings(void);
+void ERR_free_strings(void);
 
 void ERR_remove_state(unsigned long pid); /* if zero we look it up */
 ERR_STATE *ERR_get_state(void);
 
-#ifdef HEADER_LHASH_H
-LHASH *ERR_get_string_table(void );
-LHASH *ERR_get_err_state_table(void );
-#else
-char *ERR_get_string_table(void );
-char *ERR_get_err_state_table(void );
-#endif
-
-int ERR_get_next_error_library(void );
-
-#else
-
-void ERR_put_error();
-void ERR_set_error_data();
-
-unsigned long ERR_get_error();
-unsigned long ERR_get_error_line();
-unsigned long ERR_peek_error();
-unsigned long ERR_peek_error_line();
-void ERR_clear_error();
-char *ERR_error_string();
-char *ERR_lib_error_string();
-char *ERR_func_error_string();
-char *ERR_reason_error_string();
-#ifndef NO_FP_API
-void ERR_print_errors_fp();
-#endif
-void ERR_print_errors();
-void ERR_add_error_data();
-void ERR_load_strings();
-void ERR_load_ERR_strings();
-void ERR_load_crypto_strings();
-void ERR_free_strings();
-
-void ERR_remove_state();
-ERR_STATE *ERR_get_state();
-
-#ifdef HEADER_LHASH_H
-LHASH *ERR_get_string_table();
-LHASH *ERR_get_err_state_table();
-#else
-char *ERR_get_string_table();
-char *ERR_get_err_state_table();
+#ifndef OPENSSL_NO_LHASH
+LHASH *ERR_get_string_table(void);
+LHASH *ERR_get_err_state_table(void);
 #endif
 
-int ERR_get_next_error_library();
+int ERR_get_next_error_library(void);
 
-#endif
+/* This opaque type encapsulates the low-level error-state functions */
+typedef struct st_ERR_FNS ERR_FNS;
+/* An application can use this function and provide the return value to loaded
+ * modules that should use the application's ERR state/functionality */
+const ERR_FNS *ERR_get_implementation(void);
+/* A loaded module should call this function prior to any ERR operations using
+ * the application's "ERR_FNS". */
+int ERR_set_implementation(const ERR_FNS *fns);
 
 #ifdef  __cplusplus
 }
diff --git a/src/lib/libcrypto/err/err_all.c b/src/lib/libcrypto/err/err_all.c
index f874268e1a..90029fd159 100644
--- a/src/lib/libcrypto/err/err_all.c
+++ b/src/lib/libcrypto/err/err_all.c
@@ -57,60 +57,73 @@
  */
 
 #include <stdio.h>
-#include "asn1.h"
-#include "bn.h"
-#include "buffer.h"
-#include "bio.h"
-#ifndef NO_RSA
-#include "rsa.h"
+#include <openssl/asn1.h>
+#include <openssl/bn.h>
+#ifndef OPENSSL_NO_EC
+#include <openssl/ec.h>
 #endif
-#ifdef RSAref
-#include "rsaref.h"
+#include <openssl/buffer.h>
+#include <openssl/bio.h>
+#ifndef OPENSSL_NO_RSA
+#include <openssl/rsa.h>
 #endif
-#ifndef NO_DH
-#include "dh.h"
+#ifndef OPENSSL_NO_DH
+#include <openssl/dh.h>
 #endif
-#ifndef NO_DSA
-#include "dsa.h"
+#ifndef OPENSSL_NO_DSA
+#include <openssl/dsa.h>
 #endif
-#include "evp.h"
-#include "objects.h"
-#include "pem.h"
-#include "x509.h"
-#include "conf.h"
-#include "err.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/pem2.h>
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
+#include <openssl/conf.h>
+#include <openssl/pkcs12.h>
+#include <openssl/rand.h>
+#include <openssl/dso.h>
+#include <openssl/engine.h>
+#include <openssl/ocsp.h>
+#include <openssl/err.h>
 
-void ERR_load_crypto_strings()
+void ERR_load_crypto_strings(void)
         {
         static int done=0;
 
         if (done) return;
         done=1;
-#ifndef NO_ERR
-        ERR_load_ASN1_strings();
+#ifndef OPENSSL_NO_ERR
+        ERR_load_ERR_strings(); /* include error strings for SYSerr */
         ERR_load_BN_strings();
-        ERR_load_BUF_strings();
-        ERR_load_BIO_strings();
-        ERR_load_CONF_strings();
-#ifndef NO_RSA
-#ifdef RSAref
-        ERR_load_RSAREF_strings();
-#else
+#ifndef OPENSSL_NO_RSA
         ERR_load_RSA_strings();
 #endif
-#endif
-#ifndef NO_DH
+#ifndef OPENSSL_NO_DH
         ERR_load_DH_strings();
 #endif
-#ifndef NO_DSA
-        ERR_load_DSA_strings();
-#endif
-        ERR_load_ERR_strings();
         ERR_load_EVP_strings();
+        ERR_load_BUF_strings();
         ERR_load_OBJ_strings();
         ERR_load_PEM_strings();
+#ifndef OPENSSL_NO_DSA
+        ERR_load_DSA_strings();
+#endif
         ERR_load_X509_strings();
+        ERR_load_ASN1_strings();
+        ERR_load_CONF_strings();
         ERR_load_CRYPTO_strings();
-        ERR_load_PKCS7_strings();
+#ifndef OPENSSL_NO_EC
+        ERR_load_EC_strings();
+#endif
+        /* skip ERR_load_SSL_strings() because it is not in this library */
+        ERR_load_BIO_strings();
+        ERR_load_PKCS7_strings();       
+        ERR_load_X509V3_strings();
+        ERR_load_PKCS12_strings();
+        ERR_load_RAND_strings();
+        ERR_load_DSO_strings();
+        ERR_load_ENGINE_strings();
+        ERR_load_OCSP_strings();
+        ERR_load_UI_strings();
 #endif
         }
diff --git a/src/lib/libcrypto/err/err_prn.c b/src/lib/libcrypto/err/err_prn.c
index ecd0e7c4fa..c156663f0e 100644
--- a/src/lib/libcrypto/err/err_prn.c
+++ b/src/lib/libcrypto/err/err_prn.c
@@ -57,51 +57,51 @@
  */
 
 #include <stdio.h>
-#include "lhash.h"
-#include "crypto.h"
+#include <openssl/lhash.h>
+#include <openssl/crypto.h>
 #include "cryptlib.h"
-#include "buffer.h"
-#include "err.h"
-#include "crypto.h"
+#include <openssl/buffer.h>
+#include <openssl/err.h>
+#include <openssl/crypto.h>
 
-#ifndef NO_FP_API
-void ERR_print_errors_fp(fp)
-FILE *fp;
+void ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u),
+                         void *u)
         {
         unsigned long l;
-        char buf[200];
-        char *file,*data;
+        char buf[256];
+        char buf2[4096];
+        const char *file,*data;
         int line,flags;
         unsigned long es;
 
         es=CRYPTO_thread_id();
         while ((l=ERR_get_error_line_data(&file,&line,&data,&flags)) != 0)
                 {
-                fprintf(fp,"%lu:%s:%s:%d:%s\n",es,ERR_error_string(l,buf),
-                        file,line,(flags&ERR_TXT_STRING)?data:"");
+                ERR_error_string_n(l, buf, sizeof buf);
+                BIO_snprintf(buf2, sizeof(buf2), "%lu:%s:%s:%d:%s\n", es, buf,
+                        file, line, (flags & ERR_TXT_STRING) ? data : "");
+                cb(buf2, strlen(buf2), u);
                 }
         }
-#endif
 
-void ERR_print_errors(bp)
-BIO *bp;
+#ifndef OPENSSL_NO_FP_API
+static int print_fp(const char *str, size_t len, void *fp)
         {
-        unsigned long l;
-        char buf[256];
-        char buf2[256];
-        char *file,*data;
-        int line,flags;
-        unsigned long es;
+        return fprintf((FILE *)fp, "%s", str);
+        }
+void ERR_print_errors_fp(FILE *fp)
+        {
+        ERR_print_errors_cb(print_fp, fp);
+        }
+#endif
 
-        es=CRYPTO_thread_id();
-        while ((l=ERR_get_error_line_data(&file,&line,&data,&flags)) != 0)
-                {
-                sprintf(buf2,"%lu:%s:%s:%d:",es,ERR_error_string(l,buf),
-                        file,line);
-                BIO_write(bp,buf2,strlen(buf2));
-                if (flags & ERR_TXT_STRING)
-                        BIO_write(bp,data,strlen(data));
-                BIO_write(bp,"\n",1);
-                }
+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/src/lib/libcrypto/err/openssl.ec b/src/lib/libcrypto/err/openssl.ec
index c2a8acff0c..29a69dfdd4 100644
--- a/src/lib/libcrypto/err/openssl.ec
+++ b/src/lib/libcrypto/err/openssl.ec
@@ -1,26 +1,36 @@
+# crypto/err/openssl.ec
+
+# configuration file for util/mkerr.pl
+
+# files that may have to be rewritten by util/mkerr.pl
 L ERR           NONE                            NONE
-L CRYPTO        crypto/crypto.h                 crypto/cpt_err.c
 L BN            crypto/bn/bn.h                  crypto/bn/bn_err.c
 L RSA           crypto/rsa/rsa.h                crypto/rsa/rsa_err.c
-L DSA           crypto/dsa/dsa.h                crypto/dsa/dsa_err.c
 L DH            crypto/dh/dh.h                  crypto/dh/dh_err.c
 L EVP           crypto/evp/evp.h                crypto/evp/evp_err.c
 L BUF           crypto/buffer/buffer.h          crypto/buffer/buf_err.c
-L BIO           crypto/bio/bio.h                crypto/bio/bio_err.c
 L OBJ           crypto/objects/objects.h        crypto/objects/obj_err.c
 L PEM           crypto/pem/pem.h                crypto/pem/pem_err.c
+L DSA           crypto/dsa/dsa.h                crypto/dsa/dsa_err.c
 L X509          crypto/x509/x509.h              crypto/x509/x509_err.c
-L NONE          crypto/x509/x509_vfy.h          NONE
-L X509V3        crypto/x509v3/x509v3.h          crypto/x509v3/v3err.c
-#L METH         crypto/meth/meth.h              crypto/meth/meth_err.c
 L ASN1          crypto/asn1/asn1.h              crypto/asn1/asn1_err.c
 L CONF          crypto/conf/conf.h              crypto/conf/conf_err.c
-#L PROXY                crypto/proxy/proxy.h            crypto/proxy/proxy_err.c
+L CRYPTO        crypto/crypto.h                 crypto/cpt_err.c
+L EC            crypto/ec/ec.h                  crypto/ec/ec_err.c
+L SSL           ssl/ssl.h                       ssl/ssl_err.c
+L BIO           crypto/bio/bio.h                crypto/bio/bio_err.c
 L PKCS7         crypto/pkcs7/pkcs7.h            crypto/pkcs7/pkcs7err.c
+L X509V3        crypto/x509v3/x509v3.h          crypto/x509v3/v3err.c
 L PKCS12        crypto/pkcs12/pkcs12.h          crypto/pkcs12/pk12err.c
-L RSAREF        rsaref/rsaref.h                 rsaref/rsar_err.c
-L SSL           ssl/ssl.h                       ssl/ssl_err.c
-L COMP          crypto/comp/comp.h              crypto/comp/comp_err.c
+L RAND          crypto/rand/rand.h              crypto/rand/rand_err.c
+L DSO           crypto/dso/dso.h                crypto/dso/dso_err.c
+L ENGINE        crypto/engine/engine.h          crypto/engine/eng_err.c
+L OCSP          crypto/ocsp/ocsp.h              crypto/ocsp/ocsp_err.c
+L UI            crypto/ui/ui.h                  crypto/ui/ui_err.c
+
+# additional header files to be scanned for function names
+L NONE          crypto/x509/x509_vfy.h          NONE
+L NONE          crypto/ec/ec_lcl.h              NONE
 
 
 F RSAREF_F_RSA_BN2BIN
@@ -47,11 +57,11 @@ R SSL_R_TLSV1_ALERT_UNKNOWN_CA			1048
 R SSL_R_TLSV1_ALERT_ACCESS_DENIED               1049
 R SSL_R_TLSV1_ALERT_DECODE_ERROR                1050
 R SSL_R_TLSV1_ALERT_DECRYPT_ERROR               1051
-R SSL_R_TLSV1_ALERT_EXPORT_RESTRICION           1060
+R SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION          1060
 R SSL_R_TLSV1_ALERT_PROTOCOL_VERSION            1070
 R SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY       1071
 R SSL_R_TLSV1_ALERT_INTERNAL_ERROR              1080
-R SSL_R_TLSV1_ALERT_USER_CANCLED                1090
+R SSL_R_TLSV1_ALERT_USER_CANCELLED              1090
 R SSL_R_TLSV1_ALERT_NO_RENEGOTIATION            1100
 
 R RSAREF_R_CONTENT_ENCODING                     0x0400