From 82b56300cd155564eaf50bb1c9e93991e50cbdfd Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Sat, 1 Oct 2022 22:33:44 +0200 Subject: [PATCH] Wrap some very long lines. --- lib/keyslot_context.c | 3 ++- lib/libdevmapper.c | 6 ++++-- lib/luks2/luks2_reencrypt.c | 16 +++++++++----- lib/luks2/luks2_token.c | 27 +++++++++++++++-------- lib/setup.c | 43 ++++++++++++++++++++++++++----------- lib/utils_device.c | 5 ++++- 6 files changed, 69 insertions(+), 31 deletions(-) diff --git a/lib/keyslot_context.c b/lib/keyslot_context.c index 9c991d82..8bdc2739 100644 --- a/lib/keyslot_context.c +++ b/lib/keyslot_context.c @@ -241,7 +241,8 @@ static int get_luks2_key_by_token(struct crypt_device *cd, return 0; } - r = LUKS2_token_unlock_key(cd, crypt_get_hdr(cd, CRYPT_LUKS2), kc->u.t.id, kc->u.t.type, kc->u.t.pin, kc->u.t.pin_size, segment, kc->u.t.usrptr, &kc->i_vk); + r = LUKS2_token_unlock_key(cd, crypt_get_hdr(cd, CRYPT_LUKS2), kc->u.t.id, kc->u.t.type, + kc->u.t.pin, kc->u.t.pin_size, segment, kc->u.t.usrptr, &kc->i_vk); if (r < 0) { kc->error = r; return r; diff --git a/lib/libdevmapper.c b/lib/libdevmapper.c index b4656215..6c2eab78 100644 --- a/lib/libdevmapper.c +++ b/lib/libdevmapper.c @@ -2856,7 +2856,8 @@ int dm_query_device(struct crypt_device *cd, const char *name, return r; } -static int _process_deps(struct crypt_device *cd, const char *prefix, struct dm_deps *deps, char **names, size_t names_offset, size_t names_length) +static int _process_deps(struct crypt_device *cd, const char *prefix, struct dm_deps *deps, + char **names, size_t names_offset, size_t names_length) { #if HAVE_DECL_DM_DEVICE_GET_NAME struct crypt_dm_active_device dmd; @@ -2902,7 +2903,8 @@ static int _process_deps(struct crypt_device *cd, const char *prefix, struct dm_ #endif } -int dm_device_deps(struct crypt_device *cd, const char *name, const char *prefix, char **names, size_t names_length) +int dm_device_deps(struct crypt_device *cd, const char *name, const char *prefix, + char **names, size_t names_length) { struct dm_task *dmt; struct dm_info dmi; diff --git a/lib/luks2/luks2_reencrypt.c b/lib/luks2/luks2_reencrypt.c index 2fcde4b7..c4292411 100644 --- a/lib/luks2/luks2_reencrypt.c +++ b/lib/luks2/luks2_reencrypt.c @@ -513,7 +513,8 @@ static json_object *reencrypt_make_hot_segments_forward(struct crypt_device *cd, if (tmp < device_size) { fixed_length = device_size - tmp; - jobj_old_seg = reencrypt_make_segment_old(cd, hdr, rh, data_offset + data_shift_value(&rh->rp), rh->offset + rh->length, rh->fixed_length ? &fixed_length : NULL); + jobj_old_seg = reencrypt_make_segment_old(cd, hdr, rh, data_offset + data_shift_value(&rh->rp), + rh->offset + rh->length, rh->fixed_length ? &fixed_length : NULL); if (!jobj_old_seg) goto err; json_object_object_add_by_uint(jobj_segs_hot, sg, jobj_old_seg); @@ -668,7 +669,8 @@ static json_object *reencrypt_make_hot_segments_backward(struct crypt_device *cd if (tmp < device_size) { fixed_length = device_size - tmp; - jobj_new_seg = reencrypt_make_segment_new(cd, hdr, rh, data_offset, rh->offset + rh->length, rh->offset + rh->length, rh->fixed_length ? &fixed_length : NULL); + jobj_new_seg = reencrypt_make_segment_new(cd, hdr, rh, data_offset, rh->offset + rh->length, + rh->offset + rh->length, rh->fixed_length ? &fixed_length : NULL); if (!jobj_new_seg) goto err; json_object_object_add_by_uint(jobj_segs_hot, sg, jobj_new_seg); @@ -892,7 +894,8 @@ static void _load_backup_segments(struct luks2_hdr *hdr, rh->jobj_segment_moved = NULL; } -static int reencrypt_offset_backward_moved(struct luks2_hdr *hdr, json_object *jobj_segments, uint64_t *reencrypt_length, uint64_t data_shift, uint64_t *offset) +static int reencrypt_offset_backward_moved(struct luks2_hdr *hdr, json_object *jobj_segments, + uint64_t *reencrypt_length, uint64_t data_shift, uint64_t *offset) { uint64_t tmp, linear_length = 0; int sg, segs = json_segments_count(jobj_segments); @@ -1474,7 +1477,8 @@ static int reencrypt_recover_segment(struct crypt_device *cd, else crash_iv_offset = json_segment_get_iv_offset(json_segments_get_segment(rh->jobj_segs_hot, rseg)); - log_dbg(cd, "crash_offset: %" PRIu64 ", crash_length: %" PRIu64 ", crash_iv_offset: %" PRIu64, data_offset + rh->offset, rh->length, crash_iv_offset); + log_dbg(cd, "crash_offset: %" PRIu64 ", crash_length: %" PRIu64 ", crash_iv_offset: %" PRIu64, + data_offset + rh->offset, rh->length, crash_iv_offset); r = crypt_storage_wrapper_init(cd, &cw2, crypt_data_device(cd), data_offset + rh->offset, crash_iv_offset, new_sector_size, @@ -1842,7 +1846,9 @@ static int reencrypt_assign_segments(struct crypt_device *cd, return commit ? LUKS2_hdr_write(cd, hdr) : 0; } -static int reencrypt_set_encrypt_segments(struct crypt_device *cd, struct luks2_hdr *hdr, uint64_t dev_size, uint64_t data_shift, bool move_first_segment, crypt_reencrypt_direction_info di) +static int reencrypt_set_encrypt_segments(struct crypt_device *cd, struct luks2_hdr *hdr, + uint64_t dev_size, uint64_t data_shift, bool move_first_segment, + crypt_reencrypt_direction_info di) { int r; uint64_t first_segment_offset, first_segment_length, diff --git a/lib/luks2/luks2_token.c b/lib/luks2/luks2_token.c index 41aaba8a..9e995745 100644 --- a/lib/luks2/luks2_token.c +++ b/lib/luks2/luks2_token.c @@ -423,7 +423,8 @@ static const char *token_json_to_string(json_object *jobj_token) JSON_C_TO_STRING_PLAIN | JSON_C_TO_STRING_NOSLASHESCAPE); } -static int token_is_usable(struct luks2_hdr *hdr, json_object *jobj_token, int segment, crypt_keyslot_priority minimal_priority, bool requires_keyslot) +static int token_is_usable(struct luks2_hdr *hdr, json_object *jobj_token, int segment, + crypt_keyslot_priority minimal_priority, bool requires_keyslot) { crypt_keyslot_priority keyslot_priority; json_object *jobj_array; @@ -509,7 +510,8 @@ static int token_open(struct crypt_device *cd, r = token_is_usable(hdr, jobj_token, segment, priority, requires_keyslot); if (r < 0) { if (r == -ENOENT) - log_dbg(cd, "Token %d unusable for segment %d with desired keyslot priority %d.", token, segment, priority); + log_dbg(cd, "Token %d unusable for segment %d with desired keyslot priority %d.", + token, segment, priority); return r; } @@ -601,7 +603,8 @@ static int LUKS2_keyslot_open_by_token(struct crypt_device *cd, return -EINVAL; if (keyslot_priority < priority) continue; - log_dbg(cd, "Trying to open keyslot %u with token %d (type %s).", num, token, json_object_get_string(jobj_type)); + log_dbg(cd, "Trying to open keyslot %u with token %d (type %s).", + num, token, json_object_get_string(jobj_type)); r = LUKS2_keyslot_open(cd, num, segment, buffer, buffer_len, vk); /* short circuit on fatal error */ if (r < 0 && r != -EPERM && r != -ENOENT) @@ -676,7 +679,8 @@ static int token_open_priority(struct crypt_device *cd, return *stored_retval; } -static int token_open_any(struct crypt_device *cd, struct luks2_hdr *hdr, const char *type, int segment, const char *pin, size_t pin_size, void *usrptr, struct volume_key **vk) +static int token_open_any(struct crypt_device *cd, struct luks2_hdr *hdr, const char *type, int segment, + const char *pin, size_t pin_size, void *usrptr, struct volume_key **vk) { json_object *jobj_tokens; int r, retval = -ENOENT; @@ -688,11 +692,13 @@ static int token_open_any(struct crypt_device *cd, struct luks2_hdr *hdr, const if (!type) usrptr = NULL; - r = token_open_priority(cd, hdr, jobj_tokens, type, segment, CRYPT_SLOT_PRIORITY_PREFER, pin, pin_size, usrptr, &retval, &blocked, vk); + r = token_open_priority(cd, hdr, jobj_tokens, type, segment, CRYPT_SLOT_PRIORITY_PREFER, + pin, pin_size, usrptr, &retval, &blocked, vk); if (break_loop_retval(r)) return r; - return token_open_priority(cd, hdr, jobj_tokens, type, segment, CRYPT_SLOT_PRIORITY_NORMAL, pin, pin_size, usrptr, &retval, &blocked, vk); + return token_open_priority(cd, hdr, jobj_tokens, type, segment, CRYPT_SLOT_PRIORITY_NORMAL, + pin, pin_size, usrptr, &retval, &blocked, vk); } int LUKS2_token_unlock_key(struct crypt_device *cd, @@ -720,7 +726,8 @@ int LUKS2_token_unlock_key(struct crypt_device *cd, if (token >= 0 && token < LUKS2_TOKENS_MAX) { if ((jobj_token = LUKS2_get_token_jobj(hdr, token))) { - r = token_open(cd, hdr, token, jobj_token, type, segment, CRYPT_SLOT_PRIORITY_IGNORE, pin, pin_size, &buffer, &buffer_size, usrptr, true); + r = token_open(cd, hdr, token, jobj_token, type, segment, CRYPT_SLOT_PRIORITY_IGNORE, + pin, pin_size, &buffer, &buffer_size, usrptr, true); if (!r) { r = LUKS2_keyslot_open_by_token(cd, hdr, token, segment, CRYPT_SLOT_PRIORITY_IGNORE, buffer, buffer_size, vk); @@ -988,7 +995,8 @@ int LUKS2_token_unlock_passphrase(struct crypt_device *cd, if (token >= 0 && token < LUKS2_TOKENS_MAX) { if ((jobj_token = LUKS2_get_token_jobj(hdr, token))) - r = token_open(cd, hdr, token, jobj_token, type, CRYPT_ANY_SEGMENT, CRYPT_SLOT_PRIORITY_IGNORE, pin, pin_size, &buffer, &buffer_size, usrptr, false); + r = token_open(cd, hdr, token, jobj_token, type, CRYPT_ANY_SEGMENT, CRYPT_SLOT_PRIORITY_IGNORE, + pin, pin_size, &buffer, &buffer_size, usrptr, false); } else if (token == CRYPT_ANY_TOKEN) { json_object_object_get_ex(hdr->jobj, "tokens", &jobj_tokens); @@ -997,7 +1005,8 @@ int LUKS2_token_unlock_passphrase(struct crypt_device *cd, json_object_object_foreach(jobj_tokens, slot, val) { token = atoi(slot); - r = token_open(cd, hdr, token, val, type, CRYPT_ANY_SEGMENT, CRYPT_SLOT_PRIORITY_IGNORE, pin, pin_size, &buffer, &buffer_size, usrptr, false); + r = token_open(cd, hdr, token, val, type, CRYPT_ANY_SEGMENT, CRYPT_SLOT_PRIORITY_IGNORE, + pin, pin_size, &buffer, &buffer_size, usrptr, false); /* * return priorities (ordered form least to most significant): diff --git a/lib/setup.c b/lib/setup.c index 5f74c4bb..6d7411b5 100644 --- a/lib/setup.c +++ b/lib/setup.c @@ -1163,7 +1163,8 @@ static void crypt_free_type(struct crypt_device *cd) static int _init_by_name_crypt(struct crypt_device *cd, const char *name) { bool found = false; - char **dep, *cipher_spec = NULL, cipher[MAX_CIPHER_LEN], cipher_mode[MAX_CIPHER_LEN], deps_uuid_prefix[40], *deps[MAX_DM_DEPS+1] = {}; + char **dep, *cipher_spec = NULL, cipher[MAX_CIPHER_LEN], cipher_mode[MAX_CIPHER_LEN]; + char deps_uuid_prefix[40], *deps[MAX_DM_DEPS+1] = {}; const char *dev, *namei; int key_nums, r; struct crypt_dm_active_device dmd, dmdi = {}, dmdep = {}; @@ -2400,7 +2401,8 @@ int crypt_repair(struct crypt_device *cd, } /* compare volume keys */ -static int _compare_volume_keys(struct volume_key *svk, unsigned skeyring_only, struct volume_key *tvk, unsigned tkeyring_only) +static int _compare_volume_keys(struct volume_key *svk, unsigned skeyring_only, + struct volume_key *tvk, unsigned tkeyring_only) { if (!svk && !tvk) return 0; @@ -2605,13 +2607,16 @@ static int _reload_device(struct crypt_device *cd, const char *name, r = dm_query_device(cd, name, DM_ACTIVE_DEVICE | DM_ACTIVE_CRYPT_CIPHER | DM_ACTIVE_UUID | DM_ACTIVE_CRYPT_KEYSIZE | - DM_ACTIVE_CRYPT_KEY | DM_ACTIVE_INTEGRITY_PARAMS | DM_ACTIVE_JOURNAL_CRYPT_KEY | DM_ACTIVE_JOURNAL_MAC_KEY, &tdmd); + DM_ACTIVE_CRYPT_KEY | DM_ACTIVE_INTEGRITY_PARAMS | + DM_ACTIVE_JOURNAL_CRYPT_KEY | DM_ACTIVE_JOURNAL_MAC_KEY, &tdmd); if (r < 0) { log_err(cd, _("Device %s is not active."), name); return -EINVAL; } - if (!single_segment(&tdmd) || (tgt->type != DM_CRYPT && tgt->type != DM_INTEGRITY) || (tgt->type == DM_CRYPT && tgt->u.crypt.tag_size)) { + if (!single_segment(&tdmd) || + (tgt->type != DM_CRYPT && tgt->type != DM_INTEGRITY) || + (tgt->type == DM_CRYPT && tgt->u.crypt.tag_size)) { r = -ENOTSUP; log_err(cd, _("Unsupported parameters on device %s."), name); goto out; @@ -2862,7 +2867,9 @@ int crypt_resize(struct crypt_device *cd, const char *name, uint64_t new_size) log_dbg(cd, "Resizing device %s to %" PRIu64 " sectors.", name, new_size); - r = dm_query_device(cd, name, DM_ACTIVE_CRYPT_KEYSIZE | DM_ACTIVE_CRYPT_KEY | DM_ACTIVE_INTEGRITY_PARAMS | DM_ACTIVE_JOURNAL_CRYPT_KEY | DM_ACTIVE_JOURNAL_MAC_KEY, &dmdq); + r = dm_query_device(cd, name, DM_ACTIVE_CRYPT_KEYSIZE | DM_ACTIVE_CRYPT_KEY | + DM_ACTIVE_INTEGRITY_PARAMS | DM_ACTIVE_JOURNAL_CRYPT_KEY | + DM_ACTIVE_JOURNAL_MAC_KEY, &dmdq); if (r < 0) { log_err(cd, _("Device %s is not active."), name); return -EINVAL; @@ -2922,7 +2929,8 @@ int crypt_resize(struct crypt_device *cd, const char *name, uint64_t new_size) r = dm_integrity_target_set(cd, &dmd.segment, 0, dmdq.segment.size, crypt_metadata_device(cd), crypt_data_device(cd), crypt_get_integrity_tag_size(cd), crypt_get_data_offset(cd), - crypt_get_sector_size(cd), tgt->u.integrity.vk, tgt->u.integrity.journal_crypt_key, tgt->u.integrity.journal_integrity_key, ¶ms); + crypt_get_sector_size(cd), tgt->u.integrity.vk, tgt->u.integrity.journal_crypt_key, + tgt->u.integrity.journal_integrity_key, ¶ms); if (r) goto out; r = _reload_device(cd, name, &dmd); @@ -2935,7 +2943,9 @@ int crypt_resize(struct crypt_device *cd, const char *name, uint64_t new_size) return r; log_dbg(cd, "Maximum integrity device size from kernel %" PRIu64, new_size); - if (old_size == new_size && new_size == dmdq.size && !dm_flags(cd, tgt->type, &supported_flags) && !(supported_flags & DM_INTEGRITY_RESIZE_SUPPORTED)) + if (old_size == new_size && new_size == dmdq.size && + !dm_flags(cd, tgt->type, &supported_flags) && + !(supported_flags & DM_INTEGRITY_RESIZE_SUPPORTED)) log_std(cd, _("WARNING: Maximum size already set or kernel doesn't support resize.\n")); } @@ -2976,7 +2986,8 @@ int crypt_resize(struct crypt_device *cd, const char *name, uint64_t new_size) r = dm_integrity_target_set(cd, &dmd.segment, 0, new_size, crypt_metadata_device(cd), crypt_data_device(cd), crypt_get_integrity_tag_size(cd), crypt_get_data_offset(cd), - crypt_get_sector_size(cd), tgt->u.integrity.vk, tgt->u.integrity.journal_crypt_key, tgt->u.integrity.journal_integrity_key, ¶ms); + crypt_get_sector_size(cd), tgt->u.integrity.vk, tgt->u.integrity.journal_crypt_key, + tgt->u.integrity.journal_integrity_key, ¶ms); if (r) goto out; } @@ -2993,7 +3004,9 @@ int crypt_resize(struct crypt_device *cd, const char *name, uint64_t new_size) if (!r) r = _reload_device(cd, name, &dmd); - if (r && tgt->type == DM_INTEGRITY && !dm_flags(cd, tgt->type, &supported_flags) && !(supported_flags & DM_INTEGRITY_RESIZE_SUPPORTED)) + if (r && tgt->type == DM_INTEGRITY && + !dm_flags(cd, tgt->type, &supported_flags) && + !(supported_flags & DM_INTEGRITY_RESIZE_SUPPORTED)) log_err(cd, _("Resize failed, the kernel doesn't support it.")); } out: @@ -3393,7 +3406,8 @@ int crypt_resume_by_keyfile_device_offset(struct crypt_device *cd, r = LUKS_open_key_with_hdr(keyslot, passphrase_read, passphrase_size_read, &cd->u.luks1.hdr, &vk, cd); else - r = LUKS2_keyslot_open(cd, keyslot, CRYPT_DEFAULT_SEGMENT, passphrase_read, passphrase_size_read, &vk); + r = LUKS2_keyslot_open(cd, keyslot, CRYPT_DEFAULT_SEGMENT, + passphrase_read, passphrase_size_read, &vk); crypt_safe_free(passphrase_read); if (r < 0) @@ -3498,7 +3512,8 @@ int crypt_resume_by_token_pin(struct crypt_device *cd, const char *name, return -EINVAL; } - r = LUKS2_token_unlock_key(cd, &cd->u.luks2.hdr, token, type, pin, pin_size, CRYPT_DEFAULT_SEGMENT, usrptr, &vk); + r = LUKS2_token_unlock_key(cd, &cd->u.luks2.hdr, token, type, + pin, pin_size, CRYPT_DEFAULT_SEGMENT, usrptr, &vk); keyslot = r; if (r >= 0) r = resume_by_volume_key(cd, vk, name); @@ -4481,7 +4496,8 @@ int crypt_activate_by_volume_key(struct crypt_device *cd, if (!crypt_use_keyring_for_vk(cd)) use_keyring = false; else - use_keyring = (name && !crypt_is_cipher_null(crypt_get_cipher(cd))) || (flags & CRYPT_ACTIVATE_KEYRING_KEY); + use_keyring = (name && !crypt_is_cipher_null(crypt_get_cipher(cd))) || + (flags & CRYPT_ACTIVATE_KEYRING_KEY); if (!r && use_keyring) { r = LUKS2_key_description_by_segment(cd, @@ -5687,7 +5703,8 @@ int crypt_activate_by_token_pin(struct crypt_device *cd, const char *name, if (r < 0) return r; - return LUKS2_token_open_and_activate(cd, &cd->u.luks2.hdr, token, name, type, pin, pin_size, flags, usrptr); + return LUKS2_token_open_and_activate(cd, &cd->u.luks2.hdr, token, name, type, + pin, pin_size, flags, usrptr); } int crypt_activate_by_token(struct crypt_device *cd, diff --git a/lib/utils_device.c b/lib/utils_device.c index 8f582b5f..011630f7 100644 --- a/lib/utils_device.c +++ b/lib/utils_device.c @@ -623,7 +623,10 @@ size_t device_optimal_encryption_sector_size(struct crypt_device *cd, struct dev phys_block_size = device_block_phys_size_fd(fd); close(fd); - if (device->block_size >= phys_block_size || phys_block_size <= SECTOR_SIZE || phys_block_size > MAX_SECTOR_SIZE || MISALIGNED(phys_block_size, device->block_size)) + if (device->block_size >= phys_block_size || + phys_block_size <= SECTOR_SIZE || + phys_block_size > MAX_SECTOR_SIZE || + MISALIGNED(phys_block_size, device->block_size)) return device->block_size; return phys_block_size;