diff options
| author | Tomas Mraz <tomas@openssl.org> | 2022-07-11 12:49:56 +0200 |
|---|---|---|
| committer | Hugo Landau <hlandau@openssl.org> | 2022-07-13 07:36:43 +0100 |
| commit | c060c040367e4e2dc44b027d4e52163376f40777 (patch) | |
| tree | 53f976907b74cd9a34ffc996ee3fae941ce1c9e4 | |
| parent | 372f4b80e35954d19ffb255692bdd6e4807e5f7a (diff) | |
speed: Always reset the outlen when calling EVP_PKEY_derive
Fixes #18768
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18777)
(cherry picked from commit ab8d56d05b773e499c86be874fd3f11f5950213c)
| -rw-r--r-- | apps/speed.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/apps/speed.c b/apps/speed.c index 535e0f45c2..c8ad19a2bf 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -875,11 +875,14 @@ static int FFDH_derive_key_loop(void *args) loopargs_t *tempargs = *(loopargs_t **) args; EVP_PKEY_CTX *ffdh_ctx = tempargs->ffdh_ctx[testnum]; unsigned char *derived_secret = tempargs->secret_ff_a; - size_t outlen = MAX_FFDH_SIZE; int count; - for (count = 0; COND(ffdh_c[testnum][0]); count++) + for (count = 0; COND(ffdh_c[testnum][0]); count++) { + /* outlen can be overwritten with a too small value (no padding used) */ + size_t outlen = MAX_FFDH_SIZE; + EVP_PKEY_derive(ffdh_ctx, derived_secret, &outlen); + } return count; } #endif /* OPENSSL_NO_DH */ |