Return smaller of ret and f.

[openssl.git] / crypto / ppccap.c

diff --git a/crypto/ppccap.c b/crypto/ppccap.c
index 361f2dde734139d3556a57bc715ef4cab87d263a..cad14fd67b7ba00f90ddab27d93b70dbb2aefffa 100644 (file)
--- a/crypto/ppccap.c
+++ b/crypto/ppccap.c
@@ -12,6 +12,7 @@
 
 #define PPC_FPU64      (1<<0)
 #define PPC_ALTIVEC    (1<<1)
+#define PPC_CRYPTO207  (1<<2)
 
 unsigned int OPENSSL_ppccap_P = 0;
 
@@ -25,7 +26,7 @@ int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_U
 
        if (sizeof(size_t)==4)
                {
-#if (defined(__APPLE__) && defined(__MACH__))
+#if 1 || (defined(__APPLE__) && defined(__MACH__))
                if (num>=8 && (num&3)==0 && (OPENSSL_ppccap_P&PPC_FPU64))
                        return bn_mul_mont_fpu64(rp,ap,bp,np,n0,num);
 #else
@@ -53,11 +54,28 @@ int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_U
        }
 #endif
 
+void sha256_block_p8(void *ctx,const void *inp,size_t len);
+void sha256_block_ppc(void *ctx,const void *inp,size_t len);
+void sha256_block_data_order(void *ctx,const void *inp,size_t len)
+       {
+       OPENSSL_ppccap_P&PPC_CRYPTO207? sha256_block_p8(ctx,inp,len):
+                                       sha256_block_ppc(ctx,inp,len);
+       }
+
+void sha512_block_p8(void *ctx,const void *inp,size_t len);
+void sha512_block_ppc(void *ctx,const void *inp,size_t len);
+void sha512_block_data_order(void *ctx,const void *inp,size_t len)
+       {
+       OPENSSL_ppccap_P&PPC_CRYPTO207? sha512_block_p8(ctx,inp,len):
+                                       sha512_block_ppc(ctx,inp,len);
+       }
+
 static sigjmp_buf ill_jmp;
 static void ill_handler (int sig) { siglongjmp(ill_jmp,sig); }
 
 void OPENSSL_ppc64_probe(void);
 void OPENSSL_altivec_probe(void);
+void OPENSSL_crypto207_probe(void);
 
 void OPENSSL_cpuid_setup(void)
        {
@@ -128,6 +146,11 @@ void OPENSSL_cpuid_setup(void)
                {
                OPENSSL_altivec_probe();
                OPENSSL_ppccap_P |= PPC_ALTIVEC;
+               if (sigsetjmp(ill_jmp,1) == 0)
+                       {
+                       OPENSSL_crypto207_probe();
+                       OPENSSL_ppccap_P |= PPC_CRYPTO207;
+                       }
                }
 
        sigaction (SIGILL,&ill_oact,NULL);