projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add functions to set ECDSA_METHOD structure.
[openssl.git]
/
crypto
/
ppccap.c
diff --git
a/crypto/ppccap.c
b/crypto/ppccap.c
index 4da696be4d11dbd52ba0e57399894570d0cc4595..2e2f3fc5c0cfacf784abd9d1572ef05a868fb2ba 100644
(file)
--- a/
crypto/ppccap.c
+++ b/
crypto/ppccap.c
@@
-3,6
+3,11
@@
#include <string.h>
#include <setjmp.h>
#include <signal.h>
#include <string.h>
#include <setjmp.h>
#include <signal.h>
+#include <unistd.h>
+#if defined(__linux) || defined(_AIX)
+#include <sys/utsname.h>
+#endif
+#include <crypto.h>
#include <openssl/bn.h>
#define PPC_FPU64 (1<<0)
#include <openssl/bn.h>
#define PPC_FPU64 (1<<0)
@@
-21,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 (sizeof(size_t)==4)
{
#if (defined(__APPLE__) && defined(__MACH__))
- if ((OPENSSL_ppccap_P&PPC_FPU64))
+ if (
num>=8 && (num&3)==0 &&
(OPENSSL_ppccap_P&PPC_FPU64))
return bn_mul_mont_fpu64(rp,ap,bp,np,n0,num);
#else
/* boundary of 32 was experimentally determined on
return bn_mul_mont_fpu64(rp,ap,bp,np,n0,num);
#else
/* boundary of 32 was experimentally determined on
@@
-52,6
+57,7
@@
static sigjmp_buf ill_jmp;
static void ill_handler (int sig) { siglongjmp(ill_jmp,sig); }
void OPENSSL_ppc64_probe(void);
static void ill_handler (int sig) { siglongjmp(ill_jmp,sig); }
void OPENSSL_ppc64_probe(void);
+void OPENSSL_altivec_probe(void);
void OPENSSL_cpuid_setup(void)
{
void OPENSSL_cpuid_setup(void)
{
@@
-81,6
+87,17
@@
void OPENSSL_cpuid_setup(void)
OPENSSL_ppccap_P = 0;
OPENSSL_ppccap_P = 0;
+#if defined(_AIX)
+ if (sizeof(size_t)==4)
+ {
+ struct utsname uts;
+# if defined(_SC_AIX_KERNEL_BITMODE)
+ if (sysconf(_SC_AIX_KERNEL_BITMODE)!=64) return;
+# endif
+ if (uname(&uts)!=0 || atoi(uts.version)<6) return;
+ }
+#endif
+
memset(&ill_act,0,sizeof(ill_act));
ill_act.sa_handler = ill_handler;
ill_act.sa_mask = all_masked;
memset(&ill_act,0,sizeof(ill_act));
ill_act.sa_handler = ill_handler;
ill_act.sa_mask = all_masked;
@@
-90,6
+107,10
@@
void OPENSSL_cpuid_setup(void)
if (sizeof(size_t)==4)
{
if (sizeof(size_t)==4)
{
+#ifdef __linux
+ struct utsname uts;
+ if (uname(&uts)==0 && strcmp(uts.machine,"ppc64")==0)
+#endif
if (sigsetjmp(ill_jmp,1) == 0)
{
OPENSSL_ppc64_probe();
if (sigsetjmp(ill_jmp,1) == 0)
{
OPENSSL_ppc64_probe();