Commit 00a5a74b authored by Matt Caswell's avatar Matt Caswell
Browse files

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


Mark them as such with OPENSSL_USE_DEPRECATED

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
parent a8b4e057

crypto/hmac/hmac.c

+3 −1
Original line number Diff line number Diff line
@@ -118,12 +118,14 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len, 
    return 0;

}



#ifndef OPENSSL_NO_DEPRECATED

int HMAC_Init(HMAC_CTX *ctx, const void *key, int len, const EVP_MD *md)

{

    if (key && md)

        HMAC_CTX_init(ctx);

    return HMAC_Init_ex(ctx, key, len, md, NULL);

}

#endif



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)

        md = m;

    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;

    if (!HMAC_Update(&c, d, n))

        goto err;

crypto/hmac/hmac.h

+5 −2
Original line number Diff line number Diff line
@@ -82,12 +82,15 @@ typedef struct hmac_ctx_st { 
void HMAC_CTX_init(HMAC_CTX *ctx);

void HMAC_CTX_cleanup(HMAC_CTX *ctx);



#ifdef OPENSSL_USE_DEPRECATED

/* deprecated */

# define HMAC_cleanup(ctx) HMAC_CTX_cleanup(ctx)



/* deprecated */

__owur int HMAC_Init(HMAC_CTX *ctx, const void *key, int len,

                     const EVP_MD *md);

DECLARE_DEPRECATED(__owur int HMAC_Init(HMAC_CTX *ctx, const void *key, int len,

                     const EVP_MD *md));



#endif

/*__owur*/ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,

                            const EVP_MD *md, ENGINE *impl);

/*__owur*/ int HMAC_Update(HMAC_CTX *ctx, const unsigned char *data,