ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Use thread_local EVP_MD in isc_iterated_hash()

Browse Source 
Cherry-pick small fixup commit from 9.18/9.16 branches needed for
thread-safety.  This fixup commit is not needed for 9.19+ because of
reworked application setup, but it decouples isc_iterated_hash and
isc_md units and keeps all the branches in sync.
This commit is contained in:
Ondřej Surý
2023-01-18 22:38:27 +01:00
committed by Ondřej Surý
parent 35e2842d00
commit 5abbcdadaf
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/isc/iterated_hash.c
View File

@@ -11,6 +11,7 @@
* information regarding copyright ownership.
*/
#include <stdbool.h>
#include <stdio.h>
#include <openssl/opensslv.h>
@@ -79,11 +80,10 @@ isc__iterated_hash_shutdown(void) {
#include <openssl/evp.h>
#include <isc/md.h>
static thread_local bool initialized = false;
static thread_local EVP_MD_CTX *mdctx = NULL;
static thread_local EVP_MD_CTX *basectx = NULL;
static thread_local EVP_MD *md = NULL;
int
isc_iterated_hash(unsigned char *out, const unsigned int hashalg,
@@ -142,8 +142,10 @@ isc__iterated_hash_initialize(void) {
INSIST(basectx != NULL);
mdctx = EVP_MD_CTX_new();
INSIST(mdctx != NULL);
md = EVP_MD_fetch(NULL, "SHA1", NULL);
INSIST(md != NULL);
RUNTIME_CHECK(EVP_DigestInit_ex(basectx, ISC_MD_SHA1, NULL) == 1);
RUNTIME_CHECK(EVP_DigestInit_ex(basectx, md, NULL) == 1);
initialized = true;
}
@@ -159,6 +161,8 @@ isc__iterated_hash_shutdown(void) {
REQUIRE(basectx != NULL);
EVP_MD_CTX_free(basectx);
basectx = NULL;
EVP_MD_free(md);
md = NULL;
initialized = false;
}