Commit 3f42f96
crypto: strengthen argument CHECKs in TurboSHAKE
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
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Xuguang Mei <meixuguang@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>1 parent 7efc2ce commit 3f42f96
1 file changed
Lines changed: 4 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -449,10 +449,10 @@ Maybe<void> TurboShakeTraits::AdditionalConfig( | |||
| 449 | 449 | ||
| 450 | 450 | // args[offset + 1] = domain separation byte (uint32) | |
| 451 | 451 | CHECK(args[offset + 1]->IsUint32()); | |
| 452 | - params->domain_separation = | ||
| 453 | - static_cast<uint8_t>(args[offset + 1].As<Uint32>()->Value()); | ||
| 454 | - CHECK_GE(params->domain_separation, 0x01); | ||
| 455 | - CHECK_LE(params->domain_separation, 0x7F); | ||
| 452 | + uint32_t domain_separation_u32 = args[offset + 1].As<Uint32>()->Value(); | ||
| 453 | + CHECK_GE(domain_separation_u32, 0x01); | ||
| 454 | + CHECK_LE(domain_separation_u32, 0x7F); | ||
| 455 | + params->domain_separation = static_cast<uint8_t>(domain_separation_u32); | ||
| 456 | 456 | ||
| 457 | 457 | // args[offset + 2] = output length in bytes (uint32) | |
| 458 | 458 | CHECK(args[offset + 2]->IsUint32()); | |
0 commit comments