diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2015-02-12 22:22:25 +0100 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2015-02-12 22:22:25 +0100 |
| commit | 9f0928c6593f937a17b7974b04051c57e3874b20 (patch) | |
| tree | 1aaffa07a5c177fef2c1386f1850a688045bec2e /main/openssl/crypto/armcap.c | |
| parent | 68d26e1b1b5b411adce714c88532fc8889289f34 (diff) | |
Update OpenSSL to AOSP -master
Diffstat (limited to 'main/openssl/crypto/armcap.c')
| -rw-r--r-- | main/openssl/crypto/armcap.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/main/openssl/crypto/armcap.c b/main/openssl/crypto/armcap.c index 7e46d07a..59b74948 100644 --- a/main/openssl/crypto/armcap.c +++ b/main/openssl/crypto/armcap.c @@ -68,6 +68,14 @@ static unsigned long (*getauxval)(unsigned long) = NULL; # define HWCAP_CE_SHA256 (1 << 6) #endif +#ifdef ANDROID +// Works around a bug where Android versions up to and including L don't +// properly restore the signal mask when asked. +#define sigsetjmp(env,savesigs) \ + (sigprocmask(SIG_SETMASK,&ill_act.sa_mask,NULL), \ + sigsetjmp(env,savesigs)) +#endif + void OPENSSL_cpuid_setup(void) { char *e; |