[openssl] openssl-3.0 update
Dr. Paul Dale
pauli at openssl.org
Wed Dec 8 04:12:08 UTC 2021
The branch openssl-3.0 has been updated
via 24dd9fc4c6c8341cd7f81d5e31513e59fcb934cf (commit)
from ba16c6cb1d0ceb78a54c667a15a64d28a15462d3 (commit)
- Log -----------------------------------------------------------------
commit 24dd9fc4c6c8341cd7f81d5e31513e59fcb934cf
Author: Peiwei Hu <jlu.hpw at foxmail.com>
Date: Mon Dec 6 17:33:42 2021 +0800
bio_enc.c: add memory allocation check
Reviewed-by: Tomas Mraz <tomas at openssl.org>
Reviewed-by: Paul Dale <pauli at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17206)
(cherry picked from commit 684326d3bd3131debcdc410790e8dcf16f96103f)
-----------------------------------------------------------------------
Summary of changes:
test/bio_enc_test.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/test/bio_enc_test.c b/test/bio_enc_test.c
index aeca062f3f..ec02628f84 100644
--- a/test/bio_enc_test.c
+++ b/test/bio_enc_test.c
@@ -51,6 +51,8 @@ static int do_bio_cipher(const EVP_CIPHER* cipher, const unsigned char* key,
/* reference output for single-chunk operation */
b = BIO_new(BIO_f_cipher());
+ if (!TEST_ptr(b))
+ return 0;
if (!TEST_true(BIO_set_cipher(b, cipher, key, iv, ENCRYPT)))
return 0;
BIO_push(b, BIO_new_mem_buf(inp, DATA_SIZE));
@@ -60,6 +62,8 @@ static int do_bio_cipher(const EVP_CIPHER* cipher, const unsigned char* key,
/* perform split operations and compare to reference */
for (i = 1; i < lref; i++) {
b = BIO_new(BIO_f_cipher());
+ if (!TEST_ptr(b))
+ return 0;
if (!TEST_true(BIO_set_cipher(b, cipher, key, iv, ENCRYPT))) {
TEST_info("Split encrypt failed @ operation %d", i);
return 0;
@@ -87,6 +91,8 @@ static int do_bio_cipher(const EVP_CIPHER* cipher, const unsigned char* key,
int delta;
b = BIO_new(BIO_f_cipher());
+ if (!TEST_ptr(b))
+ return 0;
if (!TEST_true(BIO_set_cipher(b, cipher, key, iv, ENCRYPT))) {
TEST_info("Small chunk encrypt failed @ operation %d", i);
return 0;
@@ -108,6 +114,8 @@ static int do_bio_cipher(const EVP_CIPHER* cipher, const unsigned char* key,
/* reference output for single-chunk operation */
b = BIO_new(BIO_f_cipher());
+ if (!TEST_ptr(b))
+ return 0;
if (!TEST_true(BIO_set_cipher(b, cipher, key, iv, DECRYPT)))
return 0;
/* Use original reference output as input */
@@ -123,6 +131,8 @@ static int do_bio_cipher(const EVP_CIPHER* cipher, const unsigned char* key,
/* perform split operations and compare to reference */
for (i = 1; i < lref; i++) {
b = BIO_new(BIO_f_cipher());
+ if (!TEST_ptr(b))
+ return 0;
if (!TEST_true(BIO_set_cipher(b, cipher, key, iv, DECRYPT))) {
TEST_info("Split decrypt failed @ operation %d", i);
return 0;
@@ -150,6 +160,8 @@ static int do_bio_cipher(const EVP_CIPHER* cipher, const unsigned char* key,
int delta;
b = BIO_new(BIO_f_cipher());
+ if (!TEST_ptr(b))
+ return 0;
if (!TEST_true(BIO_set_cipher(b, cipher, key, iv, DECRYPT))) {
TEST_info("Small chunk decrypt failed @ operation %d", i);
return 0;
More information about the openssl-commits
mailing list