2 Nov 2008 18:19
Re: [PATCH] keep CHIL engine from breaking in non-threaded situations [openssl.org #1736]
Sander Temme <sander <at> temme.net>
2008-11-02 17:19:35 GMT
2008-11-02 17:19:35 GMT
On Oct 29, 2008, at 8:33 AM, Geoff Thorpe wrote:
>> Same patch, applies clean to trunk and to 0.9.8-stable. I actually
>> took it against trunk. Doesn't seem to be touched by make update,
>> unless I'm missing something.
>
> It didn't remove the error string? Can you please try removing it
> manually and verifying everything builds ok? AFAICT, you are orphaning
> an error string that no longer needs to take up space in the code or
> compiled image.
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:
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
<at> <at> -588,12 +588,6 <at> <at>
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);
(Continue reading)
RSS Feed