Commit 3d234b33 authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

crypto: drop mask=CRYPTO_ALG_ASYNC from 'shash' tfm allocations 



'shash' algorithms are always synchronous, so passing CRYPTO_ALG_ASYNC
in the mask to crypto_alloc_shash() has no effect.  Many users therefore
already don't pass it, but some still do.  This inconsistency can cause
confusion, especially since the way the 'mask' argument works is
somewhat counterintuitive.

Thus, just remove the unneeded CRYPTO_ALG_ASYNC flags.

This patch shouldn't change any actual behavior.

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 1ad0f160

drivers/block/drbd/drbd_receiver.c

+1 −1
Original line number Diff line number Diff line
@@ -3623,7 +3623,7 @@ static int receive_protocol(struct drbd_connection *connection, struct packet_in 
		 * change.

		 */



		peer_integrity_tfm = crypto_alloc_shash(integrity_alg, 0, CRYPTO_ALG_ASYNC);

		peer_integrity_tfm = crypto_alloc_shash(integrity_alg, 0, 0);

		if (IS_ERR(peer_integrity_tfm)) {

			peer_integrity_tfm = NULL;

			drbd_err(connection, "peer data-integrity-alg %s not supported\n",

drivers/md/dm-integrity.c

+1 −1
Original line number Diff line number Diff line
@@ -2804,7 +2804,7 @@ static int get_mac(struct crypto_shash **hash, struct alg_spec *a, char **error, 
	int r;



	if (a->alg_string) {

		*hash = crypto_alloc_shash(a->alg_string, 0, CRYPTO_ALG_ASYNC);

		*hash = crypto_alloc_shash(a->alg_string, 0, 0);

		if (IS_ERR(*hash)) {

			*error = error_alg;

			r = PTR_ERR(*hash);

drivers/net/wireless/intersil/orinoco/mic.c

+2 −4
Original line number Diff line number Diff line
@@ -16,8 +16,7 @@ 
/********************************************************************/

int orinoco_mic_init(struct orinoco_private *priv)

{

	priv->tx_tfm_mic = crypto_alloc_shash("michael_mic", 0,

					      CRYPTO_ALG_ASYNC);

	priv->tx_tfm_mic = crypto_alloc_shash("michael_mic", 0, 0);

	if (IS_ERR(priv->tx_tfm_mic)) {

		printk(KERN_DEBUG "orinoco_mic_init: could not allocate "

		       "crypto API michael_mic\n");
@@ -25,8 +24,7 @@ int orinoco_mic_init(struct orinoco_private *priv) 
		return -ENOMEM;

	}



	priv->rx_tfm_mic = crypto_alloc_shash("michael_mic", 0,

					      CRYPTO_ALG_ASYNC);

	priv->rx_tfm_mic = crypto_alloc_shash("michael_mic", 0, 0);

	if (IS_ERR(priv->rx_tfm_mic)) {

		printk(KERN_DEBUG "orinoco_mic_init: could not allocate "

		       "crypto API michael_mic\n");

fs/ubifs/auth.c

+2 −3
Original line number Diff line number Diff line
@@ -269,8 +269,7 @@ int ubifs_init_authentication(struct ubifs_info *c) 
		goto out;

	}



	c->hash_tfm = crypto_alloc_shash(c->auth_hash_name, 0,

					 CRYPTO_ALG_ASYNC);

	c->hash_tfm = crypto_alloc_shash(c->auth_hash_name, 0, 0);

	if (IS_ERR(c->hash_tfm)) {

		err = PTR_ERR(c->hash_tfm);

		ubifs_err(c, "Can not allocate %s: %d",
@@ -286,7 +285,7 @@ int ubifs_init_authentication(struct ubifs_info *c) 
		goto out_free_hash;

	}



	c->hmac_tfm = crypto_alloc_shash(hmac_name, 0, CRYPTO_ALG_ASYNC);

	c->hmac_tfm = crypto_alloc_shash(hmac_name, 0, 0);

	if (IS_ERR(c->hmac_tfm)) {

		err = PTR_ERR(c->hmac_tfm);

		ubifs_err(c, "Can not allocate %s: %d", hmac_name, err);

net/bluetooth/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -3912,7 +3912,7 @@ int __init bt_selftest_smp(void) 
		return PTR_ERR(tfm_aes);

	}



	tfm_cmac = crypto_alloc_shash("cmac(aes)", 0, CRYPTO_ALG_ASYNC);

	tfm_cmac = crypto_alloc_shash("cmac(aes)", 0, 0);

	if (IS_ERR(tfm_cmac)) {

		BT_ERR("Unable to create CMAC crypto context");

		crypto_free_cipher(tfm_aes);

CRA Git | Maintained and supported by SUSTech CRA and CCSE