diff options
| author | Simon L. B. Nielsen <simon@FreeBSD.org> | 2009-06-07 19:56:18 +0000 |
|---|---|---|
| committer | Simon L. B. Nielsen <simon@FreeBSD.org> | 2009-06-07 19:56:18 +0000 |
| commit | 518099af59fbde0e7140459c76f59c9ac24bdf9c (patch) | |
| tree | 873f9f63931a5d069bbcb053ea49eec4a92802dc /engines/e_chil.c | |
| parent | c285625302c2411508052af6f109be9f6b789379 (diff) | |
Notes
Diffstat (limited to 'engines/e_chil.c')
| -rw-r--r-- | engines/e_chil.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/engines/e_chil.c b/engines/e_chil.c index 26108caa6494..e1847622ea74 100644 --- a/engines/e_chil.c +++ b/engines/e_chil.c @@ -1,6 +1,6 @@ /* crypto/engine/e_chil.c -*- mode: C; c-file-style: "eay" -*- */ /* Written by Richard Levitte (richard@levitte.org), Geoff Thorpe - * (geoff@geoffthorpe.net) and Dr Stephen N Henson (shenson@bigfoot.com) + * (geoff@geoffthorpe.net) and Dr Stephen N Henson (steve@openssl.org) * for the OpenSSL project 2000. */ /* ==================================================================== @@ -164,11 +164,11 @@ static const ENGINE_CMD_DEFN hwcrhk_cmd_defns[] = { ENGINE_CMD_FLAG_STRING}, {HWCRHK_CMD_FORK_CHECK, "FORK_CHECK", - "Turns fork() checking on or off (boolean)", + "Turns fork() checking on (non-zero) or off (zero)", ENGINE_CMD_FLAG_NUMERIC}, {HWCRHK_CMD_THREAD_LOCKING, "THREAD_LOCKING", - "Turns thread-safe locking on or off (boolean)", + "Turns thread-safe locking on (zero) or off (non-zero)", ENGINE_CMD_FLAG_NUMERIC}, {HWCRHK_CMD_SET_USER_INTERFACE, "SET_USER_INTERFACE", @@ -589,12 +589,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 |