Allow the CHIL engine to load even if dynamic locks aren't registered.

Submitted by: Sander Temme

diff --git a/CHANGES b/CHANGES
index 74da83b5326bca18378298fe6576b0fe36aecfbb..e255b7cdeafc60e920c3423f495ad39b30052234 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -728,13 +728,21 @@
      [NTT]
 
  Changes between 0.9.8i and 0.9.8j  [xx XXX xxxx]
-  
+
+  *) Allow the CHIL engine to be loaded, whether the application is
+        multithreaded or not. (This does not release the developer from the
+        obligation to set up the dynamic locking callbacks.)
+        [Sander Temme <sander@temme.net>]
+
   *) Update Configure code and WIN32 build scripts to support experimental
      code. This is surrounded by OPENSSL_EXPERIMENTAL_FOO and not compiled
      in by default. Using the configuration option "enable-experimental-foo"
      enables it. Use this option for JPAKE.
      [Steve Henson]
 
+  *) Use correct exit code if there is an error in dgst command.
+     [Steve Henson; problem pointed out by Roland Dirlewanger]
+
   *) Add JPAKE support, including demo authentication in s_client and
      s_server.
      [Ben Laurie]

diff --git a/engines/e_chil.c b/engines/e_chil.c
index 2d0bbf26835ef9512bd783b060977b803e043f84..3cf1719e7c661233eb417964ad84e1c977eea0cf 100644 (file)
--- a/engines/e_chil.c
+++ b/engines/e_chil.c
@@ -588,12 +588,6 @@ static int hwcrhk_init(ENGINE *e)
                        hwcrhk_globals.mutex_release = hwcrhk_mutex_unlock;
                        hwcrhk_globals.mutex_destroy = hwcrhk_mutex_destroy;
                        }
-               else if (CRYPTO_get_locking_callback() != NULL)
-                       {
-                       HWCRHKerr(HWCRHK_F_HWCRHK_INIT,HWCRHK_R_LOCKING_MISSING);
-                       ERR_add_error_data(1,"You HAVE to add dynamic locking callbacks via CRYPTO_set_dynlock_{create,lock,destroy}_callback()");
-                       goto err;
-                       }
                }
 
        /* Try and get a context - if not, we may have a DSO but no

diff --git a/engines/e_chil_err.c b/engines/e_chil_err.c
index 3fec95a272bbf3e30e0fb3e02da508ab99e99383..c5983b2fd50076a4f8abc0753fa0ca5988e06079 100644 (file)
--- a/engines/e_chil_err.c
+++ b/engines/e_chil_err.c
@@ -90,7 +90,6 @@ static ERR_STRING_DATA HWCRHK_str_reasons[]=
 {ERR_REASON(HWCRHK_R_CHIL_ERROR)         ,"chil error"},
 {ERR_REASON(HWCRHK_R_CTRL_COMMAND_NOT_IMPLEMENTED),"ctrl command not implemented"},
 {ERR_REASON(HWCRHK_R_DSO_FAILURE)        ,"dso failure"},
-{ERR_REASON(HWCRHK_R_LOCKING_MISSING)    ,"locking missing"},
 {ERR_REASON(HWCRHK_R_MISSING_KEY_COMPONENTS),"missing key components"},
 {ERR_REASON(HWCRHK_R_NOT_INITIALISED)    ,"not initialised"},
 {ERR_REASON(HWCRHK_R_NOT_LOADED)         ,"not loaded"},

diff --git a/engines/e_chil_err.h b/engines/e_chil_err.h
index 051854950a1d02eb7093d80f9776ca1ea48fadbe..3c42a02393d5f1391f27e7e4448c5192e6ed6db3 100644 (file)
--- a/engines/e_chil_err.h
+++ b/engines/e_chil_err.h
@@ -88,7 +88,6 @@ static void ERR_HWCRHK_error(int function, int reason, char *file, int line);
 #define HWCRHK_R_CHIL_ERROR                             102
 #define HWCRHK_R_CTRL_COMMAND_NOT_IMPLEMENTED           103
 #define HWCRHK_R_DSO_FAILURE                            104
-#define HWCRHK_R_LOCKING_MISSING                        114
 #define HWCRHK_R_MISSING_KEY_COMPONENTS                         105
 #define HWCRHK_R_NOT_INITIALISED                        106
 #define HWCRHK_R_NOT_LOADED                             107