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

Mark them as such with OPENSSL_USE_DEPRECATED

Reviewed-by: Tim Hudson <tjh@openssl.org>

diff --git a/crypto/hmac/hmac.c b/crypto/hmac/hmac.c
index 1d871f04100b2e6d095fb805cf5596ddedb45bba..3a4dfa4f401277c6407254ef07e8668ab50ea9bf 100644 (file)
--- a/crypto/hmac/hmac.c
+++ b/crypto/hmac/hmac.c
@@ -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;

diff --git a/crypto/hmac/hmac.h b/crypto/hmac/hmac.h
index 2404e530ee536a09ccf255e5fbe07d6a0b58d1d1..81aa49da49969d42aee5dd1fad8d0ad1e1b5f03d 100644 (file)
--- a/crypto/hmac/hmac.h
+++ b/crypto/hmac/hmac.h
@@ -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,