Skip to content

Commit

Permalink
Fix ChaCha assembly code on 32-bit HPUX itanium systems
Browse files Browse the repository at this point in the history
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:
#17067 (comment)

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 #21681)

(cherry picked from commit 6d38cce)
  • Loading branch information
bernd-edlinger authored and t8m committed Aug 9, 2023
1 parent 5079d2d commit 51a1835
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions crypto/chacha/asm/chacha-ia64.pl
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
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
Expand Down

0 comments on commit 51a1835

Please sign in to comment.