Moved HMAC prints back to main crypto module

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>

diff --git a/crypto.c b/crypto.c
index d8d6656c03b2cb93b0cfa1612d3d671c480bdd26..d17f706544ab3367497d8b4a70e17c8fcf7c44ad 100644 (file)
--- a/crypto.c
+++ b/crypto.c
@@ -462,8 +462,20 @@ init_key_ctx (struct key_ctx *ctx, struct key *key,
   if (kt->digest && kt->hmac_length > 0)
     {
       ALLOC_OBJ(ctx->hmac, hmac_ctx_t);
-      hmac_ctx_init (ctx->hmac, key->hmac, kt->hmac_length, kt->digest,
-         prefix);
+      hmac_ctx_init (ctx->hmac, key->hmac, kt->hmac_length, kt->digest);
+
+      msg (D_HANDSHAKE,
+      "%s: Using %d bit message hash '%s' for HMAC authentication",
+      prefix, md_kt_size(kt->digest) * 8, md_kt_name(kt->digest));
+
+      dmsg (D_SHOW_KEYS, "%s: HMAC KEY: %s", prefix,
+         format_hex (key->hmac, kt->hmac_length, 0, &gc));
+
+      dmsg (D_CRYPTO_DEBUG, "%s: HMAC size=%d block_size=%d",
+       prefix,
+       md_kt_size(kt->digest),
+       hmac_ctx_size(ctx->hmac));
+
     }
   gc_free (&gc);
 }

diff --git a/crypto_backend.h b/crypto_backend.h
index 25d985b8e2d0924963e3ce1a4e7202534b8312f6..f16dc3566eedaba71c60eca8be8bef93d3cb9f49 100644 (file)
--- a/crypto_backend.h
+++ b/crypto_backend.h
@@ -442,11 +442,10 @@ void md_ctx_final (md_ctx_t *ctx, uint8_t *dst);
  * @param key          The key to use for the HMAC
  * @param key_len      The key length to use
  * @param kt           Static message digest parameters
- * @param prefix       Prefix to use when printing debug information.
  *
  */
 void hmac_ctx_init (hmac_ctx_t *ctx, const uint8_t *key, int key_length,
-    const md_kt_t *kt, const char *prefix);
+    const md_kt_t *kt);
 
 /*
  * Free the given HMAC context.

diff --git a/crypto_openssl.c b/crypto_openssl.c
index b94451a217903fcefb4a3b86f5d54616f570601f..7250782c11d44c77d84b924f9c3281cf9f81a085 100644 (file)
--- a/crypto_openssl.c
+++ b/crypto_openssl.c
@@ -745,10 +745,8 @@ md_ctx_final (EVP_MD_CTX *ctx, uint8_t *dst)
 
 void
 hmac_ctx_init (HMAC_CTX *ctx, const uint8_t *key, int key_len,
-    const EVP_MD *kt, const char *prefix)
+    const EVP_MD *kt)
 {
-  struct gc_arena gc = gc_new ();
-
   ASSERT(NULL != kt && NULL != ctx);
 
   CLEAR(*ctx);
@@ -756,24 +754,8 @@ hmac_ctx_init (HMAC_CTX *ctx, const uint8_t *key, int key_len,
   HMAC_CTX_init (ctx);
   HMAC_Init_ex (ctx, key, key_len, kt, NULL);
 
-  if (prefix)
-    msg (D_HANDSHAKE,
-       "%s: Using %d bit message hash '%s' for HMAC authentication",
-       prefix, HMAC_size (ctx) * 8, OBJ_nid2sn (EVP_MD_type (kt)));
-
   /* make sure we used a big enough key */
   ASSERT (HMAC_size (ctx) <= key_len);
-
-  if (prefix)
-    dmsg (D_SHOW_KEYS, "%s: HMAC KEY: %s", prefix,
-       format_hex (key, key_len, 0, &gc));
-  if (prefix)
-    dmsg (D_CRYPTO_DEBUG, "%s: HMAC size=%d block_size=%d",
-       prefix,
-       EVP_MD_size (kt),
-       EVP_MD_block_size (kt));
-
-  gc_free (&gc);
 }
 
 void

diff --git a/crypto_polarssl.c b/crypto_polarssl.c
index 368e8f84aba526ed03cd37a81d6dce2427b0edb2..e4b9099908a0ac669618fd62cb64fb233c8a3e6d 100644 (file)
--- a/crypto_polarssl.c
+++ b/crypto_polarssl.c
@@ -511,11 +511,8 @@ md_ctx_final (md_context_t *ctx, uint8_t *dst)
  * TODO: re-enable dmsg for crypto debug
  */
 void
-hmac_ctx_init (md_context_t *ctx, const uint8_t *key, int key_len, const md_info_t *kt,
-    const char *prefix)
+hmac_ctx_init (md_context_t *ctx, const uint8_t *key, int key_len, const md_info_t *kt)
 {
-  struct gc_arena gc = gc_new ();
-
   ASSERT(NULL != kt && NULL != ctx);
 
   CLEAR(*ctx);
@@ -523,24 +520,8 @@ hmac_ctx_init (md_context_t *ctx, const uint8_t *key, int key_len, const md_info
   ASSERT(0 == md_init_ctx(ctx, kt));
   ASSERT(0 == md_hmac_starts(ctx, key, key_len));
 
-  if (prefix)
-    msg (D_HANDSHAKE,
-       "%s: Using %d bit message hash '%s' for HMAC authentication",
-       prefix, md_get_size(kt) * 8, md_get_name(kt));
-
   /* make sure we used a big enough key */
   ASSERT (md_get_size(kt) <= key_len);
-
-  if (prefix)
-    dmsg (D_SHOW_KEYS, "%s: HMAC KEY: %s", prefix,
-       format_hex (key, key_len, 0, &gc));
-//  if (prefix)
-//    dmsg (D_CRYPTO_DEBUG, "%s: HMAC size=%d block_size=%d",
-//         prefix,
-//         md_get_size(md_info),
-//         EVP_MD_block_size (md_info));
-
-  gc_free (&gc);
 }
 
 void

diff --git a/ntlm.c b/ntlm.c
index 23416a75f8e57ea0e34890e5b4849f7d91814086..ee33bd4ef143199a5750ec587ec17baf43ececb6 100644 (file)
--- a/ntlm.c
+++ b/ntlm.c
@@ -84,7 +84,7 @@ gen_hmac_md5 (const char* data, int data_len, const char* key, int key_len,char
        hmac_ctx_t hmac_ctx;
        CLEAR(hmac_ctx);
 
-       hmac_ctx_init(&hmac_ctx, key, key_len, md5_kt, NULL);
+       hmac_ctx_init(&hmac_ctx, key, key_len, md5_kt);
        hmac_ctx_update(&hmac_ctx, (const unsigned char *)data, data_len);
        hmac_ctx_final(&hmac_ctx, (unsigned char *)result);
        hmac_ctx_cleanup(&hmac_ctx);

diff --git a/ssl.c b/ssl.c
index 5915df7761a5750e941b9c42a7738e5c88267d2c..30f6eb2ca14b1684a4b5726e258a6038f71f52d5 100644 (file)
--- a/ssl.c
+++ b/ssl.c
@@ -1188,8 +1188,8 @@ tls1_P_hash(const md_kt_t *md_kt,
   chunk = md_kt_size(md_kt);
   A1_len = md_kt_size(md_kt);
 
-  hmac_ctx_init(&ctx, sec, sec_len, md_kt, NULL);
-  hmac_ctx_init(&ctx_tmp, sec, sec_len, md_kt, NULL);
+  hmac_ctx_init(&ctx, sec, sec_len, md_kt);
+  hmac_ctx_init(&ctx_tmp, sec, sec_len, md_kt);
 
   hmac_ctx_update(&ctx,seed,seed_len);
   hmac_ctx_final(&ctx, A1);