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-2018 The OpenSSL Project Authors. All Rights Reserved.
|
||||
* Copyright 2001-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
|
||||
|
@ -13,7 +13,7 @@
|
|||
#include <openssl/buffer.h>
|
||||
#include <openssl/ui.h>
|
||||
#include <openssl/err.h>
|
||||
#include "ui_locl.h"
|
||||
#include "ui_local.h"
|
||||
|
||||
UI *UI_new(void)
|
||||
{
|
||||
|
@ -500,6 +500,7 @@ int UI_process(UI *ui)
|
|||
if (ui->meth->ui_flush != NULL)
|
||||
switch (ui->meth->ui_flush(ui)) {
|
||||
case -1: /* Interrupt/Cancel/something... */
|
||||
ui->flags &= ~UI_FLAG_REDOABLE;
|
||||
ok = -2;
|
||||
goto err;
|
||||
case 0: /* Errors */
|
||||
|
@ -517,6 +518,7 @@ int UI_process(UI *ui)
|
|||
sk_UI_STRING_value(ui->strings,
|
||||
i))) {
|
||||
case -1: /* Interrupt/Cancel/something... */
|
||||
ui->flags &= ~UI_FLAG_REDOABLE;
|
||||
ok = -2;
|
||||
goto err;
|
||||
case 0: /* Errors */
|
||||
|
|
|
@ -7,8 +7,8 @@
|
|||
* https://www.openssl.org/source/license.html
|
||||
*/
|
||||
|
||||
#ifndef HEADER_UI_LOCL_H
|
||||
# define HEADER_UI_LOCL_H
|
||||
#ifndef OSSL_CRYPTO_UI_LOCAL_H
|
||||
# define OSSL_CRYPTO_UI_LOCAL_H
|
||||
|
||||
# include <openssl/ui.h>
|
||||
# include <openssl/crypto.h>
|
|
@ -7,7 +7,7 @@
|
|||
* https://www.openssl.org/source/license.html
|
||||
*/
|
||||
|
||||
#include "ui_locl.h"
|
||||
#include "ui_local.h"
|
||||
|
||||
static const UI_METHOD ui_null = {
|
||||
"OpenSSL NULL UI",
|
||||
|
|
|
@ -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),
|
||||
|
|
|
@ -8,8 +8,9 @@
|
|||
*/
|
||||
|
||||
#include <string.h>
|
||||
#include <openssl/pem.h> /* PEM_def_callback() */
|
||||
#include "internal/thread_once.h"
|
||||
#include "ui_locl.h"
|
||||
#include "ui_local.h"
|
||||
|
||||
#ifndef BUFSIZ
|
||||
#define BUFSIZ 256
|
||||
|
@ -156,7 +157,7 @@ UI_METHOD *UI_UTIL_wrap_read_pem_callback(pem_password_cb *cb, int rwflag)
|
|||
return NULL;
|
||||
}
|
||||
data->rwflag = rwflag;
|
||||
data->cb = cb;
|
||||
data->cb = cb != NULL ? cb : PEM_def_callback;
|
||||
|
||||
return ui_method;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue