From d2e5c1885639377eb06a03a852d05faf06b4a3c1 Mon Sep 17 00:00:00 2001
From: Miloslav Trmač <mitr@redhat.com>
Date: Wed, 25 Aug 2010 04:31:52 +0200
Subject: Remove a redundant argument of cryptodev_hash_init

---
 cryptodev_cipher.c                     | 4 ++--
 cryptodev_int.h                        | 2 +-
 libtomcrypt/hashes/hash_memory.c       | 2 +-
 libtomcrypt/hashes/hash_memory_multi.c | 2 +-
 ncr-sessions.c                         | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cryptodev_cipher.c b/cryptodev_cipher.c
index 4e74fcc..dae4a63 100644
--- a/cryptodev_cipher.c
+++ b/cryptodev_cipher.c
@@ -216,7 +216,7 @@ ssize_t cryptodev_cipher_decrypt( struct cipher_data* cdata, const struct scatte
 
 /* Hash functions */
 
-int cryptodev_hash_init( struct hash_data* hdata, const char* alg_name, int hmac_mode, void * mackey, size_t mackeylen)
+int cryptodev_hash_init(struct hash_data *hdata, const char *alg_name, const void *mackey, size_t mackeylen)
 {
 int ret;
 
@@ -228,7 +228,7 @@ int ret;
 	}
 
 	/* Copy the key from user and set to TFM. */
-	if (hmac_mode != 0) {
+	if (mackey != NULL) {
 
 		ret = crypto_ahash_setkey(hdata->async.s, mackey, mackeylen);
 		if (unlikely(ret)) {
diff --git a/cryptodev_int.h b/cryptodev_int.h
index e381505..573fcaa 100644
--- a/cryptodev_int.h
+++ b/cryptodev_int.h
@@ -77,6 +77,6 @@ ssize_t cryptodev_hash_update( struct hash_data* hdata, struct scatterlist *sg,
 ssize_t _cryptodev_hash_update( struct hash_data* hdata, const void* data, size_t len);
 int cryptodev_hash_reset( struct hash_data* hdata);
 void cryptodev_hash_deinit(struct hash_data* hdata);
-int cryptodev_hash_init( struct hash_data* hdata, const char* alg_name, int hmac_mode, void* mackey, size_t mackeylen);
+int cryptodev_hash_init(struct hash_data *hdata, const char *alg_name, const void *mackey, size_t mackeylen);
 
 #endif /* CRYPTODEV_INT_H */
diff --git a/libtomcrypt/hashes/hash_memory.c b/libtomcrypt/hashes/hash_memory.c
index a416de9..c6f5188 100644
--- a/libtomcrypt/hashes/hash_memory.c
+++ b/libtomcrypt/hashes/hash_memory.c
@@ -44,7 +44,7 @@ int hash_memory(const struct algo_properties_st *hash, const unsigned char *in,
        return CRYPT_BUFFER_OVERFLOW;
     }
 
-    err = cryptodev_hash_init( &hdata, hash->kstr, 0, NULL, 0);
+    err = cryptodev_hash_init(&hdata, hash->kstr, NULL, 0);
     if (err < 0) {
        err = CRYPT_INVALID_HASH;
        goto LBL_ERR;
diff --git a/libtomcrypt/hashes/hash_memory_multi.c b/libtomcrypt/hashes/hash_memory_multi.c
index a914916..7422676 100644
--- a/libtomcrypt/hashes/hash_memory_multi.c
+++ b/libtomcrypt/hashes/hash_memory_multi.c
@@ -50,7 +50,7 @@ int hash_memory_multi(const struct algo_properties_st *hash, unsigned char *out,
        return CRYPT_BUFFER_OVERFLOW;
     }
 
-    err = cryptodev_hash_init( &hdata, hash->kstr, 0, NULL, 0);
+    err = cryptodev_hash_init(&hdata, hash->kstr, NULL, 0);
     if (err < 0) {
        err = CRYPT_INVALID_HASH;
        goto LBL_ERR;
diff --git a/ncr-sessions.c b/ncr-sessions.c
index e5e49ad..5a4ba72 100644
--- a/ncr-sessions.c
+++ b/ncr-sessions.c
@@ -391,7 +391,7 @@ static int _ncr_session_init(struct ncr_lists *lists, ncr_crypto_op_t op,
 					goto fail;
 				}
 
-				ret = cryptodev_hash_init(&ns->hash, ns->algorithm->kstr, 0, NULL, 0);
+				ret = cryptodev_hash_init(&ns->hash, ns->algorithm->kstr, NULL, 0);
 				if (ret < 0) {
 					err();
 					goto fail;
@@ -421,7 +421,7 @@ static int _ncr_session_init(struct ncr_lists *lists, ncr_crypto_op_t op,
 						goto fail;
 					}
 
-					ret = cryptodev_hash_init(&ns->hash, ns->algorithm->kstr, 1,
+					ret = cryptodev_hash_init(&ns->hash, ns->algorithm->kstr,
 						ns->key->key.secret.data, ns->key->key.secret.size);
 					if (ret < 0) {
 						err();
@@ -456,7 +456,7 @@ static int _ncr_session_init(struct ncr_lists *lists, ncr_crypto_op_t op,
 						goto fail;
 					}
 
-					ret = cryptodev_hash_init(&ns->hash, sign_hash->kstr, 0, NULL, 0);
+					ret = cryptodev_hash_init(&ns->hash, sign_hash->kstr, NULL, 0);
 					if (ret < 0) {
 						err();
 						goto fail;
-- 
cgit