Commit e65f6509 authored by Johannes Bauer's avatar Johannes Bauer Committed by Dr. Stephen Henson
Browse files

Set error when HKDF used without parameters 



Introduce KDF_F_PKEY_HKDF_DERIVE and return the KDF_R_MISSING_PARAMETER
error code when required parameters have not been set. This will make
"openssl pkeyutl -kdf HKDF" return a meaningful error message instead of
simply "Public Key operation error".

Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
Reviewed-by: default avatarStephen Henson <steve@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3989)
parent d9ca12cb

crypto/err/openssl.txt

+1 −0
Original line number Diff line number Diff line
@@ -700,6 +700,7 @@ EVP_F_PKEY_SET_TYPE:158:pkey_set_type 
EVP_F_RC2_MAGIC_TO_METH:109:rc2_magic_to_meth

EVP_F_RC5_CTRL:125:rc5_ctrl

EVP_F_UPDATE:173:update

KDF_F_PKEY_HKDF_DERIVE:102:pkey_hkdf_derive

KDF_F_PKEY_TLS1_PRF_CTRL_STR:100:pkey_tls1_prf_ctrl_str

KDF_F_PKEY_TLS1_PRF_DERIVE:101:pkey_tls1_prf_derive

OBJ_F_OBJ_ADD_OBJECT:105:OBJ_add_object

crypto/kdf/hkdf.c

+3 −1
Original line number Diff line number Diff line
@@ -177,8 +177,10 @@ static int pkey_hkdf_derive(EVP_PKEY_CTX *ctx, unsigned char *key, 
{

    HKDF_PKEY_CTX *kctx = ctx->data;



    if (kctx->md == NULL || kctx->key == NULL)

    if (kctx->md == NULL || kctx->key == NULL) {

        KDFerr(KDF_F_PKEY_HKDF_DERIVE, KDF_R_MISSING_PARAMETER);

        return 0;

    }



    switch (kctx->mode) {

    case EVP_PKEY_HKDEF_MODE_EXTRACT_AND_EXPAND:

crypto/kdf/kdf_err.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#ifndef OPENSSL_NO_ERR



static const ERR_STRING_DATA KDF_str_functs[] = {

    {ERR_PACK(ERR_LIB_KDF, KDF_F_PKEY_HKDF_DERIVE, 0), "pkey_hkdf_derive"},

    {ERR_PACK(ERR_LIB_KDF, KDF_F_PKEY_TLS1_PRF_CTRL_STR, 0),

     "pkey_tls1_prf_ctrl_str"},

    {ERR_PACK(ERR_LIB_KDF, KDF_F_PKEY_TLS1_PRF_DERIVE, 0),

include/openssl/kdferr.h

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ int ERR_load_KDF_strings(void); 
/*

 * KDF function codes.

 */

# define KDF_F_PKEY_HKDF_DERIVE                           102

# define KDF_F_PKEY_TLS1_PRF_CTRL_STR                     100

# define KDF_F_PKEY_TLS1_PRF_DERIVE                       101