From ea643c959f626fd3860b8aa49b42fd0b96e71492 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 30 Aug 2019 16:34:27 +0200 Subject: [PATCH] crypto/evp/pkey_kdf.c: further special treatment of "seed" and "info" pkey_kdf_ctrl_str() has to do the same kind of special treatment as pkey_kdf_ctrl() does. Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/9662) --- crypto/evp/pkey_kdf.c | 43 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/crypto/evp/pkey_kdf.c b/crypto/evp/pkey_kdf.c index 29a24ac688..f4a6093bb1 100644 --- a/crypto/evp/pkey_kdf.c +++ b/crypto/evp/pkey_kdf.c @@ -71,6 +71,24 @@ static void pkey_kdf_cleanup(EVP_PKEY_CTX *ctx) OPENSSL_free(pkctx); } +static int collect(BUF_MEM **collector, void *data, size_t datalen) +{ + size_t i; + + if (*collector == NULL) + *collector = BUF_MEM_new(); + if (*collector == NULL) { + ERR_raise(ERR_LIB_EVP, ERR_R_MALLOC_FAILURE); + return 0; + } + + i = (*collector)->length; /* BUF_MEM_grow() changes it! */ + if (!BUF_MEM_grow(*collector, i + datalen)) + return 0; + memcpy((*collector)->data + i, data, datalen); + return 1; +} + static int pkey_kdf_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2) { EVP_PKEY_KDF_CTX *pkctx = ctx->data; @@ -144,16 +162,9 @@ static int pkey_kdf_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2) } if (collector != NULL) { - size_t i; - switch (cmd) { case T_OCTET_STRING: - if (*collector == NULL) - *collector = BUF_MEM_new(); - i = (*collector)->length; /* BUF_MEM_grow() changes it! */ - BUF_MEM_grow(*collector, i + p1); - memcpy((*collector)->data + i, p2, p1); - break; + return collect(collector, p2, p1); default: OPENSSL_assert("You shouldn't be here"); break; @@ -196,6 +207,7 @@ static int pkey_kdf_ctrl_str(EVP_PKEY_CTX *ctx, const char *type, EVP_PKEY_KDF_CTX *pkctx = ctx->data; EVP_KDF_CTX *kctx = pkctx->kctx; const EVP_KDF *kdf = EVP_KDF_CTX_kdf(kctx); + BUF_MEM **collector = NULL; const OSSL_PARAM *defs = EVP_KDF_CTX_settable_params(kdf); OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END }; int ok = 0; @@ -210,7 +222,20 @@ static int pkey_kdf_ctrl_str(EVP_PKEY_CTX *ctx, const char *type, if (!OSSL_PARAM_allocate_from_text(¶ms[0], defs, type, value, strlen(value))) return 0; - ok = EVP_KDF_CTX_set_params(kctx, params); + + /* + * We do the same special casing of seed and info here as in + * pkey_kdf_ctrl() + */ + if (strcmp(params[0].key, OSSL_KDF_PARAM_SEED) == 0) + collector = &pkctx->collected_seed; + else if (strcmp(params[0].key, OSSL_KDF_PARAM_INFO) == 0) + collector = &pkctx->collected_info; + + if (collector != NULL) + ok = collect(collector, params[0].data, params[0].data_size); + else + ok = EVP_KDF_CTX_set_params(kctx, params); OPENSSL_free(params[0].data); return ok; } -- 2.25.1