diff --git a/.gitignore b/.gitignore index f83f7c7..80a70af 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cryptsetup-2.3.1.tar.xz +/cryptsetup-2.3.2.tar.xz diff --git a/0001-Add-support-for-upcoming-json-c-0.14.0.patch b/0001-Add-support-for-upcoming-json-c-0.14.0.patch deleted file mode 100644 index fba1f36..0000000 --- a/0001-Add-support-for-upcoming-json-c-0.14.0.patch +++ /dev/null @@ -1,177 +0,0 @@ -From 604abec333a0efb44fd8bc610aa0b1151dd0f612 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Mon, 13 Apr 2020 11:48:17 +0200 -Subject: [PATCH] Add support for upcoming json-c 0.14.0. - - * TRUE/FALSE are not defined anymore. 1 and 0 are used instead. - * json_object_get_uint64() and json_object_new_uint64() are part - of the upstream API now. ---- - lib/luks2/luks2_internal.h | 4 +++- - lib/luks2/luks2_json_metadata.c | 38 +++++++++++++++++---------------- - 2 files changed, 23 insertions(+), 19 deletions(-) - -diff --git a/lib/luks2/luks2_internal.h b/lib/luks2/luks2_internal.h -index b9fec6b5..939101d6 100644 ---- a/lib/luks2/luks2_internal.h -+++ b/lib/luks2/luks2_internal.h -@@ -58,9 +58,11 @@ json_object *LUKS2_get_segments_jobj(struct luks2_hdr *hdr); - void hexprint_base64(struct crypt_device *cd, json_object *jobj, - const char *sep, const char *line_sep); - -+#if !(defined JSON_C_VERSION_NUM && JSON_C_VERSION_NUM >= ((13 << 8) | 99)) - uint64_t json_object_get_uint64(json_object *jobj); --uint32_t json_object_get_uint32(json_object *jobj); - json_object *json_object_new_uint64(uint64_t value); -+#endif -+uint32_t json_object_get_uint32(json_object *jobj); - - int json_object_object_add_by_uint(json_object *jobj, unsigned key, json_object *jobj_val); - void json_object_object_del_by_uint(json_object *jobj, unsigned key); -diff --git a/lib/luks2/luks2_json_metadata.c b/lib/luks2/luks2_json_metadata.c -index 781280c2..712c2bbd 100644 ---- a/lib/luks2/luks2_json_metadata.c -+++ b/lib/luks2/luks2_json_metadata.c -@@ -234,13 +234,14 @@ static json_bool json_str_to_uint64(json_object *jobj, uint64_t *value) - tmp = strtoull(json_object_get_string(jobj), &endptr, 10); - if (*endptr || errno) { - *value = 0; -- return FALSE; -+ return 0; - } - - *value = tmp; -- return TRUE; -+ return 1; - } - -+#if !(defined JSON_C_VERSION_NUM && JSON_C_VERSION_NUM >= ((13 << 8) | 99)) - uint64_t json_object_get_uint64(json_object *jobj) - { - uint64_t r; -@@ -262,6 +263,7 @@ json_object *json_object_new_uint64(uint64_t value) - jobj = json_object_new_string(num); - return jobj; - } -+#endif - - /* - * Validate helpers -@@ -273,9 +275,9 @@ static json_bool numbered(struct crypt_device *cd, const char *name, const char - for (i = 0; key[i]; i++) - if (!isdigit(key[i])) { - log_dbg(cd, "%s \"%s\" is not in numbered form.", name, key); -- return FALSE; -+ return 0; - } -- return TRUE; -+ return 1; - } - - json_object *json_contains(struct crypt_device *cd, json_object *jobj, const char *name, -@@ -300,7 +302,7 @@ json_bool validate_json_uint32(json_object *jobj) - errno = 0; - tmp = json_object_get_int64(jobj); - -- return (errno || tmp < 0 || tmp > UINT32_MAX) ? FALSE : TRUE; -+ return (errno || tmp < 0 || tmp > UINT32_MAX) ? 0 : 1; - } - - static json_bool validate_keyslots_array(struct crypt_device *cd, -@@ -313,17 +315,17 @@ static json_bool validate_keyslots_array(struct crypt_device *cd, - jobj = json_object_array_get_idx(jarr, i); - if (!json_object_is_type(jobj, json_type_string)) { - log_dbg(cd, "Illegal value type in keyslots array at index %d.", i); -- return FALSE; -+ return 0; - } - - if (!json_contains(cd, jobj_keys, "", "Keyslots section", - json_object_get_string(jobj), json_type_object)) -- return FALSE; -+ return 0; - - i++; - } - -- return TRUE; -+ return 1; - } - - static json_bool validate_segments_array(struct crypt_device *cd, -@@ -336,17 +338,17 @@ static json_bool validate_segments_array(struct crypt_device *cd, - jobj = json_object_array_get_idx(jarr, i); - if (!json_object_is_type(jobj, json_type_string)) { - log_dbg(cd, "Illegal value type in segments array at index %d.", i); -- return FALSE; -+ return 0; - } - - if (!json_contains(cd, jobj_segments, "", "Segments section", - json_object_get_string(jobj), json_type_object)) -- return FALSE; -+ return 0; - - i++; - } - -- return TRUE; -+ return 1; - } - - static json_bool segment_has_digest(const char *segment_name, json_object *jobj_digests) -@@ -357,10 +359,10 @@ static json_bool segment_has_digest(const char *segment_name, json_object *jobj_ - UNUSED(key); - json_object_object_get_ex(val, "segments", &jobj_segments); - if (LUKS2_array_jobj(jobj_segments, segment_name)) -- return TRUE; -+ return 1; - } - -- return FALSE; -+ return 0; - } - - static json_bool validate_intervals(struct crypt_device *cd, -@@ -372,18 +374,18 @@ static json_bool validate_intervals(struct crypt_device *cd, - while (i < length) { - if (ix[i].offset < 2 * metadata_size) { - log_dbg(cd, "Illegal area offset: %" PRIu64 ".", ix[i].offset); -- return FALSE; -+ return 0; - } - - if (!ix[i].length) { - log_dbg(cd, "Area length must be greater than zero."); -- return FALSE; -+ return 0; - } - - if ((ix[i].offset + ix[i].length) > keyslots_area_end) { - log_dbg(cd, "Area [%" PRIu64 ", %" PRIu64 "] overflows binary keyslots area (ends at offset: %" PRIu64 ").", - ix[i].offset, ix[i].offset + ix[i].length, keyslots_area_end); -- return FALSE; -+ return 0; - } - - for (j = 0; j < length; j++) { -@@ -393,14 +395,14 @@ static json_bool validate_intervals(struct crypt_device *cd, - log_dbg(cd, "Overlapping areas [%" PRIu64 ",%" PRIu64 "] and [%" PRIu64 ",%" PRIu64 "].", - ix[i].offset, ix[i].offset + ix[i].length, - ix[j].offset, ix[j].offset + ix[j].length); -- return FALSE; -+ return 0; - } - } - - i++; - } - -- return TRUE; -+ return 1; - } - - static int LUKS2_keyslot_validate(struct crypt_device *cd, json_object *hdr_jobj, json_object *hdr_keyslot, const char *key) --- -2.26.0 - diff --git a/0002-Avoid-name-clash-with-newer-json-c-library.patch b/0002-Avoid-name-clash-with-newer-json-c-library.patch deleted file mode 100644 index 4c2a617..0000000 --- a/0002-Avoid-name-clash-with-newer-json-c-library.patch +++ /dev/null @@ -1,510 +0,0 @@ -From e6a356974330e3ae21579a5737976e9a2aad1b51 Mon Sep 17 00:00:00 2001 -From: Ondrej Kozina -Date: Tue, 14 Apr 2020 17:24:54 +0200 -Subject: [PATCH 2/8] Avoid name clash with newer json-c library. - -This is partial revert of previous commit and also -fixes wrong decision to name our internal helpers with -json_object prefix. ---- - lib/luks2/luks2_internal.h | 8 +++----- - lib/luks2/luks2_json_format.c | 6 +++--- - lib/luks2/luks2_json_metadata.c | 18 ++++++++---------- - lib/luks2/luks2_keyslot.c | 8 ++++---- - lib/luks2/luks2_keyslot_luks2.c | 16 ++++++++-------- - lib/luks2/luks2_keyslot_reenc.c | 20 ++++++++++---------- - lib/luks2/luks2_luks1_convert.c | 22 +++++++++++----------- - lib/luks2/luks2_reencrypt.c | 16 ++++++++-------- - lib/luks2/luks2_segment.c | 12 ++++++------ - 9 files changed, 61 insertions(+), 65 deletions(-) - -diff --git a/lib/luks2/luks2_internal.h b/lib/luks2/luks2_internal.h -index 939101d..a5bcb1f 100644 ---- a/lib/luks2/luks2_internal.h -+++ b/lib/luks2/luks2_internal.h -@@ -58,11 +58,9 @@ json_object *LUKS2_get_segments_jobj(struct luks2_hdr *hdr); - void hexprint_base64(struct crypt_device *cd, json_object *jobj, - const char *sep, const char *line_sep); - --#if !(defined JSON_C_VERSION_NUM && JSON_C_VERSION_NUM >= ((13 << 8) | 99)) --uint64_t json_object_get_uint64(json_object *jobj); --json_object *json_object_new_uint64(uint64_t value); --#endif --uint32_t json_object_get_uint32(json_object *jobj); -+uint64_t crypt_jobj_get_uint64(json_object *jobj); -+uint32_t crypt_jobj_get_uint32(json_object *jobj); -+json_object *crypt_jobj_new_uint64(uint64_t value); - - int json_object_object_add_by_uint(json_object *jobj, unsigned key, json_object *jobj_val); - void json_object_object_del_by_uint(json_object *jobj, unsigned key); -diff --git a/lib/luks2/luks2_json_format.c b/lib/luks2/luks2_json_format.c -index 0fde2ff..1416766 100644 ---- a/lib/luks2/luks2_json_format.c -+++ b/lib/luks2/luks2_json_format.c -@@ -325,8 +325,8 @@ int LUKS2_generate_hdr( - - json_object_object_add_by_uint(jobj_segments, 0, jobj_segment); - -- json_object_object_add(jobj_config, "json_size", json_object_new_uint64(metadata_size - LUKS2_HDR_BIN_LEN)); -- json_object_object_add(jobj_config, "keyslots_size", json_object_new_uint64(keyslots_size)); -+ json_object_object_add(jobj_config, "json_size", crypt_jobj_new_uint64(metadata_size - LUKS2_HDR_BIN_LEN)); -+ json_object_object_add(jobj_config, "keyslots_size", crypt_jobj_new_uint64(keyslots_size)); - - JSON_DBG(cd, hdr->jobj, "Header JSON:"); - return 0; -@@ -400,6 +400,6 @@ int LUKS2_set_keyslots_size(struct crypt_device *cd, - if (!json_object_object_get_ex(hdr->jobj, "config", &jobj_config)) - return 1; - -- json_object_object_add(jobj_config, "keyslots_size", json_object_new_uint64(keyslots_size)); -+ json_object_object_add(jobj_config, "keyslots_size", crypt_jobj_new_uint64(keyslots_size)); - return 0; - } -diff --git a/lib/luks2/luks2_json_metadata.c b/lib/luks2/luks2_json_metadata.c -index 712c2bb..68da9c2 100644 ---- a/lib/luks2/luks2_json_metadata.c -+++ b/lib/luks2/luks2_json_metadata.c -@@ -219,7 +219,7 @@ int LUKS2_get_default_segment(struct luks2_hdr *hdr) - * json_type_int needs to be validated first. - * See validate_json_uint32() - */ --uint32_t json_object_get_uint32(json_object *jobj) -+uint32_t crypt_jobj_get_uint32(json_object *jobj) - { - return json_object_get_int64(jobj); - } -@@ -241,15 +241,14 @@ static json_bool json_str_to_uint64(json_object *jobj, uint64_t *value) - return 1; - } - --#if !(defined JSON_C_VERSION_NUM && JSON_C_VERSION_NUM >= ((13 << 8) | 99)) --uint64_t json_object_get_uint64(json_object *jobj) -+uint64_t crypt_jobj_get_uint64(json_object *jobj) - { - uint64_t r; - json_str_to_uint64(jobj, &r); - return r; - } - --json_object *json_object_new_uint64(uint64_t value) -+json_object *crypt_jobj_new_uint64(uint64_t value) - { - /* 18446744073709551615 */ - char num[21]; -@@ -263,7 +262,6 @@ json_object *json_object_new_uint64(uint64_t value) - jobj = json_object_new_string(num); - return jobj; - } --#endif - - /* - * Validate helpers -@@ -457,7 +455,7 @@ static int hdr_validate_json_size(struct crypt_device *cd, json_object *hdr_jobj - - json = json_object_to_json_string_ext(hdr_jobj, - JSON_C_TO_STRING_PLAIN | JSON_C_TO_STRING_NOSLASHESCAPE); -- json_area_size = json_object_get_uint64(jobj1); -+ json_area_size = crypt_jobj_get_uint64(jobj1); - json_size = (uint64_t)strlen(json); - - if (hdr_json_size != json_area_size) { -@@ -545,7 +543,7 @@ static int hdr_validate_crypt_segment(struct crypt_device *cd, - return 1; - } - -- sector_size = json_object_get_uint32(jobj_sector_size); -+ sector_size = crypt_jobj_get_uint32(jobj_sector_size); - if (!sector_size || MISALIGNED_512(sector_size)) { - log_dbg(cd, "Illegal sector size: %" PRIu32, sector_size); - return 1; -@@ -1568,7 +1566,7 @@ static void hdr_dump_keyslots(struct crypt_device *cd, json_object *hdr_jobj) - log_std(cd, " %s: %s%s\n", slot, tmps, r == -ENOENT ? " (unbound)" : ""); - - if (json_object_object_get_ex(val, "key_size", &jobj2)) -- log_std(cd, "\tKey: %u bits\n", json_object_get_uint32(jobj2) * 8); -+ log_std(cd, "\tKey: %u bits\n", crypt_jobj_get_uint32(jobj2) * 8); - - log_std(cd, "\tPriority: %s\n", get_priority_desc(val)); - -@@ -1651,7 +1649,7 @@ static void hdr_dump_segments(struct crypt_device *cd, json_object *hdr_jobj) - log_std(cd, "\tcipher: %s\n", json_object_get_string(jobj1)); - - if (json_object_object_get_ex(jobj_segment, "sector_size", &jobj1)) -- log_std(cd, "\tsector: %" PRIu32 " [bytes]\n", json_object_get_uint32(jobj1)); -+ log_std(cd, "\tsector: %" PRIu32 " [bytes]\n", crypt_jobj_get_uint32(jobj1)); - - if (json_object_object_get_ex(jobj_segment, "integrity", &jobj1) && - json_object_object_get_ex(jobj1, "type", &jobj2)) -@@ -1748,7 +1746,7 @@ int LUKS2_get_data_size(struct luks2_hdr *hdr, uint64_t *size, bool *dynamic) - return 0; - } - -- tmp += json_object_get_uint64(jobj_size); -+ tmp += crypt_jobj_get_uint64(jobj_size); - } - - /* impossible, real device size must not be zero */ -diff --git a/lib/luks2/luks2_keyslot.c b/lib/luks2/luks2_keyslot.c -index 97031ad..3b8c889 100644 ---- a/lib/luks2/luks2_keyslot.c -+++ b/lib/luks2/luks2_keyslot.c -@@ -300,11 +300,11 @@ int LUKS2_keyslot_area(struct luks2_hdr *hdr, - - if (!json_object_object_get_ex(jobj_area, "offset", &jobj)) - return -EINVAL; -- *offset = json_object_get_uint64(jobj); -+ *offset = crypt_jobj_get_uint64(jobj); - - if (!json_object_object_get_ex(jobj_area, "size", &jobj)) - return -EINVAL; -- *length = json_object_get_uint64(jobj); -+ *length = crypt_jobj_get_uint64(jobj); - - return 0; - } -@@ -835,8 +835,8 @@ int placeholder_keyslot_alloc(struct crypt_device *cd, - - /* Area object */ - jobj_area = json_object_new_object(); -- json_object_object_add(jobj_area, "offset", json_object_new_uint64(area_offset)); -- json_object_object_add(jobj_area, "size", json_object_new_uint64(area_length)); -+ json_object_object_add(jobj_area, "offset", crypt_jobj_new_uint64(area_offset)); -+ json_object_object_add(jobj_area, "size", crypt_jobj_new_uint64(area_length)); - json_object_object_add(jobj_keyslot, "area", jobj_area); - - json_object_object_add_by_uint(jobj_keyslots, keyslot, jobj_keyslot); -diff --git a/lib/luks2/luks2_keyslot_luks2.c b/lib/luks2/luks2_keyslot_luks2.c -index cf0e53e..156f0c1 100644 ---- a/lib/luks2/luks2_keyslot_luks2.c -+++ b/lib/luks2/luks2_keyslot_luks2.c -@@ -220,7 +220,7 @@ static int luks2_keyslot_set_key(struct crypt_device *cd, - - if (!json_object_object_get_ex(jobj_area, "offset", &jobj2)) - return -EINVAL; -- area_offset = json_object_get_uint64(jobj2); -+ area_offset = crypt_jobj_get_uint64(jobj2); - - if (!json_object_object_get_ex(jobj_area, "encryption", &jobj2)) - return -EINVAL; -@@ -313,7 +313,7 @@ static int luks2_keyslot_get_key(struct crypt_device *cd, - - if (!json_object_object_get_ex(jobj_area, "offset", &jobj2)) - return -EINVAL; -- area_offset = json_object_get_uint64(jobj2); -+ area_offset = crypt_jobj_get_uint64(jobj2); - - if (!json_object_object_get_ex(jobj_area, "encryption", &jobj2)) - return -EINVAL; -@@ -494,8 +494,8 @@ static int luks2_keyslot_alloc(struct crypt_device *cd, - /* Area object */ - jobj_area = json_object_new_object(); - json_object_object_add(jobj_area, "type", json_object_new_string("raw")); -- json_object_object_add(jobj_area, "offset", json_object_new_uint64(area_offset)); -- json_object_object_add(jobj_area, "size", json_object_new_uint64(area_length)); -+ json_object_object_add(jobj_area, "offset", crypt_jobj_new_uint64(area_offset)); -+ json_object_object_add(jobj_area, "size", crypt_jobj_new_uint64(area_length)); - json_object_object_add(jobj_keyslot, "area", jobj_area); - - json_object_object_add_by_uint(jobj_keyslots, keyslot, jobj_keyslot); -@@ -607,7 +607,7 @@ static int luks2_keyslot_dump(struct crypt_device *cd, int keyslot) - log_std(cd, "\tCipher: %s\n", json_object_get_string(jobj1)); - - json_object_object_get_ex(jobj_area, "key_size", &jobj1); -- log_std(cd, "\tCipher key: %u bits\n", json_object_get_uint32(jobj1) * 8); -+ log_std(cd, "\tCipher key: %u bits\n", crypt_jobj_get_uint32(jobj1) * 8); - - json_object_object_get_ex(jobj_kdf, "type", &jobj1); - log_std(cd, "\tPBKDF: %s\n", json_object_get_string(jobj1)); -@@ -617,7 +617,7 @@ static int luks2_keyslot_dump(struct crypt_device *cd, int keyslot) - log_std(cd, "\tHash: %s\n", json_object_get_string(jobj1)); - - json_object_object_get_ex(jobj_kdf, "iterations", &jobj1); -- log_std(cd, "\tIterations: %" PRIu64 "\n", json_object_get_uint64(jobj1)); -+ log_std(cd, "\tIterations: %" PRIu64 "\n", crypt_jobj_get_uint64(jobj1)); - } else { - json_object_object_get_ex(jobj_kdf, "time", &jobj1); - log_std(cd, "\tTime cost: %" PRIu64 "\n", json_object_get_int64(jobj1)); -@@ -640,10 +640,10 @@ static int luks2_keyslot_dump(struct crypt_device *cd, int keyslot) - log_std(cd, "\tAF hash: %s\n", json_object_get_string(jobj1)); - - json_object_object_get_ex(jobj_area, "offset", &jobj1); -- log_std(cd, "\tArea offset:%" PRIu64 " [bytes]\n", json_object_get_uint64(jobj1)); -+ log_std(cd, "\tArea offset:%" PRIu64 " [bytes]\n", crypt_jobj_get_uint64(jobj1)); - - json_object_object_get_ex(jobj_area, "size", &jobj1); -- log_std(cd, "\tArea length:%" PRIu64 " [bytes]\n", json_object_get_uint64(jobj1)); -+ log_std(cd, "\tArea length:%" PRIu64 " [bytes]\n", crypt_jobj_get_uint64(jobj1)); - - return 0; - } -diff --git a/lib/luks2/luks2_keyslot_reenc.c b/lib/luks2/luks2_keyslot_reenc.c -index a09056b..b939467 100644 ---- a/lib/luks2/luks2_keyslot_reenc.c -+++ b/lib/luks2/luks2_keyslot_reenc.c -@@ -67,13 +67,13 @@ int reenc_keyslot_alloc(struct crypt_device *cd, - - if (params->data_shift) { - json_object_object_add(jobj_area, "type", json_object_new_string("datashift")); -- json_object_object_add(jobj_area, "shift_size", json_object_new_uint64(params->data_shift << SECTOR_SHIFT)); -+ json_object_object_add(jobj_area, "shift_size", crypt_jobj_new_uint64(params->data_shift << SECTOR_SHIFT)); - } else - /* except data shift protection, initial setting is irrelevant. Type can be changed during reencryption */ - json_object_object_add(jobj_area, "type", json_object_new_string("none")); - -- json_object_object_add(jobj_area, "offset", json_object_new_uint64(area_offset)); -- json_object_object_add(jobj_area, "size", json_object_new_uint64(area_length)); -+ json_object_object_add(jobj_area, "offset", crypt_jobj_new_uint64(area_offset)); -+ json_object_object_add(jobj_area, "size", crypt_jobj_new_uint64(area_length)); - - json_object_object_add(jobj_keyslot, "type", json_object_new_string("reencrypt")); - json_object_object_add(jobj_keyslot, "key_size", json_object_new_int(1)); /* useless but mandatory */ -@@ -113,8 +113,8 @@ static int reenc_keyslot_store_data(struct crypt_device *cd, - !json_object_object_get_ex(jobj_area, "size", &jobj_length)) - return -EINVAL; - -- area_offset = json_object_get_uint64(jobj_offset); -- area_length = json_object_get_uint64(jobj_length); -+ area_offset = crypt_jobj_get_uint64(jobj_offset); -+ area_length = crypt_jobj_get_uint64(jobj_length); - - if (!area_offset || !area_length || ((uint64_t)buffer_len > area_length)) - return -EINVAL; -@@ -242,14 +242,14 @@ static int reenc_keyslot_dump(struct crypt_device *cd, int keyslot) - log_std(cd, "\t%-12s%d [bytes]\n", "Hash data:", json_object_get_int(jobj1)); - } else if (!strcmp(json_object_get_string(jobj_resilience), "datashift")) { - json_object_object_get_ex(jobj_area, "shift_size", &jobj1); -- log_std(cd, "\t%-12s%" PRIu64 "[bytes]\n", "Shift size:", json_object_get_uint64(jobj1)); -+ log_std(cd, "\t%-12s%" PRIu64 "[bytes]\n", "Shift size:", crypt_jobj_get_uint64(jobj1)); - } - - json_object_object_get_ex(jobj_area, "offset", &jobj1); -- log_std(cd, "\tArea offset:%" PRIu64 " [bytes]\n", json_object_get_uint64(jobj1)); -+ log_std(cd, "\tArea offset:%" PRIu64 " [bytes]\n", crypt_jobj_get_uint64(jobj1)); - - json_object_object_get_ex(jobj_area, "size", &jobj1); -- log_std(cd, "\tArea length:%" PRIu64 " [bytes]\n", json_object_get_uint64(jobj1)); -+ log_std(cd, "\tArea length:%" PRIu64 " [bytes]\n", crypt_jobj_get_uint64(jobj1)); - - return 0; - } -@@ -304,7 +304,7 @@ static int reenc_keyslot_validate(struct crypt_device *cd, json_object *jobj_key - return -EINVAL; - if (!validate_json_uint32(jobj_sector_size)) - return -EINVAL; -- sector_size = json_object_get_uint32(jobj_sector_size); -+ sector_size = crypt_jobj_get_uint32(jobj_sector_size); - if (sector_size < SECTOR_SIZE || NOTPOW2(sector_size)) { - log_dbg(cd, "Invalid sector_size (%" PRIu32 ") for checksum resilience mode.", sector_size); - return -EINVAL; -@@ -313,7 +313,7 @@ static int reenc_keyslot_validate(struct crypt_device *cd, json_object *jobj_key - if (!(jobj_shift_size = json_contains(cd, jobj_area, "type:datashift", "Keyslot area", "shift_size", json_type_string))) - return -EINVAL; - -- shift_size = json_object_get_uint64(jobj_shift_size); -+ shift_size = crypt_jobj_get_uint64(jobj_shift_size); - if (!shift_size) - return -EINVAL; - -diff --git a/lib/luks2/luks2_luks1_convert.c b/lib/luks2/luks2_luks1_convert.c -index ca47e5d..603c44d 100644 ---- a/lib/luks2/luks2_luks1_convert.c -+++ b/lib/luks2/luks2_luks1_convert.c -@@ -91,8 +91,8 @@ static int json_luks1_keyslot(const struct luks_phdr *hdr_v1, int keyslot, struc - } - area_size = offs_b - offs_a; - json_object_object_add(jobj_area, "key_size", json_object_new_int(hdr_v1->keyBytes)); -- json_object_object_add(jobj_area, "offset", json_object_new_uint64(offset)); -- json_object_object_add(jobj_area, "size", json_object_new_uint64(area_size)); -+ json_object_object_add(jobj_area, "offset", crypt_jobj_new_uint64(offset)); -+ json_object_object_add(jobj_area, "size", crypt_jobj_new_uint64(area_size)); - json_object_object_add(keyslot_obj, "area", jobj_area); - - *keyslot_object = keyslot_obj; -@@ -145,7 +145,7 @@ static int json_luks1_segment(const struct luks_phdr *hdr_v1, struct json_object - /* offset field */ - number = (uint64_t)hdr_v1->payloadOffset * SECTOR_SIZE; - -- field = json_object_new_uint64(number); -+ field = crypt_jobj_new_uint64(number); - if (!field) { - json_object_put(segment_obj); - return -ENOMEM; -@@ -401,9 +401,9 @@ static int json_luks1_object(struct luks_phdr *hdr_v1, struct json_object **luks - json_object_object_add(luks1_obj, "config", field); - - json_size = LUKS2_HDR_16K_LEN - LUKS2_HDR_BIN_LEN; -- json_object_object_add(field, "json_size", json_object_new_uint64(json_size)); -+ json_object_object_add(field, "json_size", crypt_jobj_new_uint64(json_size)); - keyslots_size -= (keyslots_size % 4096); -- json_object_object_add(field, "keyslots_size", json_object_new_uint64(keyslots_size)); -+ json_object_object_add(field, "keyslots_size", crypt_jobj_new_uint64(keyslots_size)); - - *luks1_object = luks1_obj; - return 0; -@@ -419,8 +419,8 @@ static void move_keyslot_offset(json_object *jobj, int offset_add) - UNUSED(key); - json_object_object_get_ex(val, "area", &jobj_area); - json_object_object_get_ex(jobj_area, "offset", &jobj2); -- offset = json_object_get_uint64(jobj2) + offset_add; -- json_object_object_add(jobj_area, "offset", json_object_new_uint64(offset)); -+ offset = crypt_jobj_get_uint64(jobj2) + offset_add; -+ json_object_object_add(jobj_area, "offset", crypt_jobj_new_uint64(offset)); - } - } - -@@ -764,7 +764,7 @@ int LUKS2_luks2_to_luks1(struct crypt_device *cd, struct luks2_hdr *hdr2, struct - return -EINVAL; - if (!json_object_object_get_ex(jobj_area, "offset", &jobj1)) - return -EINVAL; -- offset = json_object_get_uint64(jobj1); -+ offset = crypt_jobj_get_uint64(jobj1); - } else { - if (LUKS2_find_area_gap(cd, hdr2, key_size, &offset, &area_length)) - return -EINVAL; -@@ -796,7 +796,7 @@ int LUKS2_luks2_to_luks1(struct crypt_device *cd, struct luks2_hdr *hdr2, struct - - if (!json_object_object_get_ex(jobj_kdf, "iterations", &jobj1)) - continue; -- hdr1->keyblock[i].passwordIterations = json_object_get_uint32(jobj1); -+ hdr1->keyblock[i].passwordIterations = crypt_jobj_get_uint32(jobj1); - - if (!json_object_object_get_ex(jobj_kdf, "salt", &jobj1)) - continue; -@@ -837,7 +837,7 @@ int LUKS2_luks2_to_luks1(struct crypt_device *cd, struct luks2_hdr *hdr2, struct - - if (!json_object_object_get_ex(jobj_digest, "iterations", &jobj1)) - return -EINVAL; -- hdr1->mkDigestIterations = json_object_get_uint32(jobj1); -+ hdr1->mkDigestIterations = crypt_jobj_get_uint32(jobj1); - - if (!json_object_object_get_ex(jobj_digest, "digest", &jobj1)) - return -EINVAL; -@@ -862,7 +862,7 @@ int LUKS2_luks2_to_luks1(struct crypt_device *cd, struct luks2_hdr *hdr2, struct - - if (!json_object_object_get_ex(jobj_segment, "offset", &jobj1)) - return -EINVAL; -- offset = json_object_get_uint64(jobj1) / SECTOR_SIZE; -+ offset = crypt_jobj_get_uint64(jobj1) / SECTOR_SIZE; - if (offset > UINT32_MAX) - return -EINVAL; - /* FIXME: LUKS1 requires offset == 0 || offset >= luks1_hdr_size */ -diff --git a/lib/luks2/luks2_reencrypt.c b/lib/luks2/luks2_reencrypt.c -index 60a007b..68d3194 100644 ---- a/lib/luks2/luks2_reencrypt.c -+++ b/lib/luks2/luks2_reencrypt.c -@@ -165,7 +165,7 @@ static uint32_t reencrypt_alignment(struct luks2_hdr *hdr) - if (!json_object_object_get_ex(jobj_area, "sector_size", &jobj_sector_size)) - return 0; - -- return json_object_get_uint32(jobj_sector_size); -+ return crypt_jobj_get_uint32(jobj_sector_size); - } - - static json_object *_enc_create_segments_shift_after(struct crypt_device *cd, -@@ -200,13 +200,13 @@ static json_object *_enc_create_segments_shift_after(struct crypt_device *cd, - json_segment_remove_flag(jobj_seg_new, "in-reencryption"); - tmp = rh->length; - } else { -- json_object_object_add(jobj_seg_new, "offset", json_object_new_uint64(rh->offset + data_offset)); -- json_object_object_add(jobj_seg_new, "iv_tweak", json_object_new_uint64(rh->offset >> SECTOR_SHIFT)); -+ json_object_object_add(jobj_seg_new, "offset", crypt_jobj_new_uint64(rh->offset + data_offset)); -+ json_object_object_add(jobj_seg_new, "iv_tweak", crypt_jobj_new_uint64(rh->offset >> SECTOR_SHIFT)); - tmp = json_segment_get_size(jobj_seg_new, 0) + rh->length; - } - - /* alter size of new segment, reenc_seg == 0 we're finished */ -- json_object_object_add(jobj_seg_new, "size", reenc_seg > 0 ? json_object_new_uint64(tmp) : json_object_new_string("dynamic")); -+ json_object_object_add(jobj_seg_new, "size", reenc_seg > 0 ? crypt_jobj_new_uint64(tmp) : json_object_new_string("dynamic")); - json_object_object_add_by_uint(jobj_segs_post, reenc_seg, jobj_seg_new); - - return jobj_segs_post; -@@ -256,7 +256,7 @@ static json_object *reencrypt_make_hot_segments_encrypt_shift(struct crypt_devic - jobj_seg_shrunk = NULL; - if (json_object_copy(LUKS2_get_segment_jobj(hdr, sg), &jobj_seg_shrunk)) - goto err; -- json_object_object_add(jobj_seg_shrunk, "size", json_object_new_uint64(segment_size - rh->length)); -+ json_object_object_add(jobj_seg_shrunk, "size", crypt_jobj_new_uint64(segment_size - rh->length)); - json_object_object_add_by_uint(jobj_segs_hot, sg++, jobj_seg_shrunk); - } - -@@ -336,7 +336,7 @@ static json_object *reencrypt_make_post_segments_forward(struct crypt_device *cd - goto err; - jobj_old_seg = jobj_old_seg_copy; - fixed_length = rh->device_size - fixed_length; -- json_object_object_add(jobj_old_seg, "size", json_object_new_uint64(fixed_length)); -+ json_object_object_add(jobj_old_seg, "size", crypt_jobj_new_uint64(fixed_length)); - } else - json_object_get(jobj_old_seg); - json_object_object_add_by_uint(jobj_segs_post, 1, jobj_old_seg); -@@ -491,7 +491,7 @@ static json_object *reencrypt_make_hot_segments_backward(struct crypt_device *cd - if (rh->offset) { - if (json_object_copy(LUKS2_get_segment_jobj(hdr, 0), &jobj_old_seg)) - goto err; -- json_object_object_add(jobj_old_seg, "size", json_object_new_uint64(rh->offset)); -+ json_object_object_add(jobj_old_seg, "size", crypt_jobj_new_uint64(rh->offset)); - - json_object_object_add_by_uint(jobj_segs_hot, sg++, jobj_old_seg); - } -@@ -575,7 +575,7 @@ static uint64_t reencrypt_data_shift(struct luks2_hdr *hdr) - if (!json_object_object_get_ex(jobj_area, "shift_size", &jobj_data_shift)) - return 0; - -- return json_object_get_uint64(jobj_data_shift); -+ return crypt_jobj_get_uint64(jobj_data_shift); - } - - static crypt_reencrypt_mode_info reencrypt_mode(struct luks2_hdr *hdr) -diff --git a/lib/luks2/luks2_segment.c b/lib/luks2/luks2_segment.c -index d71a607..8708ba5 100644 ---- a/lib/luks2/luks2_segment.c -+++ b/lib/luks2/luks2_segment.c -@@ -55,7 +55,7 @@ uint64_t json_segment_get_offset(json_object *jobj_segment, unsigned blockwise) - !json_object_object_get_ex(jobj_segment, "offset", &jobj)) - return 0; - -- return blockwise ? json_object_get_uint64(jobj) >> SECTOR_SHIFT : json_object_get_uint64(jobj); -+ return blockwise ? crypt_jobj_get_uint64(jobj) >> SECTOR_SHIFT : crypt_jobj_get_uint64(jobj); - } - - const char *json_segment_type(json_object *jobj_segment) -@@ -77,7 +77,7 @@ uint64_t json_segment_get_iv_offset(json_object *jobj_segment) - !json_object_object_get_ex(jobj_segment, "iv_tweak", &jobj)) - return 0; - -- return json_object_get_uint64(jobj); -+ return crypt_jobj_get_uint64(jobj); - } - - uint64_t json_segment_get_size(json_object *jobj_segment, unsigned blockwise) -@@ -88,7 +88,7 @@ uint64_t json_segment_get_size(json_object *jobj_segment, unsigned blockwise) - !json_object_object_get_ex(jobj_segment, "size", &jobj)) - return 0; - -- return blockwise ? json_object_get_uint64(jobj) >> SECTOR_SHIFT : json_object_get_uint64(jobj); -+ return blockwise ? crypt_jobj_get_uint64(jobj) >> SECTOR_SHIFT : crypt_jobj_get_uint64(jobj); - } - - const char *json_segment_get_cipher(json_object *jobj_segment) -@@ -229,8 +229,8 @@ static json_object *_segment_create_generic(const char *type, uint64_t offset, c - return NULL; - - json_object_object_add(jobj, "type", json_object_new_string(type)); -- json_object_object_add(jobj, "offset", json_object_new_uint64(offset)); -- json_object_object_add(jobj, "size", length ? json_object_new_uint64(*length) : json_object_new_string("dynamic")); -+ json_object_object_add(jobj, "offset", crypt_jobj_new_uint64(offset)); -+ json_object_object_add(jobj, "size", length ? crypt_jobj_new_uint64(*length) : json_object_new_string("dynamic")); - - return jobj; - } -@@ -252,7 +252,7 @@ json_object *json_segment_create_crypt(uint64_t offset, - if (!jobj) - return NULL; - -- json_object_object_add(jobj, "iv_tweak", json_object_new_uint64(iv_offset)); -+ json_object_object_add(jobj, "iv_tweak", crypt_jobj_new_uint64(iv_offset)); - json_object_object_add(jobj, "encryption", json_object_new_string(cipher)); - json_object_object_add(jobj, "sector_size", json_object_new_int(sector_size)); - if (reencryption) --- -2.26.1 - diff --git a/cryptsetup-2.3.1.tar.sign b/cryptsetup-2.3.1.tar.sign deleted file mode 100644 index 72d336f..0000000 --- a/cryptsetup-2.3.1.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAl5p+RgACgkQ2bBXe9k+ -mPyBoQ//fK3nWpug0VJpWhxwoe0SOj0x/2CYP9bJAwkT33davLiDkkM0pfvq9Y5L -rdbX0JRJemwFwS6V0DuZNDK2b88xEeJpvnNmDWXtKQ2HS9BPNesJJmzgBRY4P06q -bwxUvndnDLP7fAZtEMiLQJYCzuLkGwnEQFMh1GLfAM2H8FM9YZYz/HvezTlDTLYi -9SJ0iF8UF+VR8jPl3hqGQXkiHPVopvMEhwL9kpP1dJdYmeMFVYH/l+3jQ0Qw5de7 -YaqEitsKaT/JT236vSfR/RCFEifswbea+fplQE5a0kVuVmAkaEnL65fS1S9+18Ol -7Vo/8JaXxN6kjVpBVwn57RpWpGiLYXYjTzOtRrAQx7Q0oX3ycCwnii1TEzDvFcJL -aPsZsbNMf6Cgj+iw0htPCoXInaZW52GHIGJc8rR5WKdl3v5Md2vgGV6TTVcMYee+ -KQ2RuQtiDXC9+4OhfTPZ5Rpxn+Dns9xl0hfsmbRJDH1THJncaX1B/0qN8gHtsvMG -/+p9tZ7Ox6EpiIh8CcsyJT83bzgq0FO0Ut8jsh8fM+YKHEISvEFkkGAmykLim/e+ -ef6aYpkxHoGA+jpwmDaXF0LBPY2jAxs6OQxQwuD9i+BDkyMH1arO/AkRkEMqQMY6 -2yyVfu6doOVEACX51zZmB3bBvQLUtjPJh/5hS/0InGOP2Nm3lwA= -=1LIc ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.3.2.tar.sign b/cryptsetup-2.3.2.tar.sign new file mode 100644 index 0000000..caa4fb4 --- /dev/null +++ b/cryptsetup-2.3.2.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAl6q6lwACgkQ2bBXe9k+ +mPwhfBAAqRpYNk0hzMz+lBZrfuwXs2NP8AbUJj5bPRaNOnaMmi7XBDcul4h+zC7Z +B+CDaEDTBGtpGIeIYsSX6jOInG7Atp3cKxJ3YzRLcK/1nNPgZaJHQSzieT4OH06N +ZpoSPPtfes1Zf0AaG9l+G4KW1KLntNfjq25uBiEFafZ8DfA9Xo8dXNKowFNasMbo +r0u/97AvKKJAuwaa2As7UuoVwPph0o7OmKMFHM2sw+fuYhop8FRWW77ZI384lkRs +iBuJLo1aFMRIg8zl39xG07fA9knLY7oCJrZ4fD5RY5u70i2+eE3Jx677MjGar5kC +3xk3v0PrflSB71b+IJy/sCnuDYFxhDcOtB6xXC94jEO7Cu/AIH+DWbIOUIchMZ63 +1HZiXwnOQFTURSRjxbQH+voh/50cP/txXLDaerSXQnET0Bocjj4YswQR6yvdtGNP +O43ByWPQrvsB90nianvnt7dG9Ddil+CJNM/hlZX3MJVzZR7WJJ7+lz6in4bxYlOl +2Fn1LkdtuDMfe143a+R9KiyLXk9lGFY4rEZtiKMZ10zQ32ydezIqPEllT255PEr2 +LCCZ4m5Bi+YaPrCWhIoaTvQubCst5Cga4RfYl8zBokEy01b5qRYHrBTaPRqkvP5U +W/CosGMAE5KmShrdWV3hL2Ej8Dc7cnId1RLDKD2nXlgwnoR23Hw= +=Lo3q +-----END PGP SIGNATURE----- diff --git a/cryptsetup.spec b/cryptsetup.spec index a8cfbc8..841b67b 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -1,7 +1,7 @@ Summary: A utility for setting up encrypted disks Name: cryptsetup -Version: 2.3.1 -Release: 4%{?dist} +Version: 2.3.2 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: https://gitlab.com/cryptsetup/cryptsetup BuildRequires: openssl-devel, popt-devel, device-mapper-devel @@ -18,9 +18,6 @@ Obsoletes: cryptsetup-python3 < 2.1.0 %global upstream_version %{version} Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-%{upstream_version}.tar.xz -# https://gitlab.com/cryptsetup/cryptsetup/-/commit/604abec333a0efb44fd8bc610aa0b1151dd0f612 -Patch0: 0001-Add-support-for-upcoming-json-c-0.14.0.patch -Patch1: 0002-Avoid-name-clash-with-newer-json-c-library.patch # Following patch has to applied last Patch9999: %{name}-add-system-library-paths.patch @@ -127,6 +124,9 @@ rm -rf %{buildroot}/%{_libdir}/*.la %ghost %attr(700, -, -) %dir /run/cryptsetup %changelog +* Thu Apr 30 2020 Milan Broz - 2.3.2-1 +- Update to cryptsetup 2.3.2. + * Tue Apr 21 2020 Björn Esser - 2.3.1-4 - Rebuild (json-c) diff --git a/sources b/sources index a589b1f..6223baa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptsetup-2.3.1.tar.xz) = e6ee77d72eda0b990db894d794a686f22043161b17b5f5c8cd54a64c5751f884a241c76b03bbccd52f74440c609036d50ed8503584bc3a0a011e4854a60dd4bf +SHA512 (cryptsetup-2.3.2.tar.xz) = c5eb41751ca64ff906187f40805705570c261816b014dfcdbf2777f42e53668e32966197092a2235b8f6a7a4e7f9c3f301d82f17c45cfbcff96b9818631d7e5f