generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

constify EVP_PKEY_new_mac_key()

Browse Source
This commit is contained in:
Dr. Stephen Henson 2010-11-24 13:14:03 +00:00
parent 736d658080
commit ec1e714ac1
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/evp/evp.h
View File

@ -1066,7 +1066,7 @@ int EVP_PKEY_CTX_get_operation(EVP_PKEY_CTX *ctx);
void EVP_PKEY_CTX_set0_keygen_info(EVP_PKEY_CTX *ctx, int *dat, int datlen); 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, EVP_PKEY *EVP_PKEY_new_mac_key(int type, ENGINE *e,
unsigned char *key, int keylen); const unsigned char *key, int keylen);
void EVP_PKEY_CTX_set_data(EVP_PKEY_CTX *ctx, void *data); void EVP_PKEY_CTX_set_data(EVP_PKEY_CTX *ctx, void *data);
void *EVP_PKEY_CTX_get_data(EVP_PKEY_CTX *ctx); void *EVP_PKEY_CTX_get_data(EVP_PKEY_CTX *ctx);

5
crypto/evp/pmeth_gn.c
View File

@ -199,7 +199,7 @@ int EVP_PKEY_CTX_get_keygen_info(EVP_PKEY_CTX *ctx, int idx)
} }
EVP_PKEY *EVP_PKEY_new_mac_key(int type, ENGINE *e, EVP_PKEY *EVP_PKEY_new_mac_key(int type, ENGINE *e,
unsigned char *key, int keylen) const unsigned char *key, int keylen)
{ {
EVP_PKEY_CTX *mac_ctx = NULL; EVP_PKEY_CTX *mac_ctx = NULL;
EVP_PKEY *mac_key = NULL; EVP_PKEY *mac_key = NULL;
@ -209,7 +209,8 @@ EVP_PKEY *EVP_PKEY_new_mac_key(int type, ENGINE *e,
if (EVP_PKEY_keygen_init(mac_ctx) <= 0) if (EVP_PKEY_keygen_init(mac_ctx) <= 0)
goto merr; goto merr;
if (EVP_PKEY_CTX_ctrl(mac_ctx, -1, EVP_PKEY_OP_KEYGEN, if (EVP_PKEY_CTX_ctrl(mac_ctx, -1, EVP_PKEY_OP_KEYGEN,
EVP_PKEY_CTRL_SET_MAC_KEY, keylen, key) <= 0) EVP_PKEY_CTRL_SET_MAC_KEY,
keylen, (void *)key) <= 0)
goto merr; goto merr;
if (EVP_PKEY_keygen(mac_ctx, &mac_key) <= 0) if (EVP_PKEY_keygen(mac_ctx, &mac_key) <= 0)
goto merr; goto merr;