mirror of
https://github.com/yuzu-emu/unicorn.git
synced 2025-01-11 13:35:36 +00:00
target/arm: Fix PAuth sbox functions
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 Backports commit de0b1bae6461f67243282555475f88b2384a1eb9 from qemu
This commit is contained in:
parent
1d97d223c3
commit
6127f08028
|
@ -89,7 +89,7 @@ static uint64_t pac_sub(uint64_t i)
|
||||||
uint64_t o = 0;
|
uint64_t o = 0;
|
||||||
int b;
|
int b;
|
||||||
|
|
||||||
for (b = 0; b < 64; b += 16) {
|
for (b = 0; b < 64; b += 4) {
|
||||||
o |= (uint64_t)sub[(i >> b) & 0xf] << b;
|
o |= (uint64_t)sub[(i >> b) & 0xf] << b;
|
||||||
}
|
}
|
||||||
return o;
|
return o;
|
||||||
|
@ -104,7 +104,7 @@ static uint64_t pac_inv_sub(uint64_t i)
|
||||||
uint64_t o = 0;
|
uint64_t o = 0;
|
||||||
int b;
|
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;
|
o |= (uint64_t)inv_sub[(i >> b) & 0xf] << b;
|
||||||
}
|
}
|
||||||
return o;
|
return o;
|
||||||
|
|
Loading…
Reference in a new issue