generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge of stuff from main trunk, all conflicts resolved, and addition

Browse Source 
of dynamic lock support in the nCipher code.
This commit is contained in:
Richard Levitte 2000-06-19 17:28:22 +00:00
parent 7ed20a2158
commit b215f70a0e
1 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
crypto/engine/hw_ncipher.c
View File

@ -79,13 +79,11 @@
static int hwcrhk_init(); static int hwcrhk_init();
static int hwcrhk_finish(); static int hwcrhk_finish();
#if 0 /* Not yet supported */
/* Functions to handle mutexes */ /* Functions to handle mutexes */
static int hwcrhk_mutex_init(HWCryptoHook_Mutex*, HWCryptoHook_CallerContext*); static int hwcrhk_mutex_init(HWCryptoHook_Mutex*, HWCryptoHook_CallerContext*);
static int hwcrhk_mutex_lock(HWCryptoHook_Mutex*); static int hwcrhk_mutex_lock(HWCryptoHook_Mutex*);
static void hwcrhk_mutex_unlock(HWCryptoHook_Mutex*); static void hwcrhk_mutex_unlock(HWCryptoHook_Mutex*);
static void hwcrhk_mutex_destroy(HWCryptoHook_Mutex*); static void hwcrhk_mutex_destroy(HWCryptoHook_Mutex*);
#endif
/* BIGNUM stuff */ /* BIGNUM stuff */
static int hwcrhk_mod_exp(BIGNUM *r, BIGNUM *a, const BIGNUM *p, static int hwcrhk_mod_exp(BIGNUM *r, BIGNUM *a, const BIGNUM *p,
@ -367,19 +365,19 @@ static int hwcrhk_init()
goto err; goto err;
} }
if(!(p1 = (HWCryptoHook_Init_t *) if(!(p1 = (HWCryptoHook_Init_t *)
DSO_bind(hwcrhk_dso, n_hwcrhk_Init)) || DSO_bind_func(hwcrhk_dso, n_hwcrhk_Init)) ||
!(p2 = (HWCryptoHook_Finish_t *) !(p2 = (HWCryptoHook_Finish_t *)
DSO_bind(hwcrhk_dso, n_hwcrhk_Finish)) || DSO_bind_func(hwcrhk_dso, n_hwcrhk_Finish)) ||
!(p3 = (HWCryptoHook_ModExp_t *) !(p3 = (HWCryptoHook_ModExp_t *)
DSO_bind(hwcrhk_dso, n_hwcrhk_ModExp)) || DSO_bind_func(hwcrhk_dso, n_hwcrhk_ModExp)) ||
!(p4 = (HWCryptoHook_RSA_t *) !(p4 = (HWCryptoHook_RSA_t *)
DSO_bind(hwcrhk_dso, n_hwcrhk_RSA)) || DSO_bind_func(hwcrhk_dso, n_hwcrhk_RSA)) ||
!(p5 = (HWCryptoHook_RSAUnloadKey_t *) !(p5 = (HWCryptoHook_RSAUnloadKey_t *)
DSO_bind(hwcrhk_dso, n_hwcrhk_RSAUnloadKey)) || DSO_bind_func(hwcrhk_dso, n_hwcrhk_RSAUnloadKey)) ||
!(p6 = (HWCryptoHook_RandomBytes_t *) !(p6 = (HWCryptoHook_RandomBytes_t *)
DSO_bind(hwcrhk_dso, n_hwcrhk_RandomBytes)) || DSO_bind_func(hwcrhk_dso, n_hwcrhk_RandomBytes)) ||
!(p7 = (HWCryptoHook_ModExpCRT_t *) !(p7 = (HWCryptoHook_ModExpCRT_t *)
DSO_bind(hwcrhk_dso, n_hwcrhk_ModExpCRT))) DSO_bind_func(hwcrhk_dso, n_hwcrhk_ModExpCRT)))
{ {
ENGINEerr(ENGINE_F_HWCRHK_INIT,ENGINE_R_DSO_FAILURE); ENGINEerr(ENGINE_F_HWCRHK_INIT,ENGINE_R_DSO_FAILURE);
goto err; goto err;
@ -392,6 +390,19 @@ static int hwcrhk_init()
p_hwcrhk_RSAUnloadKey = p5; p_hwcrhk_RSAUnloadKey = p5;
p_hwcrhk_RandomBytes = p6; p_hwcrhk_RandomBytes = p6;
p_hwcrhk_ModExpCRT = p7; p_hwcrhk_ModExpCRT = p7;
/* Check if the application decided to support dynamic locks,
and if it does, use them. */
if (CRYPTO_get_dynlock_create_callback() != NULL &&
CRYPTO_get_dynlock_lock_callback() != NULL &&
CRYPTO_get_dynlock_destroy_callback() != NULL)
{
hwcrhk_globals.mutex_init = hwcrhk_mutex_init;
hwcrhk_globals.mutex_acquire = hwcrhk_mutex_lock;
hwcrhk_globals.mutex_release = hwcrhk_mutex_unlock;
hwcrhk_globals.mutex_destroy = hwcrhk_mutex_destroy;
}
/* Try and get a context - if not, we may have a DSO but no /* Try and get a context - if not, we may have a DSO but no
* accelerator! */ * accelerator! */
if(!get_context(&hwcrhk_context)) if(!get_context(&hwcrhk_context))
@ -684,33 +695,30 @@ static void hwcrhk_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad,
* these just wrap the POSIX functions and add some logging. * these just wrap the POSIX functions and add some logging.
*/ */
static int hwcrhk_mutex_init(HWCryptoHook_Mutex* mt, HWCryptoHook_CallerContext *cactx) static int hwcrhk_mutex_init(HWCryptoHook_Mutex* mt,
HWCryptoHook_CallerContext *cactx)
{ {
int ret; mt->lockid = CRYPTO_get_new_dynlockid();
ret = CRYPTO_init_lock(mt->lockid, NULL); if (mt->lockid == 0)
return ret; return 0;
return 1;
} }
static int hwcrhk_mutex_lock(HWCryptoHook_Mutex *mt) static int hwcrhk_mutex_lock(HWCryptoHook_Mutex *mt)
{ {
int ret; CRYPTO_w_lock(mt->lockid);
ret = CRYPTO_w_lock(mt->lockid); return 1;
return ret;
} }
void hwcrhk_mutex_unlock(HWCryptoHook_Mutex * mt) void hwcrhk_mutex_unlock(HWCryptoHook_Mutex * mt)
{ {
int ret; CRYPTO_w_unlock(mt->lockid);
ret = CRYPTO_w_unlock(mt->lockid);
} }
static void hwcrhk_mutex_destroy(HWCryptoHook_Mutex *mt) static void hwcrhk_mutex_destroy(HWCryptoHook_Mutex *mt)
{ {
int ret; CRYPTO_destroy_dynlockid(mt->lockid);
ret = CRYPTO_destroy_lock(mt->lockid);
} }
#endif
static void log_message(void *logstream, const char *message) static void log_message(void *logstream, const char *message)
{ {