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

Make the use of logstream thread-safe.

Browse Source
This commit is contained in:
Richard Levitte 2000-06-29 16:32:34 +00:00
parent 5971d37400
commit 70d03c4f59
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
crypto/engine/hw_ncipher.c
View File

@ -451,7 +451,8 @@ static int hwcrhk_finish()
goto err; goto err;
} }
err: err:
logstream = NULL; if (logstream)
BIO_free(logstream);
hwcrhk_dso = NULL; hwcrhk_dso = NULL;
p_hwcrhk_Init = NULL; p_hwcrhk_Init = NULL;
p_hwcrhk_Finish = NULL; p_hwcrhk_Finish = NULL;
@ -470,7 +471,15 @@ static int hwcrhk_ctrl(int cmd, long i, void *p, void (*f)())
switch(cmd) switch(cmd)
{ {
case ENGINE_CTRL_SET_LOGSTREAM: case ENGINE_CTRL_SET_LOGSTREAM:
logstream = (BIO *)p; if (logstream)
{
BIO_free(logstream);
logstream = NULL;
}
if (CRYPTO_add(&bio->references,1,CRYPTO_LOCK_BIO) > 1)
logstream = (BIO *)p;
else
ENGINEerr(ENGINE_F_HWCRHK_CTRL,ENGINE_R_BIO_WAS_FREED);
break; break;
default: default:
ENGINEerr(ENGINE_F_HWCRHK_CTRL, ENGINEerr(ENGINE_F_HWCRHK_CTRL,
@ -748,10 +757,15 @@ static void hwcrhk_mutex_destroy(HWCryptoHook_Mutex *mt)
static void log_message(void *logstream, const char *message) static void log_message(void *logstream, const char *message)
{ {
BIO *lstream = NULL; BIO *lstream = NULL;
CRYPTO_w_lock(CRYPTO_LOCK_BIO);
if (logstream) if (logstream)
lstream=*(BIO **)logstream; lstream=*(BIO **)logstream;
if (lstream) if (lstream)
{
BIO_write(lstream, message, strlen(message)); BIO_write(lstream, message, strlen(message));
}
CRYPTO_w_unlock(CRYPTO_LOCK_BIO);
} }
#endif /* HW_NCIPHER */ #endif /* HW_NCIPHER */