external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

AppleM1: Update openssl to v1.1.1l

Browse source
This commit is contained in:
winlin 2022-08-14 19:05:01 +08:00
parent 1fe12b8e8c
commit b787656eea
990 changed files with 13406 additions and 18710 deletions
Download patch file Download diff file Expand all files Collapse all files

26
trunk/3rdparty/openssl-1.1-fit/crypto/comp/c_zlib.c vendored
View file

@ -13,9 +13,9 @@
#include <openssl/objects.h>
#include "internal/comp.h"
#include <openssl/err.h>
#include "internal/cryptlib_int.h"
#include "crypto/cryptlib.h"
#include "internal/bio.h"
#include "comp_lcl.h"
#include "comp_local.h"
COMP_METHOD *COMP_zlib(void);
@ -598,6 +598,28 @@ static long bio_zlib_ctrl(BIO *b, int cmd, long num, void *ptr)
BIO_copy_next_retry(b);
break;
case BIO_CTRL_WPENDING:
if (ctx->obuf == NULL)
return 0;
if (ctx->odone) {
ret = ctx->ocount;
} else {
ret = ctx->ocount;
if (ret == 0)
/* Unknown amount pending but we are not finished */
ret = 1;
}
if (ret == 0)
ret = BIO_ctrl(next, cmd, num, ptr);
break;
case BIO_CTRL_PENDING:
ret = ctx->zin.avail_in;
if (ret == 0)
ret = BIO_ctrl(next, cmd, num, ptr);
break;
default:
ret = BIO_ctrl(next, cmd, num, ptr);
break;