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
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 2001-2019 The OpenSSL Project Authors. All Rights Reserved.
|
||||
* Copyright 2001-2020 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
|
||||
|
@ -53,7 +53,7 @@
|
|||
# endif
|
||||
# endif
|
||||
|
||||
# include "ui_locl.h"
|
||||
# include "ui_local.h"
|
||||
# include "internal/cryptlib.h"
|
||||
|
||||
# ifdef OPENSSL_SYS_VMS /* prototypes for sys$whatever */
|
||||
|
@ -79,7 +79,7 @@
|
|||
* systems that require something different.
|
||||
*
|
||||
* Note: we do not use SGTTY unless it's defined by the configuration. We
|
||||
* may eventually opt to remove it's use entirely.
|
||||
* may eventually opt to remove its use entirely.
|
||||
*/
|
||||
|
||||
# if !defined(TERMIOS) && !defined(TERMIO) && !defined(SGTTY)
|
||||
|
@ -439,6 +439,16 @@ static int open_console(UI *ui)
|
|||
is_a_tty = 0;
|
||||
else
|
||||
# endif
|
||||
# ifdef EPERM
|
||||
/*
|
||||
* Linux can return EPERM (Operation not permitted),
|
||||
* e.g. if a daemon executes openssl via fork()+execve()
|
||||
* This should be ok
|
||||
*/
|
||||
if (errno == EPERM)
|
||||
is_a_tty = 0;
|
||||
else
|
||||
# endif
|
||||
# ifdef ENODEV
|
||||
/*
|
||||
* MacOS X returns ENODEV (Operation not supported by device),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue