Commit 4b6ad6d4 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Philipp Reisner
Browse files

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: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent 5b614abe

drivers/block/drbd/drbd_nl.c

+11 −14
Original line number Diff line number Diff line
@@ -1799,7 +1799,7 @@ struct crypto { 
};



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 @@ alloc_tfm(struct crypto_hash **tfm, char *tfm_name, int err_alg, int err_nd) 
		return err_alg;

	}



	if (!drbd_crypto_is_hash(crypto_hash_tfm(*tfm)))

		return err_nd;



	return NO_ERROR;

}
@@ -1823,28 +1820,28 @@ alloc_crypto(struct crypto *crypto, struct net_conf *new_conf) 
	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);

drivers/block/drbd/drbd_receiver.c

+0 −5
Original line number Diff line number Diff line
@@ -3100,11 +3100,6 @@ struct crypto_hash *drbd_crypto_alloc_digest_safe(const struct drbd_conf *mdev, 
			alg, name, PTR_ERR(tfm));

		return tfm;

	}

	if (!drbd_crypto_is_hash(crypto_hash_tfm(tfm))) {

		crypto_free_hash(tfm);

		dev_err(DEV, "\"%s\" is not a digest (%s)\n", alg, name);

		return ERR_PTR(-EINVAL);

	}

	return tfm;

}

drivers/block/drbd/drbd_wrappers.h

+0 −6
Original line number Diff line number Diff line
@@ -45,12 +45,6 @@ static inline void drbd_generic_make_request(struct drbd_conf *mdev, 
		generic_make_request(bio);

}



static inline int drbd_crypto_is_hash(struct crypto_tfm *tfm)

{

        return (crypto_tfm_alg_type(tfm) & CRYPTO_ALG_TYPE_HASH_MASK)

                == CRYPTO_ALG_TYPE_HASH;

}



#ifndef __CHECKER__

# undef __cond_lock

# define __cond_lock(x,c) (c)