Fix previous commit error condition.

This hints actually failed even if return code was OK.
This commit is contained in:
Milan Broz
2021-01-29 13:34:27 +01:00
parent 0a6f89cfa6
commit d20929194f

View File

@@ -281,9 +281,9 @@ int INTEGRITY_activate_dmd_device(struct crypt_device *cd,
if (r < 0 && (dmd->flags & CRYPT_ACTIVATE_RECALCULATE) && if (r < 0 && (dmd->flags & CRYPT_ACTIVATE_RECALCULATE) &&
!(crypt_get_compatibility(cd) & CRYPT_COMPAT_LEGACY_INTEGRITY_RECALC) && !(crypt_get_compatibility(cd) & CRYPT_COMPAT_LEGACY_INTEGRITY_RECALC) &&
(sb_flags & SB_FLAG_FIXED_HMAC) ? ((sb_flags & SB_FLAG_FIXED_HMAC) ?
(tgt->u.integrity.vk && !tgt->u.integrity.journal_integrity_key) : (tgt->u.integrity.vk && !tgt->u.integrity.journal_integrity_key) :
(tgt->u.integrity.vk || tgt->u.integrity.journal_integrity_key)) { (tgt->u.integrity.vk || tgt->u.integrity.journal_integrity_key))) {
log_err(cd, _("Kernel refuses to activate insecure recalculate option (see legacy activation options to override).")); log_err(cd, _("Kernel refuses to activate insecure recalculate option (see legacy activation options to override)."));
return -ENOTSUP; return -ENOTSUP;
} }