Merge pull request #2389 from dgarske/crypt_init_count

Fixes for wolfCrypt init/cleanup reference count
This commit is contained in:
toddouska 2019-08-02 15:48:36 -07:00 committed by GitHub
commit 6f54a2ec6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -206,9 +206,8 @@ int wolfCrypt_Init(void)
return ret;
}
#endif
initRefCount = 1;
}
initRefCount++;
return ret;
}
@ -219,7 +218,11 @@ int wolfCrypt_Cleanup(void)
{
int ret = 0;
if (initRefCount == 1) {
initRefCount--;
if (initRefCount < 0)
initRefCount = 0;
if (initRefCount == 0) {
WOLFSSL_ENTER("wolfCrypt_Cleanup");
#ifdef HAVE_ECC
@ -250,7 +253,6 @@ int wolfCrypt_Cleanup(void)
#if defined(WOLFSSL_CRYPTOCELL)
cc310_Free();
#endif
initRefCount = 0; /* allow re-init */
}
return ret;