Mirrors/openssl
0
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2026-01-18 17:11:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Correctly handle the cases where SSL_dup fails.

Browse Source 
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
MergeDate: Thu Jan  8 10:06:48 2026
(Merged from https://github.com/openssl/openssl/pull/29485)
This commit is contained in:
Frederik Wedel-Heinen
2025-12-22 15:36:24 +01:00
committed by Tomas Mraz
parent c8bae42190
commit 2ffad846c7
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ssl/bio_ssl.c
View File

@@ -226,7 +226,7 @@ static int ssl_write(BIO *b, const char *buf, size_t size, size_t *written)
static long ssl_ctrl(BIO *b, int cmd, long num, void *ptr)
{
SSL **sslp, *ssl;
SSL **sslp, *ssl, *dupssl;
BIO_SSL *bs, *dbs;
BIO *dbio, *bio;
long ret = 1;
@@ -382,14 +382,19 @@ static long ssl_ctrl(BIO *b, int cmd, long num, void *ptr)
case BIO_CTRL_DUP:
dbio = (BIO *)ptr;
dbs = BIO_get_data(dbio);
dupssl = SSL_dup(ssl);
if (dupssl == NULL) {
ret = 0;
break;
}
SSL_free(dbs->ssl);
dbs->ssl = SSL_dup(ssl);
dbs->ssl = dupssl;
dbs->num_renegotiates = bs->num_renegotiates;
dbs->renegotiate_count = bs->renegotiate_count;
dbs->byte_count = bs->byte_count;
dbs->renegotiate_timeout = bs->renegotiate_timeout;
dbs->last_time = bs->last_time;
ret = (dbs->ssl != NULL);
ret = 1;
break;
case BIO_C_GET_FD:
ret = BIO_ctrl(SSL_get_rbio(ssl), cmd, num, ptr);

3
test/sslapitest.c
View File

@@ -10908,7 +10908,8 @@ static int test_ssl_dup(void)
client2ssl = SSL_dup(clientssl);
rbio = SSL_get_rbio(clientssl);
if (!TEST_ptr(rbio)
|| !TEST_true(BIO_up_ref(rbio)))
|| !TEST_true(BIO_up_ref(rbio))
|| !TEST_ptr(client2ssl))
goto end;
SSL_set0_rbio(client2ssl, rbio);
rbio = NULL;