hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Andreas Gruenbacher 2011-04-29 10:20:08 +02:00 committed by Philipp Reisner
parent 5b614abe30
commit 4b6ad6d457
3 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/block/drbd/drbd_nl.c
View File

@ -1799,7 +1799,7 @@ struct crypto {
}; };
static int 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]) if (!tfm_name[0])
return NO_ERROR; 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; return err_alg;
} }
if (!drbd_crypto_is_hash(crypto_hash_tfm(*tfm)))
return err_nd;
return NO_ERROR; return NO_ERROR;
} }
@ -1823,28 +1820,28 @@ alloc_crypto(struct crypto *crypto, struct net_conf *new_conf)
enum drbd_ret_code rv; enum drbd_ret_code rv;
int hash_size; int hash_size;
rv = alloc_tfm(&crypto->csums_tfm, new_conf->csums_alg, rv = alloc_hash(&crypto->csums_tfm, new_conf->csums_alg,
ERR_CSUMS_ALG, ERR_CSUMS_ALG_ND); ERR_CSUMS_ALG);
if (rv != NO_ERROR) if (rv != NO_ERROR)
return rv; return rv;
rv = alloc_tfm(&crypto->verify_tfm, new_conf->verify_alg, rv = alloc_hash(&crypto->verify_tfm, new_conf->verify_alg,
ERR_VERIFY_ALG, ERR_VERIFY_ALG_ND); ERR_VERIFY_ALG);
if (rv != NO_ERROR) if (rv != NO_ERROR)
return rv; return rv;
rv = alloc_tfm(&crypto->integrity_tfm, new_conf->integrity_alg, rv = alloc_hash(&crypto->integrity_tfm, new_conf->integrity_alg,
ERR_INTEGRITY_ALG, ERR_INTEGRITY_ALG_ND); ERR_INTEGRITY_ALG);
if (rv != NO_ERROR) if (rv != NO_ERROR)
return rv; return rv;
rv = alloc_tfm(&crypto->peer_integrity_tfm, new_conf->integrity_alg, rv = alloc_hash(&crypto->peer_integrity_tfm, new_conf->integrity_alg,
ERR_INTEGRITY_ALG, ERR_INTEGRITY_ALG_ND); ERR_INTEGRITY_ALG);
if (rv != NO_ERROR) if (rv != NO_ERROR)
return rv; return rv;
if (new_conf->cram_hmac_alg[0] != 0) { if (new_conf->cram_hmac_alg[0] != 0) {
snprintf(hmac_name, CRYPTO_MAX_ALG_NAME, "hmac(%s)", snprintf(hmac_name, CRYPTO_MAX_ALG_NAME, "hmac(%s)",
new_conf->cram_hmac_alg); new_conf->cram_hmac_alg);
rv = alloc_tfm(&crypto->cram_hmac_tfm, hmac_name, rv = alloc_hash(&crypto->cram_hmac_tfm, hmac_name,
ERR_AUTH_ALG, ERR_AUTH_ALG_ND); ERR_AUTH_ALG);
} }
if (crypto->integrity_tfm) { if (crypto->integrity_tfm) {
hash_size = crypto_hash_digestsize(crypto->integrity_tfm); hash_size = crypto_hash_digestsize(crypto->integrity_tfm);

5
drivers/block/drbd/drbd_receiver.c
View File

@ -3100,11 +3100,6 @@ struct crypto_hash *drbd_crypto_alloc_digest_safe(const struct drbd_conf *mdev,
alg, name, PTR_ERR(tfm)); alg, name, PTR_ERR(tfm));
return 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; return tfm;
} }

6
drivers/block/drbd/drbd_wrappers.h
View File

@ -45,12 +45,6 @@ static inline void drbd_generic_make_request(struct drbd_conf *mdev,
generic_make_request(bio); 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__ #ifndef __CHECKER__
# undef __cond_lock # undef __cond_lock
# define __cond_lock(x,c) (c) # define __cond_lock(x,c) (c)