Typo fix: "tempered" -> "tampered"
This commit is contained in:
committed by
Zbigniew Jędrzejewski-Szmek
parent
d1697c4ff8
commit
10913c02a4
@@ -639,7 +639,7 @@ node /org/freedesktop/resolve1 {
|
||||
each non-existence proof. The secure counter is increased for each operation that successfully verified
|
||||
a signed reply, the insecure counter is increased for each operation that successfully verified that an
|
||||
unsigned reply is rightfully unsigned. The bogus counter is increased for each operation where the
|
||||
validation did not check out and the data is likely to have been tempered with. Finally, the
|
||||
validation did not check out and the data is likely to have been tampered with. Finally, the
|
||||
indeterminate counter is increased for each operation which did not complete because the necessary keys
|
||||
could not be acquired or the cryptographic algorithms were unknown.</para>
|
||||
|
||||
|
||||
@@ -136,7 +136,7 @@ int acquire_luks2_key(
|
||||
if (r == -ENOLCK)
|
||||
return log_error_errno(r, "TPM is in dictionary attack lock-out mode.");
|
||||
if (ERRNO_IS_NEG_TPM2_UNSEAL_BAD_PCR(r)) {
|
||||
log_warning_errno(r, "TPM policy does not match current system state. Either system has been tempered with or policy out-of-date: %m");
|
||||
log_warning_errno(r, "TPM policy does not match current system state. Either system has been tampered with or policy out-of-date: %m");
|
||||
/* Normalize to -EPERM so callers don't confuse it with -ENOANO's "needs PIN" meaning. */
|
||||
return -EPERM;
|
||||
}
|
||||
|
||||
@@ -1525,7 +1525,7 @@ int decrypt_credential_and_warn(
|
||||
if (r == -EADDRNOTAVAIL)
|
||||
return log_error_errno(r, "NV index referenced by key is missing, unwritten, or unusable, it could be for another system.");
|
||||
if (ERRNO_IS_NEG_TPM2_UNSEAL_BAD_PCR(r))
|
||||
return log_error_errno(r, "TPM policy does not match current system state. Either system has been tempered with or policy out-of-date: %m");
|
||||
return log_error_errno(r, "TPM policy does not match current system state. Either system has been tampered with or policy out-of-date: %m");
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to unseal secret using TPM2: %m");
|
||||
#else
|
||||
|
||||
@@ -178,7 +178,7 @@ int acquire_tpm2_key(
|
||||
if (r == -EADDRNOTAVAIL)
|
||||
return log_warning_errno(r, "NV index referenced by token is missing, unwritten, or unusable, it could be for another system.");
|
||||
if (ERRNO_IS_NEG_TPM2_UNSEAL_BAD_PCR(r)) {
|
||||
log_warning_errno(r, "TPM policy does not match current system state. Either system has been tempered with or policy out-of-date: %m");
|
||||
log_warning_errno(r, "TPM policy does not match current system state. Either system has been tampered with or policy out-of-date: %m");
|
||||
/* Normalize to -EPERM so callers don't confuse it with -ENOANO's "needs PIN" meaning. */
|
||||
return -EPERM;
|
||||
}
|
||||
@@ -258,7 +258,7 @@ int acquire_tpm2_key(
|
||||
if (r == -EADDRNOTAVAIL)
|
||||
return log_warning_errno(r, "NV index referenced by token is missing, unwritten, or unusable, it could be for another system.");
|
||||
if (ERRNO_IS_NEG_TPM2_UNSEAL_BAD_PCR(r)) {
|
||||
log_warning_errno(r, "TPM policy does not match current system state. Either system has been tempered with or policy out-of-date: %m");
|
||||
log_warning_errno(r, "TPM policy does not match current system state. Either system has been tampered with or policy out-of-date: %m");
|
||||
/* Normalize to -EPERM so callers don't confuse it with -ENOANO's "needs PIN" meaning. */
|
||||
return -EPERM;
|
||||
}
|
||||
|
||||
@@ -9832,7 +9832,7 @@ int tpm2_policy_super_pcr(
|
||||
if (single_value_pcrs & (UINT32_C(1) << pcr))
|
||||
(void) strextendf_with_separator(&j, ", ", "%" PRIu32, pcr);
|
||||
|
||||
return log_error_errno(r, "Combined value for PCR(s) %s encoded in policy does not match the current TPM state. Either the system has been tempered with or the provided policy is incorrect.", strna(j));
|
||||
return log_error_errno(r, "Combined value for PCR(s) %s encoded in policy does not match the current TPM state. Either the system has been tampered with or the provided policy is incorrect.", strna(j));
|
||||
}
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to submit PCR policy to TPM: %m");
|
||||
@@ -9865,7 +9865,7 @@ int tpm2_policy_super_pcr(
|
||||
&pcr_selection,
|
||||
¤t_policy_digest);
|
||||
if (r == -EUCLEAN)
|
||||
return log_error_errno(r, "Value for PCR %" PRIu32 " encoded in policy does not match the current TPM state. Either the system has been tempered with or the provided policy is incorrect.", pcr);
|
||||
return log_error_errno(r, "Value for PCR %" PRIu32 " encoded in policy does not match the current TPM state. Either the system has been tampered with or the provided policy is incorrect.", pcr);
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to submit PCR policy to TPM: %m");
|
||||
|
||||
@@ -9907,7 +9907,7 @@ int tpm2_policy_super_pcr(
|
||||
n_branches,
|
||||
¤t_policy_digest);
|
||||
if (r == -ENOANO)
|
||||
return log_error_errno(r, "None of the alternative values for PCR %" PRIu32 " encoded in policy match the current TPM state. Either the system has been tempered with or the provided policy is incorrect.", pcr);
|
||||
return log_error_errno(r, "None of the alternative values for PCR %" PRIu32 " encoded in policy match the current TPM state. Either the system has been tampered with or the provided policy is incorrect.", pcr);
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to submit OR policy to TPM: %m");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user