crypto: strengthen argument CHECKs in TurboSHAKE

tniessen · sxa · commit e8a55ce9b122 · 2026-06-23T01:06:47.000+01:00
Instead of first discarding the top 24 bits of the argument and then checking that the low 8 bits are within the expected range, first check that the original 32-bit integer is within the expected range and then discard the top 24 bits. PR-URL: #62763 Backport-PR-URL: #63563 Reviewed-By: Filip Skokan <panva.ip@gmail.com> Reviewed-By: Xuguang Mei <meixuguang@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
diff --git a/src/crypto/crypto_turboshake.cc b/src/crypto/crypto_turboshake.cc
@@ -449,10 +449,10 @@ Maybe<void> TurboShakeTraits::AdditionalConfig(
 
   // args[offset + 1] = domain separation byte (uint32)
   CHECK(args[offset + 1]->IsUint32());
-  params->domain_separation =
-      static_cast<uint8_t>(args[offset + 1].As<Uint32>()->Value());
-  CHECK_GE(params->domain_separation, 0x01);
-  CHECK_LE(params->domain_separation, 0x7F);
+  uint32_t domain_separation_u32 = args[offset + 1].As<Uint32>()->Value();
+  CHECK_GE(domain_separation_u32, 0x01);
+  CHECK_LE(domain_separation_u32, 0x7F);
+  params->domain_separation = static_cast<uint8_t>(domain_separation_u32);
 
   // args[offset + 2] = output length in bytes (uint32)
   CHECK(args[offset + 2]->IsUint32());
