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
6
trunk/3rdparty/openssl-1.1-fit/ssl/bio_ssl.c
vendored
6
trunk/3rdparty/openssl-1.1-fit/ssl/bio_ssl.c
vendored
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
|
||||
* Copyright 1995-2021 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
|
||||
|
@ -14,7 +14,7 @@
|
|||
#include <openssl/crypto.h>
|
||||
#include "internal/bio.h"
|
||||
#include <openssl/err.h>
|
||||
#include "ssl_locl.h"
|
||||
#include "ssl_local.h"
|
||||
|
||||
static int ssl_write(BIO *h, const char *buf, size_t size, size_t *written);
|
||||
static int ssl_read(BIO *b, char *buf, size_t size, size_t *readbytes);
|
||||
|
@ -284,6 +284,7 @@ static long ssl_ctrl(BIO *b, int cmd, long num, void *ptr)
|
|||
ssl_free(b);
|
||||
if (!ssl_new(b))
|
||||
return 0;
|
||||
bs = BIO_get_data(b);
|
||||
}
|
||||
BIO_set_shutdown(b, num);
|
||||
ssl = (SSL *)ptr;
|
||||
|
@ -450,6 +451,7 @@ BIO *BIO_new_ssl_connect(SSL_CTX *ctx)
|
|||
goto err;
|
||||
return ret;
|
||||
err:
|
||||
BIO_free(ssl);
|
||||
BIO_free(con);
|
||||
#endif
|
||||
return NULL;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue