diff options
| author | Richard Levitte <levitte@openssl.org> | 2022-06-12 06:03:50 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2022-06-15 15:17:39 +0200 |
| commit | a0587aaeff7391b8cf4ee4c6a233d0f4dca7d62f (patch) | |
| tree | bc4795b85bacfb447d0b22dd178f95f5f828b815 /test | |
| parent | 76a597c512a055556a5033c69ce02d6330e8a2af (diff) | |
test/evp_test.c: Check too big output buffer sizes in PKEYKDF tests
EVP_PKEY_derive() should be able to cope with a too big buffer for fixed
size outputs. However, we don't test that.
This change modifies the PKEYKDF tests to ask EVP_PKEY_derive() what the
desired output buffer size is, and as long as the returned value isn't
absurd (indicating that anything goes), the output buffer is made to be
twice as big as what is expected.
Tests #18517
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18533)
Diffstat (limited to 'test')
| -rw-r--r-- | test/evp_test.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/test/evp_test.c b/test/evp_test.c index 768329bd82..0ba8164db0 100644 --- a/test/evp_test.c +++ b/test/evp_test.c @@ -2862,7 +2862,23 @@ static int pkey_kdf_test_run(EVP_TEST *t) { PKEY_KDF_DATA *expected = t->data; unsigned char *got = NULL; - size_t got_len = expected->output_len; + size_t got_len = 0; + + /* Find out the KDF output size */ + if (EVP_PKEY_derive(expected->ctx, NULL, &got_len) <= 0) { + t->err = "INTERNAL_ERROR"; + goto err; + } + + /* + * We may get an absurd output size, which signals that anything goes. + * If not, we specify a too big buffer for the output, to test that + * EVP_PKEY_derive() can cope with it. + */ + if (got_len == SIZE_MAX || got_len == 0) + got_len = expected->output_len; + else + got_len = expected->output_len * 2; if (!TEST_ptr(got = OPENSSL_malloc(got_len == 0 ? 1 : got_len))) { t->err = "INTERNAL_ERROR"; |