From 91e3957fb0e38a5d5649f82e5d9f89dd0e85666f Mon Sep 17 00:00:00 2001 From: Mike DePaulo Date: Sat, 28 Mar 2015 09:50:31 -0400 Subject: Update openssl to version openssl-1.0.1m Conflicts: openssl/Makefile openssl/Makefile.bak openssl/crypto/cryptlib.c --- openssl/crypto/armcap.c | 93 +++++++++++++++++++++++++------------------------ 1 file changed, 47 insertions(+), 46 deletions(-) (limited to 'openssl/crypto/armcap.c') diff --git a/openssl/crypto/armcap.c b/openssl/crypto/armcap.c index 9abaf396e..28522ea86 100644 --- a/openssl/crypto/armcap.c +++ b/openssl/crypto/armcap.c @@ -12,7 +12,10 @@ unsigned int OPENSSL_armcap_P; static sigset_t all_masked; static sigjmp_buf ill_jmp; -static void ill_handler (int sig) { siglongjmp(ill_jmp,sig); } +static void ill_handler(int sig) +{ + siglongjmp(ill_jmp, sig); +} /* * Following subroutines could have been inlined, but it's not all @@ -22,59 +25,57 @@ void _armv7_neon_probe(void); unsigned int _armv7_tick(void); unsigned int OPENSSL_rdtsc(void) - { - if (OPENSSL_armcap_P & ARMV7_TICK) - return _armv7_tick(); - else - return 0; - } +{ + if (OPENSSL_armcap_P & ARMV7_TICK) + return _armv7_tick(); + else + return 0; +} #if defined(__GNUC__) && __GNUC__>=2 -void OPENSSL_cpuid_setup(void) __attribute__((constructor)); +void OPENSSL_cpuid_setup(void) __attribute__ ((constructor)); #endif void OPENSSL_cpuid_setup(void) - { - char *e; - struct sigaction ill_oact,ill_act; - sigset_t oset; - static int trigger=0; +{ + char *e; + struct sigaction ill_oact, ill_act; + sigset_t oset; + static int trigger = 0; - if (trigger) return; - trigger=1; - - if ((e=getenv("OPENSSL_armcap"))) - { - OPENSSL_armcap_P=strtoul(e,NULL,0); - return; - } + if (trigger) + return; + trigger = 1; - sigfillset(&all_masked); - sigdelset(&all_masked,SIGILL); - sigdelset(&all_masked,SIGTRAP); - sigdelset(&all_masked,SIGFPE); - sigdelset(&all_masked,SIGBUS); - sigdelset(&all_masked,SIGSEGV); + if ((e = getenv("OPENSSL_armcap"))) { + OPENSSL_armcap_P = strtoul(e, NULL, 0); + return; + } - OPENSSL_armcap_P = 0; + sigfillset(&all_masked); + sigdelset(&all_masked, SIGILL); + sigdelset(&all_masked, SIGTRAP); + sigdelset(&all_masked, SIGFPE); + sigdelset(&all_masked, SIGBUS); + sigdelset(&all_masked, SIGSEGV); - memset(&ill_act,0,sizeof(ill_act)); - ill_act.sa_handler = ill_handler; - ill_act.sa_mask = all_masked; + OPENSSL_armcap_P = 0; - sigprocmask(SIG_SETMASK,&ill_act.sa_mask,&oset); - sigaction(SIGILL,&ill_act,&ill_oact); + memset(&ill_act, 0, sizeof(ill_act)); + ill_act.sa_handler = ill_handler; + ill_act.sa_mask = all_masked; - if (sigsetjmp(ill_jmp,1) == 0) - { - _armv7_neon_probe(); - OPENSSL_armcap_P |= ARMV7_NEON; - } - if (sigsetjmp(ill_jmp,1) == 0) - { - _armv7_tick(); - OPENSSL_armcap_P |= ARMV7_TICK; - } + sigprocmask(SIG_SETMASK, &ill_act.sa_mask, &oset); + sigaction(SIGILL, &ill_act, &ill_oact); - sigaction (SIGILL,&ill_oact,NULL); - sigprocmask(SIG_SETMASK,&oset,NULL); - } + if (sigsetjmp(ill_jmp, 1) == 0) { + _armv7_neon_probe(); + OPENSSL_armcap_P |= ARMV7_NEON; + } + if (sigsetjmp(ill_jmp, 1) == 0) { + _armv7_tick(); + OPENSSL_armcap_P |= ARMV7_TICK; + } + + sigaction(SIGILL, &ill_oact, NULL); + sigprocmask(SIG_SETMASK, &oset, NULL); +} -- cgit v1.2.3