The assembly sha512 code detects at runtime if it is running on a 64-bit

processor (PA2.0) and, if so, switches to 64-bit code.

However, when running under a 32-bit OpenBSD/hppa kernel, there is no guarantee
that the upper part of the registers will be preserved accross context switches
(or even userland->kernel boundaries), which causes this code to fail.

Wrap the generated code within #ifndef __OpenBSD__ in that case, to avoid
using the 64-bit code completely. (OpenBSD/hppa64, once stable, will not be
affected by this)

2 files changed, 12 insertions, 0 deletions

diff --git a/src/lib/libcrypto/sha/asm/sha512-parisc.pl b/src/lib/libcrypto/sha/asm/sha512-parisc.pl
index 578e3f4daf..4af7731661 100755
--- a/src/lib/libcrypto/sha/asm/sha512-parisc.pl
+++ b/src/lib/libcrypto/sha/asm/sha512-parisc.pl
@@ -269,6 +269,9 @@ L\$pic
         ldo     L\$table-L\$pic($Tbl),$Tbl
 ___
 $code.=<<___ if ($SZ==8 && $SIZE_T==4);
+#ifndef __OpenBSD__
+___
+$code.=<<___ if ($SZ==8 && $SIZE_T==4);
         ldi     31,$t1
         mtctl   $t1,%cr11
         extrd,u,*= $t1,%sar,1,$t1       ; executes on PA-RISC 1.0
@@ -363,6 +366,9 @@ $code.=<<___;
         .ALIGN  64
 L\$parisc1
 ___
+$code.=<<___ if ($SZ==8 && $SIZE_T==4);
+#endif
+___
 
 @V=(  $Ahi,  $Alo,  $Bhi,  $Blo,  $Chi,  $Clo,  $Dhi,  $Dlo,
       $Ehi,  $Elo,  $Fhi,  $Flo,  $Ghi,  $Glo,  $Hhi,  $Hlo) = 
diff --git a/src/lib/libssl/src/crypto/sha/asm/sha512-parisc.pl b/src/lib/libssl/src/crypto/sha/asm/sha512-parisc.pl
index 578e3f4daf..4af7731661 100755
--- a/src/lib/libssl/src/crypto/sha/asm/sha512-parisc.pl
+++ b/src/lib/libssl/src/crypto/sha/asm/sha512-parisc.pl
@@ -269,6 +269,9 @@ L\$pic
         ldo     L\$table-L\$pic($Tbl),$Tbl
 ___
 $code.=<<___ if ($SZ==8 && $SIZE_T==4);
+#ifndef __OpenBSD__
+___
+$code.=<<___ if ($SZ==8 && $SIZE_T==4);
         ldi     31,$t1
         mtctl   $t1,%cr11
         extrd,u,*= $t1,%sar,1,$t1       ; executes on PA-RISC 1.0
@@ -363,6 +366,9 @@ $code.=<<___;
         .ALIGN  64
 L\$parisc1
 ___
+$code.=<<___ if ($SZ==8 && $SIZE_T==4);
+#endif
+___
 
 @V=(  $Ahi,  $Alo,  $Bhi,  $Blo,  $Chi,  $Clo,  $Dhi,  $Dlo,
       $Ehi,  $Elo,  $Fhi,  $Flo,  $Ghi,  $Glo,  $Hhi,  $Hlo) =