Run util/openssl-format-source -v -c .
Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
@@ -55,100 +55,103 @@
|
||||
|
||||
#include "eng_int.h"
|
||||
|
||||
/* Initialise a engine type for use (or up its functional reference count
|
||||
* if it's already in use). This version is only used internally. */
|
||||
/*
|
||||
* Initialise a engine type for use (or up its functional reference count if
|
||||
* it's already in use). This version is only used internally.
|
||||
*/
|
||||
int engine_unlocked_init(ENGINE *e)
|
||||
{
|
||||
int to_return = 1;
|
||||
{
|
||||
int to_return = 1;
|
||||
|
||||
if((e->funct_ref == 0) && e->init)
|
||||
/* This is the first functional reference and the engine
|
||||
* requires initialisation so we do it now. */
|
||||
to_return = e->init(e);
|
||||
if(to_return)
|
||||
{
|
||||
/* OK, we return a functional reference which is also a
|
||||
* structural reference. */
|
||||
e->struct_ref++;
|
||||
e->funct_ref++;
|
||||
engine_ref_debug(e, 0, 1)
|
||||
engine_ref_debug(e, 1, 1)
|
||||
}
|
||||
return to_return;
|
||||
}
|
||||
if ((e->funct_ref == 0) && e->init)
|
||||
/*
|
||||
* This is the first functional reference and the engine requires
|
||||
* initialisation so we do it now.
|
||||
*/
|
||||
to_return = e->init(e);
|
||||
if (to_return) {
|
||||
/*
|
||||
* OK, we return a functional reference which is also a structural
|
||||
* reference.
|
||||
*/
|
||||
e->struct_ref++;
|
||||
e->funct_ref++;
|
||||
engine_ref_debug(e, 0, 1)
|
||||
engine_ref_debug(e, 1, 1)
|
||||
}
|
||||
return to_return;
|
||||
}
|
||||
|
||||
/* Free a functional reference to a engine type. This version is only used
|
||||
* internally. */
|
||||
/*
|
||||
* Free a functional reference to a engine type. This version is only used
|
||||
* internally.
|
||||
*/
|
||||
int engine_unlocked_finish(ENGINE *e, int unlock_for_handlers)
|
||||
{
|
||||
int to_return = 1;
|
||||
{
|
||||
int to_return = 1;
|
||||
|
||||
/* Reduce the functional reference count here so if it's the terminating
|
||||
* case, we can release the lock safely and call the finish() handler
|
||||
* without risk of a race. We get a race if we leave the count until
|
||||
* after and something else is calling "finish" at the same time -
|
||||
* there's a chance that both threads will together take the count from
|
||||
* 2 to 0 without either calling finish(). */
|
||||
e->funct_ref--;
|
||||
engine_ref_debug(e, 1, -1);
|
||||
if((e->funct_ref == 0) && e->finish)
|
||||
{
|
||||
if(unlock_for_handlers)
|
||||
CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
|
||||
to_return = e->finish(e);
|
||||
if(unlock_for_handlers)
|
||||
CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
|
||||
if(!to_return)
|
||||
return 0;
|
||||
}
|
||||
/*
|
||||
* Reduce the functional reference count here so if it's the terminating
|
||||
* case, we can release the lock safely and call the finish() handler
|
||||
* without risk of a race. We get a race if we leave the count until
|
||||
* after and something else is calling "finish" at the same time -
|
||||
* there's a chance that both threads will together take the count from 2
|
||||
* to 0 without either calling finish().
|
||||
*/
|
||||
e->funct_ref--;
|
||||
engine_ref_debug(e, 1, -1);
|
||||
if ((e->funct_ref == 0) && e->finish) {
|
||||
if (unlock_for_handlers)
|
||||
CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
|
||||
to_return = e->finish(e);
|
||||
if (unlock_for_handlers)
|
||||
CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
|
||||
if (!to_return)
|
||||
return 0;
|
||||
}
|
||||
#ifdef REF_CHECK
|
||||
if(e->funct_ref < 0)
|
||||
{
|
||||
fprintf(stderr,"ENGINE_finish, bad functional reference count\n");
|
||||
abort();
|
||||
}
|
||||
if (e->funct_ref < 0) {
|
||||
fprintf(stderr, "ENGINE_finish, bad functional reference count\n");
|
||||
abort();
|
||||
}
|
||||
#endif
|
||||
/* Release the structural reference too */
|
||||
if(!engine_free_util(e, 0))
|
||||
{
|
||||
ENGINEerr(ENGINE_F_ENGINE_UNLOCKED_FINISH,ENGINE_R_FINISH_FAILED);
|
||||
return 0;
|
||||
}
|
||||
return to_return;
|
||||
}
|
||||
/* Release the structural reference too */
|
||||
if (!engine_free_util(e, 0)) {
|
||||
ENGINEerr(ENGINE_F_ENGINE_UNLOCKED_FINISH, ENGINE_R_FINISH_FAILED);
|
||||
return 0;
|
||||
}
|
||||
return to_return;
|
||||
}
|
||||
|
||||
/* The API (locked) version of "init" */
|
||||
int ENGINE_init(ENGINE *e)
|
||||
{
|
||||
int ret;
|
||||
if(e == NULL)
|
||||
{
|
||||
ENGINEerr(ENGINE_F_ENGINE_INIT,ERR_R_PASSED_NULL_PARAMETER);
|
||||
return 0;
|
||||
}
|
||||
CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
|
||||
ret = engine_unlocked_init(e);
|
||||
CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
|
||||
return ret;
|
||||
}
|
||||
{
|
||||
int ret;
|
||||
if (e == NULL) {
|
||||
ENGINEerr(ENGINE_F_ENGINE_INIT, ERR_R_PASSED_NULL_PARAMETER);
|
||||
return 0;
|
||||
}
|
||||
CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
|
||||
ret = engine_unlocked_init(e);
|
||||
CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* The API (locked) version of "finish" */
|
||||
int ENGINE_finish(ENGINE *e)
|
||||
{
|
||||
int to_return = 1;
|
||||
{
|
||||
int to_return = 1;
|
||||
|
||||
if(e == NULL)
|
||||
{
|
||||
ENGINEerr(ENGINE_F_ENGINE_FINISH,ERR_R_PASSED_NULL_PARAMETER);
|
||||
return 0;
|
||||
}
|
||||
CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
|
||||
to_return = engine_unlocked_finish(e, 1);
|
||||
CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
|
||||
if(!to_return)
|
||||
{
|
||||
ENGINEerr(ENGINE_F_ENGINE_FINISH,ENGINE_R_FINISH_FAILED);
|
||||
return 0;
|
||||
}
|
||||
return to_return;
|
||||
}
|
||||
if (e == NULL) {
|
||||
ENGINEerr(ENGINE_F_ENGINE_FINISH, ERR_R_PASSED_NULL_PARAMETER);
|
||||
return 0;
|
||||
}
|
||||
CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
|
||||
to_return = engine_unlocked_finish(e, 1);
|
||||
CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
|
||||
if (!to_return) {
|
||||
ENGINEerr(ENGINE_F_ENGINE_FINISH, ENGINE_R_FINISH_FAILED);
|
||||
return 0;
|
||||
}
|
||||
return to_return;
|
||||
}
|
||||
|
Reference in New Issue
Block a user