mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
AppleM1: Update openssl to v1.1.1l
This commit is contained in:
parent
1fe12b8e8c
commit
b787656eea
990 changed files with 13406 additions and 18710 deletions
12
trunk/3rdparty/openssl-1.1-fit/crypto/s390xcap.c
vendored
12
trunk/3rdparty/openssl-1.1-fit/crypto/s390xcap.c
vendored
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 2010-2017 The OpenSSL Project Authors. All Rights Reserved.
|
||||
* Copyright 2010-2019 The OpenSSL Project Authors. All Rights Reserved.
|
||||
*
|
||||
* Licensed under the OpenSSL license (the "License"). You may not use
|
||||
* this file except in compliance with the License. You can obtain a copy
|
||||
|
@ -29,7 +29,7 @@ struct OPENSSL_s390xcap_st OPENSSL_s390xcap_P;
|
|||
void OPENSSL_cpuid_setup(void)
|
||||
{
|
||||
sigset_t oset;
|
||||
struct sigaction ill_act, oact;
|
||||
struct sigaction ill_act, oact_ill, oact_fpe;
|
||||
|
||||
if (OPENSSL_s390xcap_P.stfle[0])
|
||||
return;
|
||||
|
@ -44,8 +44,8 @@ void OPENSSL_cpuid_setup(void)
|
|||
sigdelset(&ill_act.sa_mask, SIGFPE);
|
||||
sigdelset(&ill_act.sa_mask, SIGTRAP);
|
||||
sigprocmask(SIG_SETMASK, &ill_act.sa_mask, &oset);
|
||||
sigaction(SIGILL, &ill_act, &oact);
|
||||
sigaction(SIGFPE, &ill_act, &oact);
|
||||
sigaction(SIGILL, &ill_act, &oact_ill);
|
||||
sigaction(SIGFPE, &ill_act, &oact_fpe);
|
||||
|
||||
/* protection against missing store-facility-list-extended */
|
||||
if (sigsetjmp(ill_jmp, 1) == 0)
|
||||
|
@ -61,7 +61,7 @@ void OPENSSL_cpuid_setup(void)
|
|||
| S390X_CAPBIT(S390X_VXE));
|
||||
}
|
||||
|
||||
sigaction(SIGFPE, &oact, NULL);
|
||||
sigaction(SIGILL, &oact, NULL);
|
||||
sigaction(SIGFPE, &oact_fpe, NULL);
|
||||
sigaction(SIGILL, &oact_ill, NULL);
|
||||
sigprocmask(SIG_SETMASK, &oset, NULL);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue