From 51a18356ee3303ed9a87c527937a8dbd0a5c7cef Mon Sep 17 00:00:00 2001 From: Bernd Edlinger Date: Tue, 8 Aug 2023 06:48:33 +0200 Subject: [PATCH] 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 Reviewed-by: Paul Dale Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/21681) (cherry picked from commit 6d38ccedb25f31dfab232e2669415fd4db18b20e) --- crypto/chacha/asm/chacha-ia64.pl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/crypto/chacha/asm/chacha-ia64.pl b/crypto/chacha/asm/chacha-ia64.pl index b13d9728557..78201649d55 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 -- 2.47.2