diff options
| author | Matt Caswell <matt@openssl.org> | 2018-03-15 12:19:16 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-03-15 12:47:27 +0000 |
| commit | f929439f61e7e4cf40e06de56880758b5344f198 (patch) | |
| tree | 648214966a8152d218f81d3420b56fffdf744da4 /include | |
| parent | e8f9f08f17e4f15ee737115d336d110dc8dea0ec (diff) | |
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: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5520)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/evp.h | 12 | ||||
| -rw-r--r-- | include/openssl/evperr.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/openssl/evp.h b/include/openssl/evp.h index 055f2b7df3..8b81b12362 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -1347,12 +1347,12 @@ void EVP_PKEY_CTX_set0_keygen_info(EVP_PKEY_CTX *ctx, int *dat, int datlen); EVP_PKEY *EVP_PKEY_new_mac_key(int type, ENGINE *e, const unsigned char *key, int keylen); -EVP_PKEY *EVP_PKEY_new_private_key(int type, ENGINE *e, - const unsigned char *priv, - size_t len); -EVP_PKEY *EVP_PKEY_new_public_key(int type, ENGINE *e, - const unsigned char *pub, - size_t len); +EVP_PKEY *EVP_PKEY_new_raw_private_key(int type, ENGINE *e, + const unsigned char *priv, + size_t len); +EVP_PKEY *EVP_PKEY_new_raw_public_key(int type, ENGINE *e, + const unsigned char *pub, + size_t len); EVP_PKEY *EVP_PKEY_new_CMAC_key(ENGINE *e, const unsigned char *priv, size_t len, const EVP_CIPHER *cipher); diff --git a/include/openssl/evperr.h b/include/openssl/evperr.h index 3cdd554f31..b269a8e0de 100644 --- a/include/openssl/evperr.h +++ b/include/openssl/evperr.h @@ -79,8 +79,8 @@ int ERR_load_EVP_strings(void); # define EVP_F_EVP_PKEY_KEYGEN_INIT 147 # define EVP_F_EVP_PKEY_NEW 106 # define EVP_F_EVP_PKEY_NEW_CMAC_KEY 193 -# define EVP_F_EVP_PKEY_NEW_PRIVATE_KEY 191 -# define EVP_F_EVP_PKEY_NEW_PUBLIC_KEY 192 +# define EVP_F_EVP_PKEY_NEW_RAW_PRIVATE_KEY 191 +# define EVP_F_EVP_PKEY_NEW_RAW_PUBLIC_KEY 192 # define EVP_F_EVP_PKEY_PARAMGEN 148 # define EVP_F_EVP_PKEY_PARAMGEN_INIT 149 # define EVP_F_EVP_PKEY_PARAM_CHECK 189 |