Commit 0985fd99 authored Jun 20, 2020 by zhanghailiang Committed by zhuyanting Jul 07, 2020

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


Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Vincent DEHORS <vincent.dehors@smile.fr>
Signed-off-by: Adrien GRASSEIN <adrien.grassein@smile.fr>
Message-id: 20200116230809.19078-2-richard.henderson@linaro.org
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>

parent b35dc039

target/arm/pauth_helper.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;