Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1315890
| From | Herbert Xu <herbert@gondor.apana.org.au> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 21/26] nfc: s3fwrn5: Use shash |
| Date | 2016-01-24 14:30 +0100 |
| Message-ID | <qUsTV-5op-41@gated-at.bofh.it> (permalink) |
| References | <qUsKd-5k1-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
This patch replaces uses of the long obsolete hash interface with
shash.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---
drivers/nfc/s3fwrn5/firmware.c | 36 +++++++++++++++++++++++++++---------
1 file changed, 27 insertions(+), 9 deletions(-)
diff --git a/drivers/nfc/s3fwrn5/firmware.c b/drivers/nfc/s3fwrn5/firmware.c
index 64a9025..5f97da1 100644
--- a/drivers/nfc/s3fwrn5/firmware.c
+++ b/drivers/nfc/s3fwrn5/firmware.c
@@ -19,7 +19,7 @@
#include <linux/completion.h>
#include <linux/firmware.h>
-#include <linux/crypto.h>
+#include <crypto/hash.h>
#include <crypto/sha.h>
#include "s3fwrn5.h"
@@ -429,8 +429,7 @@ int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info)
{
struct s3fwrn5_fw_image *fw = &fw_info->fw;
u8 hash_data[SHA1_DIGEST_SIZE];
- struct scatterlist sg;
- struct hash_desc desc;
+ struct crypto_shash *tfm;
u32 image_size, off;
int ret;
@@ -438,12 +437,31 @@ int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info)
/* Compute SHA of firmware data */
- sg_init_one(&sg, fw->image, image_size);
- desc.tfm = crypto_alloc_hash("sha1", 0, CRYPTO_ALG_ASYNC);
- crypto_hash_init(&desc);
- crypto_hash_update(&desc, &sg, image_size);
- crypto_hash_final(&desc, hash_data);
- crypto_free_hash(desc.tfm);
+ tfm = crypto_alloc_shash("sha1", 0, 0);
+ if (IS_ERR(tfm)) {
+ ret = PTR_ERR(tfm);
+ dev_err(&fw_info->ndev->nfc_dev->dev,
+ "Cannot allocate shash (code=%d)\n", ret);
+ goto out;
+ }
+
+ {
+ SHASH_DESC_ON_STACK(desc, tfm);
+
+ desc->tfm = tfm;
+ desc->flags = CRYPTO_TFM_REQ_MAY_SLEEP;
+
+ ret = crypto_shash_digest(desc, fw->image, image_size,
+ hash_data);
+ shash_desc_zero(desc);
+ }
+
+ crypto_free_shash(tfm);
+ if (ret) {
+ dev_err(&fw_info->ndev->nfc_dev->dev,
+ "Cannot compute hash (code=%d)\n", ret);
+ goto out;
+ }
/* Firmware update process */
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 0/26] crypto: Use skcipher and ahash/shash where possible Herbert Xu <herbert@gondor.apana.org.au> - 2016-01-24 14:20 +0100
[PATCH 8/26] cifs: Use skcipher Herbert Xu <herbert@gondor.apana.org.au> - 2016-01-24 14:20 +0100
[PATCH 11/26] f2fs: Use skcipher Herbert Xu <herbert@gondor.apana.org.au> - 2016-01-24 14:20 +0100
[PATCH 13/26] lib80211: Use skcipher and ahash Herbert Xu <herbert@gondor.apana.org.au> - 2016-01-24 14:20 +0100
[PATCH 1/26] block: cryptoloop - Use new skcipher interface Herbert Xu <herbert@gondor.apana.org.au> - 2016-01-24 14:20 +0100
Re: [PATCH 1/26] block: cryptoloop - Use new skcipher interface kbuild test robot <lkp@intel.com> - 2016-01-24 14:40 +0100
Re: [PATCH 1/26] block: cryptoloop - Use new skcipher interface Herbert Xu <herbert@gondor.apana.org.au> - 2016-01-24 14:50 +0100
[PATCH 16/26] libceph: Use skcipher Herbert Xu <herbert@gondor.apana.org.au> - 2016-01-24 14:20 +0100
Re: [PATCH 16/26] libceph: Use skcipher Ilya Dryomov <idryomov@gmail.com> - 2016-01-25 17:20 +0100
Re: [PATCH 16/26] libceph: Use skcipher Herbert Xu <herbert@gondor.apana.org.au> - 2016-01-26 12:00 +0100
Re: [PATCH 16/26] libceph: Use skcipher Herbert Xu <herbert@gondor.apana.org.au> - 2016-01-26 12:40 +0100
Re: [PATCH 16/26] libceph: Use skcipher Ilya Dryomov <idryomov@gmail.com> - 2016-01-26 12:40 +0100
[PATCH 14/26] KEYS: Use skcipher Herbert Xu <herbert@gondor.apana.org.au> - 2016-01-24 14:20 +0100
[PATCH 6/26] staging: rtl8192u: Use skcipher and ahash Herbert Xu <herbert@gondor.apana.org.au> - 2016-01-24 14:20 +0100
Re: [PATCH 6/26] staging: rtl8192u: Use skcipher and ahash Greg KH <greg@kroah.com> - 2016-01-24 21:10 +0100
[PATCH 3/26] staging: rtl8192e: Replace uses of obsolete blkcipher and hash Herbert Xu <herbert@gondor.apana.org.au> - 2016-01-24 14:20 +0100
Re: [PATCH 3/26] staging: rtl8192e: Replace uses of obsolete blkcipher and hash Greg KH <greg@kroah.com> - 2016-01-24 21:10 +0100
[PATCH 5/26] orinoco: Use ahash Herbert Xu <herbert@gondor.apana.org.au> - 2016-01-24 14:20 +0100
[PATCH 24/26] nfsd: Use shash Herbert Xu <herbert@gondor.apana.org.au> - 2016-01-24 14:30 +0100
[PATCH 25/26] sctp: Use shash Herbert Xu <herbert@gondor.apana.org.au> - 2016-01-24 14:30 +0100
Re: [PATCH 25/26] sctp: Use shash David Miller <davem@davemloft.net> - 2016-01-25 07:10 +0100
[PATCH 10/26] ext4: Use skcipher Herbert Xu <herbert@gondor.apana.org.au> - 2016-01-24 14:30 +0100
[PATCH 18/26] rxrpc: Use skcipher Herbert Xu <herbert@gondor.apana.org.au> - 2016-01-24 14:30 +0100
[PATCH 17/26] mac802154: Use skcipher Herbert Xu <herbert@gondor.apana.org.au> - 2016-01-24 14:30 +0100
Re: [PATCH 17/26] mac802154: Use skcipher Stefan Schmidt <stefan@osg.samsung.com> - 2016-01-26 18:00 +0100
[PATCH 4/26] dm crypt: Use skcipher and ahash Herbert Xu <herbert@gondor.apana.org.au> - 2016-01-24 14:30 +0100
Re: [PATCH 4/26] dm crypt: Use skcipher and ahash kbuild test robot <lkp@intel.com> - 2016-01-24 14:50 +0100
[PATCH 22/26] iscsi_tcp: Use ahash Herbert Xu <herbert@gondor.apana.org.au> - 2016-01-24 14:30 +0100
Re: [dm-devel] [PATCH 22/26] iscsi_tcp: Use ahash Mike Christie <michaelc@cs.wisc.edu> - 2016-01-25 21:00 +0100
[PATCH 26/26] tcp: Use ahash Herbert Xu <herbert@gondor.apana.org.au> - 2016-01-24 14:30 +0100
Re: [PATCH 26/26] tcp: Use ahash David Miller <davem@davemloft.net> - 2016-01-25 07:10 +0100
[PATCH 23/26] iscsi-target: Use shash and ahash Herbert Xu <herbert@gondor.apana.org.au> - 2016-01-24 14:30 +0100
[PATCH 19/26] ipsec: Use skcipher and ahash when probing algorithms Herbert Xu <herbert@gondor.apana.org.au> - 2016-01-24 14:30 +0100
Re: [PATCH 19/26] ipsec: Use skcipher and ahash when probing algorithms kbuild test robot <lkp@intel.com> - 2016-01-24 14:50 +0100
Re: [PATCH 19/26] ipsec: Use skcipher and ahash when probing algorithms David Miller <davem@davemloft.net> - 2016-01-25 07:10 +0100
[PATCH 20/26] drbd: Use shash and ahash Herbert Xu <herbert@gondor.apana.org.au> - 2016-01-24 14:30 +0100
[PATCH 21/26] nfc: s3fwrn5: Use shash Herbert Xu <herbert@gondor.apana.org.au> - 2016-01-24 14:30 +0100
Re: [PATCH 21/26] nfc: s3fwrn5: Use shash kbuild test robot <lkp@intel.com> - 2016-01-24 15:00 +0100
[PATCH 15/26] Bluetooth: Use skcipher and hash Herbert Xu <herbert@gondor.apana.org.au> - 2016-01-24 14:30 +0100
Re: [PATCH 15/26] Bluetooth: Use skcipher and hash Marcel Holtmann <marcel@holtmann.org> - 2016-01-25 07:50 +0100
csiph-web