diff options
author | djm <> | 2012-10-13 21:23:50 +0000 |
---|---|---|
committer | djm <> | 2012-10-13 21:23:50 +0000 |
commit | 228cae30b117c2493f69ad3c195341cd6ec8d430 (patch) | |
tree | 29ff00b10d52c0978077c4fd83c33b065bade73e /src/lib/libcrypto/sparcv9cap.c | |
parent | 731838c66b52c0ae5888333005b74115a620aa96 (diff) | |
download | openbsd-228cae30b117c2493f69ad3c195341cd6ec8d430.tar.gz openbsd-228cae30b117c2493f69ad3c195341cd6ec8d430.tar.bz2 openbsd-228cae30b117c2493f69ad3c195341cd6ec8d430.zip |
import OpenSSL-1.0.1c
Diffstat (limited to 'src/lib/libcrypto/sparcv9cap.c')
-rw-r--r-- | src/lib/libcrypto/sparcv9cap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/sparcv9cap.c b/src/lib/libcrypto/sparcv9cap.c index ed195ab402..43b3ac6f81 100644 --- a/src/lib/libcrypto/sparcv9cap.c +++ b/src/lib/libcrypto/sparcv9cap.c | |||
@@ -19,7 +19,8 @@ int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_U | |||
19 | int bn_mul_mont_fpu(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np,const BN_ULONG *n0, int num); | 19 | int bn_mul_mont_fpu(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np,const BN_ULONG *n0, int num); |
20 | int bn_mul_mont_int(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np,const BN_ULONG *n0, int num); | 20 | int bn_mul_mont_int(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np,const BN_ULONG *n0, int num); |
21 | 21 | ||
22 | if ((OPENSSL_sparcv9cap_P&(SPARCV9_PREFER_FPU|SPARCV9_VIS1)) == | 22 | if (num>=8 && !(num&1) && |
23 | (OPENSSL_sparcv9cap_P&(SPARCV9_PREFER_FPU|SPARCV9_VIS1)) == | ||
23 | (SPARCV9_PREFER_FPU|SPARCV9_VIS1)) | 24 | (SPARCV9_PREFER_FPU|SPARCV9_VIS1)) |
24 | return bn_mul_mont_fpu(rp,ap,bp,np,n0,num); | 25 | return bn_mul_mont_fpu(rp,ap,bp,np,n0,num); |
25 | else | 26 | else |
@@ -169,7 +170,6 @@ void OPENSSL_cpuid_setup(void) | |||
169 | char *e; | 170 | char *e; |
170 | struct sigaction common_act,ill_oact,bus_oact; | 171 | struct sigaction common_act,ill_oact,bus_oact; |
171 | sigset_t all_masked,oset; | 172 | sigset_t all_masked,oset; |
172 | int sig; | ||
173 | static int trigger=0; | 173 | static int trigger=0; |
174 | 174 | ||
175 | if (trigger) return; | 175 | if (trigger) return; |