83 lines
2.7 KiB
Diff
83 lines
2.7 KiB
Diff
|
From d5da1c6d6ae5a98806b42404143c82019f97314e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Dan Streetman <ddstreet@ieee.org>
|
||
|
|
Date: Mon, 21 Aug 2023 10:34:57 -0400
|
||
|
|
Subject: [PATCH] tpm2: change *alg_to_* functions to use switch()
|
||
|
|
|
||
|
|
(cherry picked from commit 7354a7ccd4aa27bc8c94280c82d0ae54fd947c2a)
|
||
|
|
|
||
|
|
Related: RHEL-16182
|
||
|
|
---
|
||
|
|
src/shared/tpm2-util.c | 39 ++++++++++++++++++++++++---------------
|
||
|
|
1 file changed, 24 insertions(+), 15 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/shared/tpm2-util.c b/src/shared/tpm2-util.c
|
||
|
|
index e4565e4034..491e8885d3 100644
|
||
|
|
--- a/src/shared/tpm2-util.c
|
||
|
|
+++ b/src/shared/tpm2-util.c
|
||
|
|
@@ -4588,28 +4588,34 @@ int tpm2_parse_luks2_json(
|
||
|
|
}
|
||
|
|
|
||
|
|
int tpm2_hash_alg_to_size(uint16_t alg) {
|
||
|
|
- if (alg == TPM2_ALG_SHA1)
|
||
|
|
+ switch (alg) {
|
||
|
|
+ case TPM2_ALG_SHA1:
|
||
|
|
return 20;
|
||
|
|
- if (alg == TPM2_ALG_SHA256)
|
||
|
|
+ case TPM2_ALG_SHA256:
|
||
|
|
return 32;
|
||
|
|
- if (alg == TPM2_ALG_SHA384)
|
||
|
|
+ case TPM2_ALG_SHA384:
|
||
|
|
return 48;
|
||
|
|
- if (alg == TPM2_ALG_SHA512)
|
||
|
|
+ case TPM2_ALG_SHA512:
|
||
|
|
return 64;
|
||
|
|
- return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), "Unknown hash algorithm id 0x%" PRIx16, alg);
|
||
|
|
+ default:
|
||
|
|
+ return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), "Unknown hash algorithm id 0x%" PRIx16, alg);
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
|
||
|
|
const char *tpm2_hash_alg_to_string(uint16_t alg) {
|
||
|
|
- if (alg == TPM2_ALG_SHA1)
|
||
|
|
+ switch (alg) {
|
||
|
|
+ case TPM2_ALG_SHA1:
|
||
|
|
return "sha1";
|
||
|
|
- if (alg == TPM2_ALG_SHA256)
|
||
|
|
+ case TPM2_ALG_SHA256:
|
||
|
|
return "sha256";
|
||
|
|
- if (alg == TPM2_ALG_SHA384)
|
||
|
|
+ case TPM2_ALG_SHA384:
|
||
|
|
return "sha384";
|
||
|
|
- if (alg == TPM2_ALG_SHA512)
|
||
|
|
+ case TPM2_ALG_SHA512:
|
||
|
|
return "sha512";
|
||
|
|
- log_debug("Unknown hash algorithm id 0x%" PRIx16, alg);
|
||
|
|
- return NULL;
|
||
|
|
+ default:
|
||
|
|
+ log_debug("Unknown hash algorithm id 0x%" PRIx16, alg);
|
||
|
|
+ return NULL;
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
|
||
|
|
int tpm2_hash_alg_from_string(const char *alg) {
|
||
|
|
@@ -4625,12 +4631,15 @@ int tpm2_hash_alg_from_string(const char *alg) {
|
||
|
|
}
|
||
|
|
|
||
|
|
const char *tpm2_asym_alg_to_string(uint16_t alg) {
|
||
|
|
- if (alg == TPM2_ALG_ECC)
|
||
|
|
+ switch (alg) {
|
||
|
|
+ case TPM2_ALG_ECC:
|
||
|
|
return "ecc";
|
||
|
|
- if (alg == TPM2_ALG_RSA)
|
||
|
|
+ case TPM2_ALG_RSA:
|
||
|
|
return "rsa";
|
||
|
|
- log_debug("Unknown asymmetric algorithm id 0x%" PRIx16, alg);
|
||
|
|
- return NULL;
|
||
|
|
+ default:
|
||
|
|
+ log_debug("Unknown asymmetric algorithm id 0x%" PRIx16, alg);
|
||
|
|
+ return NULL;
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
|
||
|
|
int tpm2_asym_alg_from_string(const char *alg) {
|