| Message ID | 20230609022401.684157-32-richard.henderson@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | crypto: Provide aes-round.h and host accel | expand |
On 6/8/23 23:23, Richard Henderson wrote: > This implements the VNCIPHER instruction. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com> > target/ppc/int_helper.c | 19 ++++--------------- > 1 file changed, 4 insertions(+), 15 deletions(-) > > diff --git a/target/ppc/int_helper.c b/target/ppc/int_helper.c > index 1e477924b7..834da80fe3 100644 > --- a/target/ppc/int_helper.c > +++ b/target/ppc/int_helper.c > @@ -2947,22 +2947,11 @@ void helper_vcipherlast(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b) > > void helper_vncipher(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b) > { > - /* This differs from what is written in ISA V2.07. The RTL is */ > - /* incorrect and will be fixed in V2.07B. */ > - int i; > - ppc_avr_t tmp; > + AESState *ad = (AESState *)r; > + AESState *st = (AESState *)a; > + AESState *rk = (AESState *)b; > > - VECTOR_FOR_INORDER_I(i, u8) { > - tmp.VsrB(i) = b->VsrB(i) ^ AES_isbox[a->VsrB(AES_ishifts[i])]; > - } > - > - VECTOR_FOR_INORDER_I(i, u32) { > - r->VsrW(i) = > - AES_imc[tmp.VsrB(4 * i + 0)][0] ^ > - AES_imc[tmp.VsrB(4 * i + 1)][1] ^ > - AES_imc[tmp.VsrB(4 * i + 2)][2] ^ > - AES_imc[tmp.VsrB(4 * i + 3)][3]; > - } > + aesdec_ISB_ISR_AK_IMC(ad, st, rk, true); > } > > void helper_vncipherlast(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b)
On 9/6/23 04:23, Richard Henderson wrote: > This implements the VNCIPHER instruction. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > target/ppc/int_helper.c | 19 ++++--------------- > 1 file changed, 4 insertions(+), 15 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
diff --git a/target/ppc/int_helper.c b/target/ppc/int_helper.c index 1e477924b7..834da80fe3 100644 --- a/target/ppc/int_helper.c +++ b/target/ppc/int_helper.c @@ -2947,22 +2947,11 @@ void helper_vcipherlast(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b) void helper_vncipher(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b) { - /* This differs from what is written in ISA V2.07. The RTL is */ - /* incorrect and will be fixed in V2.07B. */ - int i; - ppc_avr_t tmp; + AESState *ad = (AESState *)r; + AESState *st = (AESState *)a; + AESState *rk = (AESState *)b; - VECTOR_FOR_INORDER_I(i, u8) { - tmp.VsrB(i) = b->VsrB(i) ^ AES_isbox[a->VsrB(AES_ishifts[i])]; - } - - VECTOR_FOR_INORDER_I(i, u32) { - r->VsrW(i) = - AES_imc[tmp.VsrB(4 * i + 0)][0] ^ - AES_imc[tmp.VsrB(4 * i + 1)][1] ^ - AES_imc[tmp.VsrB(4 * i + 2)][2] ^ - AES_imc[tmp.VsrB(4 * i + 3)][3]; - } + aesdec_ISB_ISR_AK_IMC(ad, st, rk, true); } void helper_vncipherlast(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b)
This implements the VNCIPHER instruction. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- target/ppc/int_helper.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-)