[PATCH 21/26] nfc: s3fwrn5: Use shash

0 views

Skip to first unread message

Herbert Xu

unread,

Jan 25, 2016, 2:48:22 PM1/25/16

to Linux Crypto Mailing List, Linux Kernel Mailing List, net...@vger.kernel.org, de...@driverdev.osuosl.org, dm-d...@redhat.com, linux-w...@vger.kernel.org, linux...@vger.kernel.org, ecry...@vger.kernel.org, linux...@vger.kernel.org, linux-f2...@lists.sourceforge.net, linu...@vger.kernel.org, keyr...@vger.kernel.org, linux-b...@vger.kernel.org, ceph-...@vger.kernel.org, linux...@vger.kernel.org, linu...@lists.infradead.org, drbd...@lists.linbit.com, open-...@googlegroups.com

This patch replaces uses of the long obsolete hash interface with
shash.

Signed-off-by: Herbert Xu <her...@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 */

kbuild test robot

unread,

Jan 25, 2016, 2:48:22 PM1/25/16

to Herbert Xu, kbuil...@01.org, Linux Crypto Mailing List, Linux Kernel Mailing List, net...@vger.kernel.org, de...@driverdev.osuosl.org, dm-d...@redhat.com, linux-w...@vger.kernel.org, linux...@vger.kernel.org, ecry...@vger.kernel.org, linux...@vger.kernel.org, linux-f2...@lists.sourceforge.net, linu...@vger.kernel.org, keyr...@vger.kernel.org, linux-b...@vger.kernel.org, ceph-...@vger.kernel.org, linux...@vger.kernel.org, linu...@lists.infradead.org, drbd...@lists.linbit.com, open-...@googlegroups.com

Hi Herbert,

[auto build test ERROR on net/master]
[also build test ERROR on v4.4 next-20160122]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]

url: https://github.com/0day-ci/linux/commits/Herbert-Xu/crypto-Use-skcipher-and-ahash-shash-where-possible/20160124-212323
config: x86_64-randconfig-x014-201604 (attached as .config)
reproduce:
# save the attached .config to linux build tree
make ARCH=x86_64

All errors (new ones prefixed by >>):

drivers/nfc/s3fwrn5/firmware.c: In function 's3fwrn5_fw_download':
>> drivers/nfc/s3fwrn5/firmware.c:456:3: error: implicit declaration of function 'shash_desc_zero' [-Werror=implicit-function-declaration]
shash_desc_zero(desc);
^
cc1: some warnings being treated as errors

vim +/shash_desc_zero +456 drivers/nfc/s3fwrn5/firmware.c

450
451 desc->tfm = tfm;
452 desc->flags = CRYPTO_TFM_REQ_MAY_SLEEP;
453
454 ret = crypto_shash_digest(desc, fw->image, image_size,
455 hash_data);
> 456 shash_desc_zero(desc);
457 }
458
459 crypto_free_shash(tfm);

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation