diff options
| author | Daniel Axtens <dja@axtens.net> | 2019-03-18 10:22:44 +1100 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2019-03-18 18:13:24 +1000 |
| commit | f643deac417a3ccb27f77670bb2b136de49079d9 (patch) | |
| tree | ae19e5232e22ebf9dc6f05ecdc0f9a5e7b2a1057 /crypto/aes | |
| parent | e2f5081116d8b3dadd602fcf611bc6584ab395f7 (diff) | |
PPC assembly pack: fix copy-paste error in CTR mode
There are two copy-paste errors in handling CTR mode. When dealing
with a 2 or 3 block tail, the code branches to the CBC decryption exit
path, rather than to the CTR exit path.
This can lead to data corruption: in the Linux kernel we have a copy
of this file, and the bug leads to corruption of the IV, which leads
to data corruption when we call the encryption function again later to
encrypt subsequent blocks.
Originally reported to the Linux kernel by Ondrej Mosnáček <omosnacek@gmail.com>
CLA: trivial
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8510)
Diffstat (limited to 'crypto/aes')
| -rwxr-xr-x | crypto/aes/asm/aesp8-ppc.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/aes/asm/aesp8-ppc.pl b/crypto/aes/asm/aesp8-ppc.pl index ce3fae0912..44056e31aa 100755 --- a/crypto/aes/asm/aesp8-ppc.pl +++ b/crypto/aes/asm/aesp8-ppc.pl @@ -1829,7 +1829,7 @@ Lctr32_enc8x_three: stvx_u $out1,$x10,$out stvx_u $out2,$x20,$out addi $out,$out,0x30 - b Lcbc_dec8x_done + b Lctr32_enc8x_done .align 5 Lctr32_enc8x_two: @@ -1841,7 +1841,7 @@ Lctr32_enc8x_two: stvx_u $out0,$x00,$out stvx_u $out1,$x10,$out addi $out,$out,0x20 - b Lcbc_dec8x_done + b Lctr32_enc8x_done .align 5 Lctr32_enc8x_one: |