gcm128.c: add CRYPTO_gcm128_[en|de]crypt_ctr32.

[oweals/openssl.git] / crypto / ppccap.c

diff --git a/crypto/ppccap.c b/crypto/ppccap.c
index 6fac797ff52dd283c3aafae686bebf7b6ebb4404..4d88a3d65b6cc381447e77ebb971ac70431a088e 100644 (file)
--- a/crypto/ppccap.c
+++ b/crypto/ppccap.c
@@ -11,6 +11,7 @@ static int OPENSSL_ppccap_P = 0;
 
 static sigset_t all_masked;
 
+#ifdef OPENSSL_BN_ASM_MONT
 int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np, const BN_ULONG *n0, int num)
        {
        int bn_mul_mont_fpu64(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np, const BN_ULONG *n0, int num);
@@ -24,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;
@@ -44,17 +45,26 @@ int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_U
 
        return bn_mul_mont_int(rp,ap,bp,np,n0,num);
        }
+#endif
 
 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,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")))
                {
@@ -69,8 +79,7 @@ void OPENSSL_cpuid_setup(void)
 
                memset(&ill_act,0,sizeof(ill_act));
                ill_act.sa_handler = ill_handler;
-               sigfillset(&ill_act.sa_mask);
-               sigdelset(&ill_act.sa_mask,SIGILL);
+               ill_act.sa_mask    = all_masked;
                sigprocmask(SIG_SETMASK,&ill_act.sa_mask,&oset);
                sigaction (SIGILL,&ill_act,&ill_oact);
                if (sigsetjmp(ill_jmp,0) == 0)