diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2023-08-08 06:48:33 +0200 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2023-08-09 12:23:06 +0200 |
| commit | c9f278393ed459a51cc7984ae231536515e1001c (patch) | |
| tree | e11da6b71294b78b7efdabc138fb81863ec3c2ce | |
| parent | 89661d41e44090ab244652418e449eb1ceec6128 (diff) | |
Fix ChaCha assembly code on 32-bit HPUX itanium systems
This fixes the reported crashes 32-bit HPUX systems due to
raw out and inp pointer values, and adds one nop instruction
on 64-bit systems, like it is done in other assembly modules
for those systems.
The fix was tested by @johnkohl-hcl see:
https://github.com/openssl/openssl/issues/17067#issuecomment-1668468033
Fixes #17067
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21681)
(cherry picked from commit 6d38ccedb25f31dfab232e2669415fd4db18b20e)
| -rw-r--r-- | crypto/chacha/asm/chacha-ia64.pl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/chacha/asm/chacha-ia64.pl b/crypto/chacha/asm/chacha-ia64.pl index b13d972855..78201649d5 100644 --- a/crypto/chacha/asm/chacha-ia64.pl +++ b/crypto/chacha/asm/chacha-ia64.pl @@ -46,6 +46,8 @@ ChaCha20_ctr32: ADDP @k[11]=4,$key .save ar.lc,r3 mov r3=ar.lc } +{ .mmi; ADDP $out=0,$out + ADDP $inp=0,$inp } { .mmi; ADDP $key=0,$key ADDP $counter=0,$counter .save pr,r14 |