[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/4] target/arm: Fix PAuth sbox functions
From: |
Richard Henderson |
Subject: |
[PATCH 1/4] target/arm: Fix PAuth sbox functions |
Date: |
Thu, 16 Jan 2020 13:08:06 -1000 |
From: Vincent Dehors <address@hidden>
In the PAC computation, sbox was applied over wrong bits.
As this is a 4-bit sbox, bit index should be incremented by 4 instead of 16.
Test vector from QARMA paper (https://eprint.iacr.org/2016/444.pdf) was
used to verify one computation of the pauth_computepac() function which
uses sbox2.
Launchpad: https://bugs.launchpad.net/bugs/1859713
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Vincent DEHORS <address@hidden>
Signed-off-by: Adrien GRASSEIN <address@hidden>
---
target/arm/pauth_helper.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/target/arm/pauth_helper.c b/target/arm/pauth_helper.c
index d3194f2043..0a5f41e10c 100644
--- a/target/arm/pauth_helper.c
+++ b/target/arm/pauth_helper.c
@@ -89,7 +89,7 @@ static uint64_t pac_sub(uint64_t i)
uint64_t o = 0;
int b;
- for (b = 0; b < 64; b += 16) {
+ for (b = 0; b < 64; b += 4) {
o |= (uint64_t)sub[(i >> b) & 0xf] << b;
}
return o;
@@ -104,7 +104,7 @@ static uint64_t pac_inv_sub(uint64_t i)
uint64_t o = 0;
int b;
- for (b = 0; b < 64; b += 16) {
+ for (b = 0; b < 64; b += 4) {
o |= (uint64_t)inv_sub[(i >> b) & 0xf] << b;
}
return o;
--
2.20.1
- [PATCH 0/4] target/arm: Fix ComputePAC (LP 1859713), Richard Henderson, 2020/01/16
- [PATCH 1/4] target/arm: Fix PAuth sbox functions,
Richard Henderson <=
- [PATCH 3/4] tests/tcg/aarch64: Add pauth-3, Richard Henderson, 2020/01/16
- [PATCH 4/4] tests/tcg/aarch64: Add pauth-4, Richard Henderson, 2020/01/16
- [PATCH 2/4] tests/tcg/aarch64: Fix compilation parameters for pauth-%, Richard Henderson, 2020/01/16
- Re: [PATCH 0/4] target/arm: Fix ComputePAC (LP 1859713), no-reply, 2020/01/17
- Re: [PATCH 0/4] target/arm: Fix ComputePAC (LP 1859713), Peter Maydell, 2020/01/20