Re: [PATCH] keep CHIL engine from breaking in non-threaded situations [openssl.org #1736]

[Sander Temme]

On Nov 11, 2008, at 12:28 AM, Sander Temme wrote:

On Nov 2, 2008, at 9:19 AM, Sander Temme wrote:

The following compiles and tests cleanly on trunk and on the latest snapshot of 0.9.8-stable (with offset 1 in e_chil.c). Also attached to prevent line wrap:

Ping?

Thanks,

S.

Any chance to squeeze this simple, six line patch, that doesn't touch but a single source file, in before 0.9.8j is tagged? Do we need more than Geoff Thorpe's ACK from 10/27/08?

Thanks,

S.

Index: engines/e_chil.c
===================================================================
RCS file: /home/openssl/cvs/openssl/engines/e_chil.c,v
retrieving revision 1.5
diff -u -r1.5 e_chil.c
--- engines/e_chil.c    18 Mar 2006 14:22:20 -0000      1.5
+++ engines/e_chil.c    31 Oct 2008 23:18:30 -0000
@@ -588,12 +588,6 @@
                        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);

-                       goto err;
-                       }
                }

        /* Try and get a context - if not, we may have a DSO but no
Index: engines/e_chil_err.c
===================================================================
RCS file: /home/openssl/cvs/openssl/engines/e_chil_err.c,v
retrieving revision 1.1
diff -u -r1.1 e_chil_err.c
--- engines/e_chil_err.c        29 May 2005 19:14:21 -0000      1.1
+++ engines/e_chil_err.c        31 Oct 2008 23:18:30 -0000
@@ -90,7 +90,6 @@
{ERR_REASON(HWCRHK_R_CHIL_ERROR)         ,"chil error"},

{ERR_REASON(HWCRHK_R_DSO_FAILURE)        ,"dso failure"},
-{ERR_REASON(HWCRHK_R_LOCKING_MISSING)    ,"locking missing"},

{ERR_REASON(HWCRHK_R_NOT_INITIALISED)    ,"not initialised"},
{ERR_REASON(HWCRHK_R_NOT_LOADED)         ,"not loaded"},
Index: engines/e_chil_err.h
===================================================================
RCS file: /home/openssl/cvs/openssl/engines/e_chil_err.h,v
retrieving revision 1.2
diff -u -r1.2 e_chil_err.h
--- engines/e_chil_err.h        18 Apr 2008 07:43:26 -0000      1.2
+++ engines/e_chil_err.h        31 Oct 2008 23:18:30 -0000
@@ -88,7 +88,6 @@
#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

- ERR_add_error_data(1,"You HAVE to add dynamic locking callbacks via CRYPTO_set_dynlock_{create,lock,destroy}_callback()"); {ERR_REASON(HWCRHK_R_CTRL_COMMAND_NOT_IMPLEMENTED),"ctrl command not implemented"}, {ERR_REASON(HWCRHK_R_MISSING_KEY_COMPONENTS),"missing key components"},

--
[EMAIL PROTECTED]              http://www.temme.net/sander/
PGP FP: 51B4 8727 466A 0BC3 69F4  B7B8 B2BE BC40 1529 24AF
<openssl_chil_nolocks_donotbreak.patch>

--
[EMAIL PROTECTED]              http://www.temme.net/sander/
PGP FP: 51B4 8727 466A 0BC3 69F4  B7B8 B2BE BC40 1529 24AF

smime.p7s
Description: S/MIME cryptographic signature