commit af8731f7a530c07602f9a806604613ddaf79f58a
author David Benjamin <davidben@chromium.org> Mon Jun 01 19:35:44 2015 -0400
committer Adam Langley <agl@google.com> Tue Jun 02 01:07:07 2015 +0000
tree 255a8b39ab8cc7f265eb40b35606ec6d87dfbbe7
parent bf3208b84930d572392e16ef875a1383fbe7c4f9

Remove HMAC_CTX_set_flags.

It's never called externally and for good reason; the only flag to set is
EVP_MD_CTX_FLAG_NO_INIT which is an implementation detail of EVP_PKEY_HMAC
(hopefully to be removed eventually). Indeed, only EVP_PKEY_HMAC ever calls
this function. Except there's no need to because the HMAC_CTX has already been
initialized at that point. (And were it not initialized, that call would not
bode well for the poor HMAC_CTX.)

The legacy EVP_PKEY_HMAC API has test coverage and still works after this
change.

Change-Id: I2fb0bede3c24ad1519f9433f957606de15ba86c7
Reviewed-on: https://boringssl-review.googlesource.com/4970
Reviewed-by: Adam Langley <agl@google.com>

crypto/evp/p_hmac.c

diff --git a/crypto/evp/p_hmac.c b/crypto/evp/p_hmac.c
index f4a4193..71b57d3 100644
--- a/crypto/evp/p_hmac.c
+++ b/crypto/evp/p_hmac.c
@@ -148,9 +148,8 @@
 }
 
 static int hmac_signctx_init(EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx) {
-  HMAC_PKEY_CTX *hctx = ctx->data;
-
-  HMAC_CTX_set_flags(&hctx->ctx, mctx->flags & ~EVP_MD_CTX_FLAG_NO_INIT);
+  /* |mctx| gets repurposed as a hook to call |HMAC_Update|. Suppress the
+   * automatic setting of |mctx->update| and the rest of its initialization. */
   EVP_MD_CTX_set_flags(mctx, EVP_MD_CTX_FLAG_NO_INIT);
   mctx->update = int_update;
   return 1;

crypto/hmac/hmac.c

diff --git a/crypto/hmac/hmac.c b/crypto/hmac/hmac.c
index eb48620..556e7f9 100644
--- a/crypto/hmac/hmac.c
+++ b/crypto/hmac/hmac.c
@@ -200,12 +200,6 @@
   return 1;
 }
 
-void HMAC_CTX_set_flags(HMAC_CTX *ctx, unsigned long flags) {
-  EVP_MD_CTX_set_flags(&ctx->i_ctx, flags);
-  EVP_MD_CTX_set_flags(&ctx->o_ctx, flags);
-  EVP_MD_CTX_set_flags(&ctx->md_ctx, flags);
-}
-
 int HMAC_Init(HMAC_CTX *ctx, const void *key, int key_len, const EVP_MD *md) {
   if (key && md) {
     HMAC_CTX_init(ctx);

include/openssl/hmac.h

diff --git a/include/openssl/hmac.h b/include/openssl/hmac.h
index b8cf4af..e521212 100644
--- a/include/openssl/hmac.h
+++ b/include/openssl/hmac.h
@@ -129,13 +129,6 @@
  * on error. */
 OPENSSL_EXPORT int HMAC_CTX_copy_ex(HMAC_CTX *dest, const HMAC_CTX *src);
 
-/* HMAC_CTX_set_flags ORs |flags| into the flags of the underlying digests of
- * |ctx|, which must have been setup by a call to |HMAC_Init_ex|. See
- * |EVP_MD_CTX_set_flags|.
- *
- * TODO(fork): remove? */
-OPENSSL_EXPORT void HMAC_CTX_set_flags(HMAC_CTX *ctx, unsigned long flags);
-
 
 /* Deprecated functions. */