projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New ctrl to set current certificate.
[oweals/openssl.git]
/
crypto
/
s390xcap.c
diff --git
a/crypto/s390xcap.c
b/crypto/s390xcap.c
index ffbe0235f996214099aba8fdef2c7d1758e8a85c..f2e94ef47e83cd125759df5d38b8de81a612f268 100644
(file)
--- a/
crypto/s390xcap.c
+++ b/
crypto/s390xcap.c
@@
-4,7
+4,7
@@
#include <setjmp.h>
#include <signal.h>
#include <setjmp.h>
#include <signal.h>
-extern unsigned long OPENSSL_s390xcap_P;
+extern unsigned long OPENSSL_s390xcap_P
[]
;
static sigjmp_buf ill_jmp;
static void ill_handler (int sig) { siglongjmp(ill_jmp,sig); }
static sigjmp_buf ill_jmp;
static void ill_handler (int sig) { siglongjmp(ill_jmp,sig); }
@@
-16,7
+16,9
@@
void OPENSSL_cpuid_setup(void)
sigset_t oset;
struct sigaction ill_act,oact;
sigset_t oset;
struct sigaction ill_act,oact;
- if (OPENSSL_s390xcap_P) return;
+ if (OPENSSL_s390xcap_P[0]) return;
+
+ OPENSSL_s390xcap_P[0] = 1UL<<(8*sizeof(unsigned long)-1);
memset(&ill_act,0,sizeof(ill_act));
ill_act.sa_handler = ill_handler;
memset(&ill_act,0,sizeof(ill_act));
ill_act.sa_handler = ill_handler;
@@
-27,10
+29,8
@@
void OPENSSL_cpuid_setup(void)
sigaction (SIGILL,&ill_act,&oact);
/* protection against missing store-facility-list-extended */
sigaction (SIGILL,&ill_act,&oact);
/* protection against missing store-facility-list-extended */
- if (sigsetjmp(ill_jmp,0) == 0)
- OPENSSL_s390xcap_P = OPENSSL_s390x_facilities();
- else
- OPENSSL_s390xcap_P = 1UL<<63;
+ if (sigsetjmp(ill_jmp,1) == 0)
+ OPENSSL_s390x_facilities();
sigaction (SIGILL,&oact,NULL);
sigprocmask(SIG_SETMASK,&oset,NULL);
sigaction (SIGILL,&oact,NULL);
sigprocmask(SIG_SETMASK,&oset,NULL);