Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2024-11-29 12:35:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #648 from the-Chain-Warden-thresh/master

Browse Source 
Fix some unpatched CVEs in OpensslLib
This commit is contained in:
Sergey 2023-11-09 22:57:06 +03:00 committed by GitHub
commit 2d5f73c21c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/OpensslLib/openssl-1.0.1e/crypto/evp/encode.c
View File

@ -137,7 +137,7 @@ void EVP_EncodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
*outl=0;
if (inl == 0) return;
OPENSSL_assert(ctx->length <= (int)sizeof(ctx->enc_data));
if ((ctx->num+inl) < ctx->length)
if (ctx->length - ctx->num > inl)
{
memcpy(&(ctx->enc_data[ctx->num]),in,inl);
ctx->num+=inl;

2
Library/OpensslLib/openssl-1.0.1e/crypto/evp/evp_enc.c
View File

@ -343,7 +343,7 @@ int EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
OPENSSL_assert(bl <= (int)sizeof(ctx->buf));
if (i != 0)
{
if (i+inl < bl)
if (bl - i > inl)
{
memcpy(&(ctx->buf[i]),in,inl);
ctx->buf_len+=inl;

2
Library/OpensslLib/openssl-1.0.1e/crypto/mdc2/mdc2dgst.c
View File

@ -92,7 +92,7 @@ int MDC2_Update(MDC2_CTX *c, const unsigned char *in, size_t len)
i=c->num;
if (i != 0)
{
if (i+len < MDC2_BLOCK)
if (len < MDC2_BLOCK - i)
{
/* partial block */
memcpy(&(c->data[i]),in,len);

5
Library/OpensslLib/openssl-1.0.1e/crypto/ts/ts_lib.c
View File

@ -90,9 +90,8 @@ int TS_OBJ_print_bio(BIO *bio, const ASN1_OBJECT *obj)
{
char obj_txt[128];
int len = OBJ_obj2txt(obj_txt, sizeof(obj_txt), obj, 0);
BIO_write(bio, obj_txt, len);
BIO_write(bio, "\n", 1);
OBJ_obj2txt(obj_txt, sizeof(obj_txt), obj, 0);
BIO_printf(bio, "%s\n", obj_txt);
return 1;
}