Commit f929439f authored by Matt Caswell's avatar Matt Caswell
Browse files

Rename EVP_PKEY_new_private_key()/EVP_PKEY_new_public_key() 



Renamed to EVP_PKEY_new_raw_private_key()/EVP_new_raw_public_key() as per
feedback.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5520)
parent e8f9f08f

apps/dgst.c

+2 −2
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ int dgst_main(int argc, char **argv) 
    }



    if (hmac_key != NULL) {

        sigkey = EVP_PKEY_new_private_key(EVP_PKEY_HMAC, impl,

        sigkey = EVP_PKEY_new_raw_private_key(EVP_PKEY_HMAC, impl,

                                              (unsigned char *)hmac_key, -1);

        if (sigkey == NULL)

            goto end;

crypto/err/openssl.txt

+2 −2
Original line number Diff line number Diff line
@@ -704,8 +704,8 @@ EVP_F_EVP_PKEY_KEYGEN:146:EVP_PKEY_keygen 
EVP_F_EVP_PKEY_KEYGEN_INIT:147:EVP_PKEY_keygen_init

EVP_F_EVP_PKEY_NEW:106:EVP_PKEY_new

EVP_F_EVP_PKEY_NEW_CMAC_KEY:193:EVP_PKEY_new_CMAC_key

EVP_F_EVP_PKEY_NEW_PRIVATE_KEY:191:EVP_PKEY_new_private_key

EVP_F_EVP_PKEY_NEW_PUBLIC_KEY:192:EVP_PKEY_new_public_key

EVP_F_EVP_PKEY_NEW_RAW_PRIVATE_KEY:191:EVP_PKEY_new_raw_private_key

EVP_F_EVP_PKEY_NEW_RAW_PUBLIC_KEY:192:EVP_PKEY_new_raw_public_key

EVP_F_EVP_PKEY_PARAMGEN:148:EVP_PKEY_paramgen

EVP_F_EVP_PKEY_PARAMGEN_INIT:149:EVP_PKEY_paramgen_init

EVP_F_EVP_PKEY_PARAM_CHECK:189:EVP_PKEY_param_check

crypto/evp/evp_err.c

+4 −4
Original line number Diff line number Diff line
@@ -95,10 +95,10 @@ static const ERR_STRING_DATA EVP_str_functs[] = { 
    {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_PKEY_NEW, 0), "EVP_PKEY_new"},

    {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_PKEY_NEW_CMAC_KEY, 0),

     "EVP_PKEY_new_CMAC_key"},

    {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_PKEY_NEW_PRIVATE_KEY, 0),

     "EVP_PKEY_new_private_key"},

    {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_PKEY_NEW_PUBLIC_KEY, 0),

     "EVP_PKEY_new_public_key"},

    {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_PKEY_NEW_RAW_PRIVATE_KEY, 0),

     "EVP_PKEY_new_raw_private_key"},

    {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_PKEY_NEW_RAW_PUBLIC_KEY, 0),

     "EVP_PKEY_new_raw_public_key"},

    {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_PKEY_PARAMGEN, 0), "EVP_PKEY_paramgen"},

    {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_PKEY_PARAMGEN_INIT, 0),

     "EVP_PKEY_paramgen_init"},

crypto/evp/p_lib.c

+10 −10
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ static int pkey_set_type(EVP_PKEY *pkey, ENGINE *e, int type, const char *str, 
    return 1;

}



EVP_PKEY *EVP_PKEY_new_private_key(int type, ENGINE *e,

EVP_PKEY *EVP_PKEY_new_raw_private_key(int type, ENGINE *e,

                                       const unsigned char *priv,

                                       size_t len)

{
@@ -233,13 +233,13 @@ EVP_PKEY *EVP_PKEY_new_private_key(int type, ENGINE *e, 
    }



    if (ret->ameth->set_priv_key == NULL) {

        EVPerr(EVP_F_EVP_PKEY_NEW_PRIVATE_KEY,

        EVPerr(EVP_F_EVP_PKEY_NEW_RAW_PRIVATE_KEY,

               EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);

        goto err;

    }



    if (!ret->ameth->set_priv_key(ret, priv, len)) {

        EVPerr(EVP_F_EVP_PKEY_NEW_PRIVATE_KEY, EVP_R_KEY_SETUP_FAILED);

        EVPerr(EVP_F_EVP_PKEY_NEW_RAW_PRIVATE_KEY, EVP_R_KEY_SETUP_FAILED);

        goto err;

    }
@@ -250,7 +250,7 @@ EVP_PKEY *EVP_PKEY_new_private_key(int type, ENGINE *e, 
    return NULL;

}



EVP_PKEY *EVP_PKEY_new_public_key(int type, ENGINE *e,

EVP_PKEY *EVP_PKEY_new_raw_public_key(int type, ENGINE *e,

                                      const unsigned char *pub,

                                      size_t len)

{
@@ -263,13 +263,13 @@ EVP_PKEY *EVP_PKEY_new_public_key(int type, ENGINE *e, 
    }



    if (ret->ameth->set_pub_key == NULL) {

        EVPerr(EVP_F_EVP_PKEY_NEW_PUBLIC_KEY,

        EVPerr(EVP_F_EVP_PKEY_NEW_RAW_PUBLIC_KEY,

               EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);

        goto err;

    }



    if (!ret->ameth->set_pub_key(ret, pub, len)) {

        EVPerr(EVP_F_EVP_PKEY_NEW_PUBLIC_KEY, EVP_R_KEY_SETUP_FAILED);

        EVPerr(EVP_F_EVP_PKEY_NEW_RAW_PUBLIC_KEY, EVP_R_KEY_SETUP_FAILED);

        goto err;

    }

crypto/kdf/tls1_prf.c

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ static int tls1_prf_P_hash(const EVP_MD *md, 
    if (ctx == NULL || ctx_tmp == NULL || ctx_init == NULL)

        goto err;

    EVP_MD_CTX_set_flags(ctx_init, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);

    mac_key = EVP_PKEY_new_private_key(EVP_PKEY_HMAC, NULL, sec, sec_len);

    mac_key = EVP_PKEY_new_raw_private_key(EVP_PKEY_HMAC, NULL, sec, sec_len);

    if (mac_key == NULL)

        goto err;

    if (!EVP_DigestSignInit(ctx_init, NULL, md, NULL, mac_key))