Re: [PATCH v1] dm-crypt: replace custom implementation of hex2bin()

From
Andy Shevchenko <hidden>
Date
2016-12-30 21:51:24
Also in
dm-devel
Reply to
Andy Shevchenko, 2016-05-10
On Wed, May 11, 2016 at 2:24 AM, Andy Shevchenko
[off-list ref] wrote:
There is no need to have a duplication of the generic library, i.e. hex2bin().
Replace the open coded variant.
Ping?
quoted hunk ↗ jump to hunk
Signed-off-by: Andy Shevchenko <redacted>
---
 drivers/md/dm-crypt.c | 27 ++-------------------------
 1 file changed, 2 insertions(+), 25 deletions(-)
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index 4f3cb35..eb30284 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -1407,30 +1407,6 @@ static void kcryptd_queue_crypt(struct dm_crypt_io *io)
        queue_work(cc->crypt_queue, &io->work);
 }

-/*
- * Decode key from its hex representation
- */
-static int crypt_decode_key(u8 *key, char *hex, unsigned int size)
-{
-       char buffer[3];
-       unsigned int i;
-
-       buffer[2] = '\0';
-
-       for (i = 0; i < size; i++) {
-               buffer[0] = *hex++;
-               buffer[1] = *hex++;
-
-               if (kstrtou8(buffer, 16, &key[i]))
-                       return -EINVAL;
-       }
-
-       if (*hex != '\0')
-               return -EINVAL;
-
-       return 0;
-}
-
 static void crypt_free_tfms(struct crypt_config *cc)
 {
        unsigned i;
@@ -1502,7 +1478,8 @@ static int crypt_set_key(struct crypt_config *cc, char *key)
        if (!cc->key_size && strcmp(key, "-"))
                goto out;

-       if (cc->key_size && crypt_decode_key(cc->key, key, cc->key_size) < 0)
+       /* Decode key from its hex representation. */
+       if (cc->key_size && hex2bin(cc->key, key, cc->key_size) < 0)
                goto out;

        set_bit(DM_CRYPT_KEY_VALID, &cc->flags);
--
2.8.2


-- 
With Best Regards,
Andy Shevchenko
Thread (2 messages) 2 messages, 1 author, last reply 2016-12-30
Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help