projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
For self signed root only indicate one error.
[oweals/openssl.git]
/
crypto
/
ppccap.c
diff --git
a/crypto/ppccap.c
b/crypto/ppccap.c
index 531f1b3be84005d74075e0445b198f42da13b87d..d78bfbcdbb88265e1906ba03fa1b92280dcc9f34 100644
(file)
--- a/
crypto/ppccap.c
+++ b/
crypto/ppccap.c
@@
-4,7
+4,7
@@
#include <setjmp.h>
#include <signal.h>
#include <unistd.h>
#include <setjmp.h>
#include <signal.h>
#include <unistd.h>
-#if
def __linux
+#if
defined(__linux) || defined(_AIX)
#include <sys/utsname.h>
#endif
#include <crypto.h>
#include <sys/utsname.h>
#endif
#include <crypto.h>
@@
-13,7
+13,7
@@
#define PPC_FPU64 (1<<0)
#define PPC_ALTIVEC (1<<1)
#define PPC_FPU64 (1<<0)
#define PPC_ALTIVEC (1<<1)
-
static
int OPENSSL_ppccap_P = 0;
+
unsigned
int OPENSSL_ppccap_P = 0;
static sigset_t all_masked;
static sigset_t all_masked;
@@
-25,7
+25,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 (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
if (num>=8 && (num&3)==0 && (OPENSSL_ppccap_P&PPC_FPU64))
return bn_mul_mont_fpu64(rp,ap,bp,np,n0,num);
#else
@@
-88,12
+88,14
@@
void OPENSSL_cpuid_setup(void)
OPENSSL_ppccap_P = 0;
#if defined(_AIX)
OPENSSL_ppccap_P = 0;
#if defined(_AIX)
- if (sizeof(size_t)==4
+ if (sizeof(size_t)==4)
+ {
+ struct utsname uts;
# if defined(_SC_AIX_KERNEL_BITMODE)
# if defined(_SC_AIX_KERNEL_BITMODE)
- && sysconf(_SC_AIX_KERNEL_BITMODE)!=64
+ if (sysconf(_SC_AIX_KERNEL_BITMODE)!=64) return;
# endif
# endif
- )
- return;
+ if (uname(&uts)!=0 || atoi(uts.version)<6) return;
+ }
#endif
memset(&ill_act,0,sizeof(ill_act));
#endif
memset(&ill_act,0,sizeof(ill_act));