OERV-RUNTIME/boringssl
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Zero out FIPS counters.

Browse Source 
MSAN doesn't like the counters starting at whatever value malloc
found to be free.

Change-Id: I0968e61e0025db35b82291fde5d1e193aef77c1e
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/46444
Commit-Queue: Adam Langley <agl@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
Reviewed-by: David Benjamin <davidben@google.com>
This commit is contained in:
Adam Langley
2021-03-29 21:03:11 +00:00
committed by CQ bot account: commit-bot@chromium.org
parent da890de1b5
commit 4aef687fcf
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crypto/fipsmodule/self_check/fips.c
+4 -1
View File
@@ -52,10 +52,13 @@ void boringssl_fips_inc_counter(enum fips_counter_t counter) {
size_t *array =
CRYPTO_get_thread_local(OPENSSL_THREAD_LOCAL_FIPS_COUNTERS);
if (!array) {
array = OPENSSL_malloc(sizeof(size_t) * (fips_counter_max + 1));
const size_t num_bytes = sizeof(size_t) * (fips_counter_max + 1);
array = OPENSSL_malloc(num_bytes);
if (!array) {
return;
}
OPENSSL_memset(array, 0, num_bytes);
if (!CRYPTO_set_thread_local(OPENSSL_THREAD_LOCAL_FIPS_COUNTERS, array,
OPENSSL_free)) {
// |OPENSSL_free| has already been called by |CRYPTO_set_thread_local|.