Revision 098f27f9ef8be2a418f76896ee3c824e8709fcf7 authored by Matt Caswell on 17 October 2023, 13:55:48 UTC, committed by Tomas Mraz on 19 October 2023, 09:54:44 UTC
If the CC TX allowance is zero then we cannot send a PING frame at the moment, so do not take into account the ping deadline when calculating the tick deadline in that case. This avoids the hang found by the fuzzer mentioned in https://github.com/openssl/openssl/pull/22368#issuecomment-1765131727 Reviewed-by: Hugo Landau <hlandau@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/22410)
1 parent 56e3032
bio_core_test.c
/*
* Copyright 2021-2023 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
* https://www.openssl.org/source/license.html
*/
#include <string.h>
#include <openssl/bio.h>
#include "testutil.h"
struct ossl_core_bio_st {
int dummy;
BIO *bio;
};
static int tst_bio_core_read_ex(OSSL_CORE_BIO *bio, char *data, size_t data_len,
size_t *bytes_read)
{
return BIO_read_ex(bio->bio, data, data_len, bytes_read);
}
static int tst_bio_core_write_ex(OSSL_CORE_BIO *bio, const char *data,
size_t data_len, size_t *written)
{
return BIO_write_ex(bio->bio, data, data_len, written);
}
static int tst_bio_core_gets(OSSL_CORE_BIO *bio, char *buf, int size)
{
return BIO_gets(bio->bio, buf, size);
}
static int tst_bio_core_puts(OSSL_CORE_BIO *bio, const char *str)
{
return BIO_puts(bio->bio, str);
}
static long tst_bio_core_ctrl(OSSL_CORE_BIO *bio, int cmd, long num, void *ptr)
{
return BIO_ctrl(bio->bio, cmd, num, ptr);
}
static int tst_bio_core_up_ref(OSSL_CORE_BIO *bio)
{
return BIO_up_ref(bio->bio);
}
static int tst_bio_core_free(OSSL_CORE_BIO *bio)
{
return BIO_free(bio->bio);
}
static const OSSL_DISPATCH biocbs[] = {
{ OSSL_FUNC_BIO_READ_EX, (void (*)(void))tst_bio_core_read_ex },
{ OSSL_FUNC_BIO_WRITE_EX, (void (*)(void))tst_bio_core_write_ex },
{ OSSL_FUNC_BIO_GETS, (void (*)(void))tst_bio_core_gets },
{ OSSL_FUNC_BIO_PUTS, (void (*)(void))tst_bio_core_puts },
{ OSSL_FUNC_BIO_CTRL, (void (*)(void))tst_bio_core_ctrl },
{ OSSL_FUNC_BIO_UP_REF, (void (*)(void))tst_bio_core_up_ref },
{ OSSL_FUNC_BIO_FREE, (void (*)(void))tst_bio_core_free },
OSSL_DISPATCH_END
};
static int test_bio_core(void)
{
BIO *cbio = NULL, *cbiobad = NULL;
OSSL_LIB_CTX *libctx = OSSL_LIB_CTX_new_from_dispatch(NULL, biocbs);
int testresult = 0;
OSSL_CORE_BIO corebio;
const char *msg = "Hello world";
char buf[80];
corebio.bio = BIO_new(BIO_s_mem());
if (!TEST_ptr(corebio.bio)
|| !TEST_ptr(libctx)
/*
* Attempting to create a corebio in a libctx that was not
* created via OSSL_LIB_CTX_new_from_dispatch() should fail.
*/
|| !TEST_ptr_null((cbiobad = BIO_new_from_core_bio(NULL, &corebio)))
|| !TEST_ptr((cbio = BIO_new_from_core_bio(libctx, &corebio))))
goto err;
if (!TEST_int_gt(BIO_puts(corebio.bio, msg), 0)
/* Test a ctrl via BIO_eof */
|| !TEST_false(BIO_eof(cbio))
|| !TEST_int_gt(BIO_gets(cbio, buf, sizeof(buf)), 0)
|| !TEST_true(BIO_eof(cbio))
|| !TEST_str_eq(buf, msg))
goto err;
buf[0] = '\0';
if (!TEST_int_gt(BIO_write(cbio, msg, strlen(msg) + 1), 0)
|| !TEST_int_gt(BIO_read(cbio, buf, sizeof(buf)), 0)
|| !TEST_str_eq(buf, msg))
goto err;
testresult = 1;
err:
BIO_free(cbiobad);
BIO_free(cbio);
BIO_free(corebio.bio);
OSSL_LIB_CTX_free(libctx);
return testresult;
}
int setup_tests(void)
{
if (!test_skip_common_options()) {
TEST_error("Error parsing test options\n");
return 0;
}
ADD_TEST(test_bio_core);
return 1;
}

Computing file changes ...