Merge pull request #22919 from poettering/cryptsetup-tweaks

various minor tweaks to cryptsetup/veritysetup/integritysetup

diff --cc src/cryptsetup/cryptsetup.c
index 4c514e408ffbb9ea19f6276bc2a3c814ebda9eac,408d7511bfd0f8e34a380ad451882f7361e37fc1..bd666230be32ca30d22971ad9df1c59657773d10
--- 1/src/cryptsetup/cryptsetup.c
--- 2/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@@ -1322,13 -1323,10 +1323,13 @@@ static int attach_luks_or_plain_or_bitl
                                  return log_error_errno(SYNTHETIC_ERRNO(EAGAIN), "TPM2 PIN unlock failed, falling back to traditional unlocking.");
                          if (ERRNO_IS_NOT_SUPPORTED(r)) /* TPM2 support not compiled in? */
                                  return log_debug_errno(SYNTHETIC_ERRNO(EAGAIN), "TPM2 support not available, falling back to traditional unlocking.");
 -                        if (r != -EAGAIN) /* EAGAIN means: no tpm2 chip found */
 -                                return r;
 +                        /* EAGAIN means: no tpm2 chip found */
 +                        if (r != -EAGAIN) {
 +                                log_notice_errno(r, "TPM2 operation failed, falling back to traditional unlocking: %m");
 +                                return -EAGAIN; /* Mangle error code: let's make any form of TPM2 failure non-fatal. */
 +                        }
                  } else {
-                         r = attach_luks2_by_tpm2(cd, name, flags);
+                         r = attach_luks2_by_tpm2_via_plugin(cd, name, flags);
                          /* EAGAIN     means: no tpm2 chip found
                           * EOPNOTSUPP means: no libcryptsetup plugins support */
                          if (r == -ENXIO)
@@@ -1337,13 -1335,11 +1338,13 @@@
                          if (r == -ENOENT)
                                  return log_debug_errno(SYNTHETIC_ERRNO(EAGAIN),
                                                         "No TPM2 metadata enrolled in LUKS2 header or TPM2 support not available, falling back to traditional unlocking.");
 -                        if (!IN_SET(r, -EOPNOTSUPP, -EAGAIN))
 -                                return r;
 +                        if (!IN_SET(r, -EOPNOTSUPP, -EAGAIN)) {
 +                                log_notice_errno(r, "TPM2 operation failed, falling back to traditional unlocking: %m");
 +                                return -EAGAIN; /* Mangle error code: let's make any form of TPM2 failure non-fatal. */
 +                        }
                  }
  
-                 if (r == -EOPNOTSUPP) {
+                 if (r == -EOPNOTSUPP) { /* Plugin not available, let's process TPM2 stuff right here instead */
                          _cleanup_free_ void *blob = NULL, *policy_hash = NULL;
                          size_t blob_size, policy_hash_size;
                          bool found_some = false;