Switch to use unit suffix for --reduce-device-size option.

[platform/upstream/cryptsetup.git] / src / veritysetup.c

diff --git a/src/veritysetup.c b/src/veritysetup.c
index 3b1991d..04691ba 100644 (file)
--- a/src/veritysetup.c
+++ b/src/veritysetup.c
@@ -50,21 +50,6 @@ static int opt_version_mode = 0;
 static const char **action_argv;
 static int action_argc;
 
-static size_t hex_to_bytes(const char *hex, char *result)
-{
-       char buf[3] = "xx\0", *endp;
-       size_t i, len;
-
-       len = strlen(hex) / 2;
-       for (i = 0; i < len; i++) {
-               memcpy(buf, &hex[i * 2], 2);
-               result[i] = strtoul(buf, &endp, 16);
-               if (endp != &buf[2])
-                       return -EINVAL;
-       }
-       return i;
-}
-
 __attribute__((format(printf, 5, 6)))
 static void clogger(struct crypt_device *cd, int level, const char *file,
                   int line, const char *format, ...)
@@ -118,7 +103,8 @@ static int _prepare_format(struct crypt_params_verity *params,
                           const char *data_device,
                           uint32_t flags)
 {
-       static char salt_bytes[512];
+       char *salt = NULL;
+       int len;
 
        params->hash_name = hash_algorithm ?: DEFAULT_VERITY_HASH;
        params->data_device = data_device;
@@ -127,14 +113,17 @@ static int _prepare_format(struct crypt_params_verity *params,
                params->salt_size = 0;
                params->salt = NULL;
        } else if (salt_string) {
-               if (hex_to_bytes(salt_string, salt_bytes) * 2 != strlen(salt_string)) {
+               len = crypt_hex_to_bytes(salt_string, &salt, 0);
+               if (len < 0) {
                        log_err(_("Invalid salt string specified.\n"));
                        return -EINVAL;
                }
-               params->salt_size = strlen(salt_string) / 2;
-               params->salt = salt_bytes;
-       } else
+               params->salt_size = len;
+               params->salt = salt;
+       } else {
                params->salt_size = DEFAULT_VERITY_SALT_SIZE;
+               params->salt = NULL;
+       }
 
        params->data_block_size = data_block_size;
        params->hash_block_size = hash_block_size;
@@ -168,6 +157,7 @@ static int action_format(int arg)
                crypt_dump(cd);
 out:
        crypt_free(cd);
+       free(CONST_CAST(char*)params.salt);
        return r;
 }
 
@@ -180,8 +170,8 @@ static int _activate(const char *dm_device,
        struct crypt_device *cd = NULL;
        struct crypt_params_verity params = {};
        uint32_t activate_flags = CRYPT_ACTIVATE_READONLY;
-       char root_hash_bytes[128];
-       size_t hash_size;
+       char *root_hash_bytes = NULL;
+       ssize_t hash_size;
        int r;
 
        if ((r = crypt_init(&cd, hash_device)))
@@ -204,8 +194,7 @@ static int _activate(const char *dm_device,
                goto out;
 
        hash_size = crypt_get_volume_key_size(cd);
-       if (hash_size * 2 != strlen(root_hash) ||
-           hex_to_bytes(root_hash, root_hash_bytes) != hash_size) {
+       if (crypt_hex_to_bytes(root_hash, &root_hash_bytes, 0) != hash_size) {
                log_err(_("Invalid root hash string specified.\n"));
                r = -EINVAL;
                goto out;
@@ -216,6 +205,8 @@ static int _activate(const char *dm_device,
                                         activate_flags);
 out:
        crypt_free(cd);
+       free(root_hash_bytes);
+       free(CONST_CAST(char*)params.salt);
        return r;
 }