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

Switch kModuleDigestSize to a macro.

Browse Source 
Although the compiler will hopefully optimize it out, this is
technically a VLA. The new Android NDK now warns about this.

Change-Id: Ib9f38dc73c40e90ab61105f29a635c453f1477a1
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/50185
Commit-Queue: David Benjamin <davidben@google.com>
Commit-Queue: Adam Langley <agl@google.com>
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin
2021-10-27 18:20:39 +00:00
committed by Boringssl LUCI CQ
parent 17c38b39ee
commit 91b8924969
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crypto/fipsmodule/self_check/self_check.c
+7 -7
View File
@@ -290,27 +290,27 @@ err:
}
#if defined(OPENSSL_ANDROID)
static const size_t kModuleDigestSize = SHA256_DIGEST_LENGTH;
#define MODULE_DIGEST_SIZE SHA256_DIGEST_LENGTH
#else
static const size_t kModuleDigestSize = SHA512_DIGEST_LENGTH;
#define MODULE_DIGEST_SIZE SHA512_DIGEST_LENGTH
#endif
int boringssl_fips_self_test(
const uint8_t *module_hash, size_t module_hash_len) {
#if defined(BORINGSSL_FIPS_SELF_TEST_FLAG_FILE)
char flag_path[sizeof(kFlagPrefix) + 2*kModuleDigestSize];
char flag_path[sizeof(kFlagPrefix) + 2 * MODULE_DIGEST_SIZE];
if (module_hash_len != 0) {
if (module_hash_len != kModuleDigestSize) {
if (module_hash_len != MODULE_DIGEST_SIZE) {
fprintf(stderr,
"module hash of length %zu does not match expected length %zu\n",
module_hash_len, kModuleDigestSize);
"module hash of length %zu does not match expected length %d\n",
module_hash_len, MODULE_DIGEST_SIZE);
BORINGSSL_FIPS_abort();
}
// Test whether the flag file exists.
memcpy(flag_path, kFlagPrefix, sizeof(kFlagPrefix) - 1);
static const char kHexTable[17] = "0123456789abcdef";
for (size_t i = 0; i < kModuleDigestSize; i++) {
for (size_t i = 0; i < MODULE_DIGEST_SIZE; i++) {
flag_path[sizeof(kFlagPrefix) - 1 + 2 * i] =
kHexTable[module_hash[i] >> 4];
flag_path[sizeof(kFlagPrefix) - 1 + 2 * i + 1] =