diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 03:50:45 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 03:50:45 +0000 |
| commit | efeb864cb547a2cbf96dc0053a8bdb4d9190b364 (patch) | |
| tree | c0b83368f18be983fcc763200c4c24d633244588 /src/veritysetup | |
| parent | Releasing progress-linux version 255.5-1~progress7.99u1. (diff) | |
| download | systemd-efeb864cb547a2cbf96dc0053a8bdb4d9190b364.tar.xz systemd-efeb864cb547a2cbf96dc0053a8bdb4d9190b364.zip | |
Merging upstream version 256.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/veritysetup')
| -rw-r--r-- | src/veritysetup/veritysetup-generator.c | 2 | ||||
| -rw-r--r-- | src/veritysetup/veritysetup.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/veritysetup/veritysetup-generator.c b/src/veritysetup/veritysetup-generator.c index d55d4aa..95ce82b 100644 --- a/src/veritysetup/veritysetup-generator.c +++ b/src/veritysetup/veritysetup-generator.c @@ -252,7 +252,7 @@ static int determine_device( if (*data_what && *hash_what) return 0; - r = unhexmem(hash, strlen(hash), &m, &l); + r = unhexmem(hash, &m, &l); if (r < 0) return log_error_errno(r, "Failed to parse hash: %s", hash); if (l < sizeof(sd_id128_t)) { diff --git a/src/veritysetup/veritysetup.c b/src/veritysetup/veritysetup.c index d73c2d3..d133572 100644 --- a/src/veritysetup/veritysetup.c +++ b/src/veritysetup/veritysetup.c @@ -205,7 +205,7 @@ static int parse_options(const char *options) { size_t l; void *m; - r = unhexmem(val, strlen(val), &m, &l); + r = unhexmem(val, &m, &l); if (r < 0) return log_error_errno(r, "Failed to parse salt '%s': %m", word); @@ -312,7 +312,7 @@ static int run(int argc, char *argv[]) { if (!filename_is_valid(volume)) return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Volume name '%s' is not valid.", volume); - r = unhexmem(root_hash, SIZE_MAX, &m, &l); + r = unhexmem(root_hash, &m, &l); if (r < 0) return log_error_errno(r, "Failed to parse root hash: %m"); @@ -378,7 +378,7 @@ static int run(int argc, char *argv[]) { char *value; if ((value = startswith(arg_root_hash_signature, "base64:"))) { - r = unbase64mem(value, strlen(value), (void *)&hash_sig, &hash_sig_size); + r = unbase64mem(value, (void*) &hash_sig, &hash_sig_size); if (r < 0) return log_error_errno(r, "Failed to parse root hash signature '%s': %m", arg_root_hash_signature); } else { |