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

HMAC_cleanup, and HMAC_Init are stated as deprecated in the docs and source.

Browse Source 
Mark them as such with OPENSSL_USE_DEPRECATED

Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
Matt Caswell 2015-02-10 09:45:18 +00:00
parent a8b4e057b3
commit 00a5a74bbc
2 changed files with 8 additions and 3 deletions
crypto/hmac
hmac.chmac.h

4
crypto/hmac/hmac.c

@ -118,12 +118,14 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
return 0; return 0;
} }
#ifndef OPENSSL_NO_DEPRECATED
int HMAC_Init(HMAC_CTX *ctx, const void *key, int len, const EVP_MD *md) int HMAC_Init(HMAC_CTX *ctx, const void *key, int len, const EVP_MD *md)
{ {
if (key && md) if (key && md)
HMAC_CTX_init(ctx); HMAC_CTX_init(ctx);
return HMAC_Init_ex(ctx, key, len, md, NULL); return HMAC_Init_ex(ctx, key, len, md, NULL);
} }
#endif
int HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, size_t len) int HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, size_t len)
{ {
@ -190,7 +192,7 @@ unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len,
if (md == NULL) if (md == NULL)
md = m; md = m;
HMAC_CTX_init(&c); HMAC_CTX_init(&c);
if (!HMAC_Init(&c, key, key_len, evp_md)) if (!HMAC_Init_ex(&c, key, key_len, evp_md, NULL))
goto err; goto err;
if (!HMAC_Update(&c, d, n)) if (!HMAC_Update(&c, d, n))
goto err; goto err;

7
crypto/hmac/hmac.h

@ -82,12 +82,15 @@ typedef struct hmac_ctx_st {
void HMAC_CTX_init(HMAC_CTX *ctx); void HMAC_CTX_init(HMAC_CTX *ctx);
void HMAC_CTX_cleanup(HMAC_CTX *ctx); void HMAC_CTX_cleanup(HMAC_CTX *ctx);
#ifdef OPENSSL_USE_DEPRECATED
/* deprecated */ /* deprecated */
# define HMAC_cleanup(ctx) HMAC_CTX_cleanup(ctx) # define HMAC_cleanup(ctx) HMAC_CTX_cleanup(ctx)
/* deprecated */ /* deprecated */
__owur int HMAC_Init(HMAC_CTX *ctx, const void *key, int len, DECLARE_DEPRECATED(__owur int HMAC_Init(HMAC_CTX *ctx, const void *key, int len,
const EVP_MD *md); const EVP_MD *md));
#endif
/*__owur*/ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len, /*__owur*/ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
const EVP_MD *md, ENGINE *impl); const EVP_MD *md, ENGINE *impl);
/*__owur*/ int HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, /*__owur*/ int HMAC_Update(HMAC_CTX *ctx, const unsigned char *data,