ppccap.c: portability fix.

[openssl.git] / crypto / ppccap.c

diff --git a/crypto/ppccap.c b/crypto/ppccap.c
index 85901598ddef0f2fd0ed08ca9899fde9eadf93fe..4d88a3d65b6cc381447e77ebb971ac70431a088e 100644 (file)
--- a/crypto/ppccap.c
+++ b/crypto/ppccap.c
@@ -25,7 +25,7 @@ int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_U
 #else
                /* boundary of 32 was experimentally determined on
                   Linux 2.6.22, might have to be adjusted on AIX... */
-               if ((num>=32) && (OPENSSL_ppccap_P&PPC_FPU64))
+               if (num>=32 && (num&3)==0 && (OPENSSL_ppccap_P&PPC_FPU64))
                        {
                        sigset_t oset;
                        int ret;
@@ -50,15 +50,21 @@ int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_U
 static sigjmp_buf ill_jmp;
 static void ill_handler (int sig) { siglongjmp(ill_jmp,sig); }
 
+void OPENSSL_ppc64_probe(void);
+
 void OPENSSL_cpuid_setup(void)
        {
        char *e;
 
        sigfillset(&all_masked);
-       sigdelset(&all_masked,SIGSEGV);
        sigdelset(&all_masked,SIGILL);
-       sigdelset(&all_masked,SIGBUS);
+       sigdelset(&all_masked,SIGTRAP);
+#ifdef SIGEMT
+       sigdelset(&all_masked,SIGEMT);
+#endif
        sigdelset(&all_masked,SIGFPE);
+       sigdelset(&all_masked,SIGBUS);
+       sigdelset(&all_masked,SIGSEGV);
 
        if ((e=getenv("OPENSSL_ppccap")))
                {