Commit 46fc96d4 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

constify EVP_PKEY_new_mac_key()

parent da64e0d8

crypto/evp/evp.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -1073,7 +1073,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);

crypto/evp/pmeth_gn.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -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;