OERV-RUNTIME/boringssl
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Deprecate EVP_PKEY_HMAC.

Browse Source 
Now that BoringSSL no longer uses it internally, deprecate it until we can get
any Google code off it and remove it altogether.

Change-Id: I0e15525600b27a65f84b4bb820b879b2424a0ef7
Reviewed-on: https://boringssl-review.googlesource.com/2701
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin
2015-01-14 21:06:07 +00:00
committed by Adam Langley
parent b8a56f112f
commit e9e38375a6
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openssl/digest.h
+2 -1
View File
@@ -252,7 +252,8 @@ struct env_md_ctx_st {
* context. */
void *md_data;
/* update is usually copied from |digest->update| but can differ in some
* cases, i.e. HMAC. */
* cases, i.e. HMAC.
* TODO(davidben): Remove this hook once |EVP_PKEY_HMAC| is gone. */
int (*update)(EVP_MD_CTX *ctx, const void *data, size_t count);
/* pctx is an opaque (at this layer) pointer to additional context that
include/openssl/evp.h
+6 -3
View File
@@ -135,9 +135,10 @@ OPENSSL_EXPORT int EVP_PKEY_id(const EVP_PKEY *pkey);
* |EVP_PKEY_RSA2| will be turned into |EVP_PKEY_RSA|. */
OPENSSL_EXPORT int EVP_PKEY_type(int nid);
/* EVP_PKEY_new_mac_key allocates a fresh |EVP_PKEY| of the given type (e.g.
* |EVP_PKEY_HMAC|), sets |mac_key| as the MAC key and "generates" a new key,
* suitable for signing. It returns the fresh |EVP_PKEY|, or NULL on error. */
/* Deprecated: EVP_PKEY_new_mac_key allocates a fresh |EVP_PKEY| of the given
* type (e.g. |EVP_PKEY_HMAC|), sets |mac_key| as the MAC key and "generates" a
* new key, suitable for signing. It returns the fresh |EVP_PKEY|, or NULL on
* error. Use |HMAC_CTX| directly instead. */
OPENSSL_EXPORT EVP_PKEY *EVP_PKEY_new_mac_key(int type, ENGINE *engine,
const uint8_t *mac_key,
size_t mac_key_len);
@@ -174,6 +175,8 @@ OPENSSL_EXPORT struct dh_st *EVP_PKEY_get1_DH(EVP_PKEY *pkey);
#define EVP_PKEY_DH NID_dhKeyAgreement
#define EVP_PKEY_DHX NID_dhpublicnumber
#define EVP_PKEY_EC NID_X9_62_id_ecPublicKey
/* Deprecated: Use |HMAC_CTX| directly instead. */
#define EVP_PKEY_HMAC NID_hmac
/* EVP_PKEY_assign sets the underlying key of |pkey| to |key|, which must be of