drbd: Remove obsolete drbd_crypto_is_hash()
We allocate hash transformations with crypto_alloc_hash() which will
only return hash algorithms. It is not necessary to reconfirm that we
actually got a hash algorithm.
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index e84b1d7..dc5824b 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -1799,7 +1799,7 @@
};
static int
-alloc_tfm(struct crypto_hash **tfm, char *tfm_name, int err_alg, int err_nd)
+alloc_hash(struct crypto_hash **tfm, char *tfm_name, int err_alg)
{
if (!tfm_name[0])
return NO_ERROR;
@@ -1810,9 +1810,6 @@
return err_alg;
}
- if (!drbd_crypto_is_hash(crypto_hash_tfm(*tfm)))
- return err_nd;
-
return NO_ERROR;
}
@@ -1823,28 +1820,28 @@
enum drbd_ret_code rv;
int hash_size;
- rv = alloc_tfm(&crypto->csums_tfm, new_conf->csums_alg,
- ERR_CSUMS_ALG, ERR_CSUMS_ALG_ND);
+ rv = alloc_hash(&crypto->csums_tfm, new_conf->csums_alg,
+ ERR_CSUMS_ALG);
if (rv != NO_ERROR)
return rv;
- rv = alloc_tfm(&crypto->verify_tfm, new_conf->verify_alg,
- ERR_VERIFY_ALG, ERR_VERIFY_ALG_ND);
+ rv = alloc_hash(&crypto->verify_tfm, new_conf->verify_alg,
+ ERR_VERIFY_ALG);
if (rv != NO_ERROR)
return rv;
- rv = alloc_tfm(&crypto->integrity_tfm, new_conf->integrity_alg,
- ERR_INTEGRITY_ALG, ERR_INTEGRITY_ALG_ND);
+ rv = alloc_hash(&crypto->integrity_tfm, new_conf->integrity_alg,
+ ERR_INTEGRITY_ALG);
if (rv != NO_ERROR)
return rv;
- rv = alloc_tfm(&crypto->peer_integrity_tfm, new_conf->integrity_alg,
- ERR_INTEGRITY_ALG, ERR_INTEGRITY_ALG_ND);
+ rv = alloc_hash(&crypto->peer_integrity_tfm, new_conf->integrity_alg,
+ ERR_INTEGRITY_ALG);
if (rv != NO_ERROR)
return rv;
if (new_conf->cram_hmac_alg[0] != 0) {
snprintf(hmac_name, CRYPTO_MAX_ALG_NAME, "hmac(%s)",
new_conf->cram_hmac_alg);
- rv = alloc_tfm(&crypto->cram_hmac_tfm, hmac_name,
- ERR_AUTH_ALG, ERR_AUTH_ALG_ND);
+ rv = alloc_hash(&crypto->cram_hmac_tfm, hmac_name,
+ ERR_AUTH_ALG);
}
if (crypto->integrity_tfm) {
hash_size = crypto_hash_digestsize(crypto->integrity_tfm);