From 865b44a8032d259b4341d1f439ecc4e650704163 Mon Sep 17 00:00:00 2001 From: miod <> Date: Sat, 27 Sep 2014 20:17:52 +0000 Subject: Doh, rev 1.4 had left out one routine with both 32-bit and 64-bit code, where the 64-bit code has to be disabled under OpenBSD/hppa. --- src/lib/libcrypto/modes/asm/ghash-parisc.pl | 2 ++ src/lib/libssl/src/crypto/modes/asm/ghash-parisc.pl | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/lib/libcrypto/modes/asm/ghash-parisc.pl b/src/lib/libcrypto/modes/asm/ghash-parisc.pl index b17ee8858c..965802d3fa 100644 --- a/src/lib/libcrypto/modes/asm/ghash-parisc.pl +++ b/src/lib/libcrypto/modes/asm/ghash-parisc.pl @@ -372,6 +372,7 @@ L\$pic_ghash ldi 0xf0,$mask0xf0 ___ $code.=<<___ if ($SIZE_T==4); +#ifndef __OpenBSD__ ldi 31,$rem mtctl $rem,%cr11 extrd,u,*= $rem,%sar,1,$rem ; executes on PA-RISC 1.0 @@ -481,6 +482,7 @@ $code.=<<___ if ($SIZE_T==4); nop L\$parisc1_ghash +#endif ldb 15($Xi),$nlo ldo 12($Htbl),$Hll ldo 8($Htbl),$Hlh diff --git a/src/lib/libssl/src/crypto/modes/asm/ghash-parisc.pl b/src/lib/libssl/src/crypto/modes/asm/ghash-parisc.pl index b17ee8858c..965802d3fa 100644 --- a/src/lib/libssl/src/crypto/modes/asm/ghash-parisc.pl +++ b/src/lib/libssl/src/crypto/modes/asm/ghash-parisc.pl @@ -372,6 +372,7 @@ L\$pic_ghash ldi 0xf0,$mask0xf0 ___ $code.=<<___ if ($SIZE_T==4); +#ifndef __OpenBSD__ ldi 31,$rem mtctl $rem,%cr11 extrd,u,*= $rem,%sar,1,$rem ; executes on PA-RISC 1.0 @@ -481,6 +482,7 @@ $code.=<<___ if ($SIZE_T==4); nop L\$parisc1_ghash +#endif ldb 15($Xi),$nlo ldo 12($Htbl),$Hll ldo 8($Htbl),$Hlh -- cgit v1.2.3-55-g6feb