gpt: add partition_designator_is_verity() helper

And rework partition_designator_is_verity_sig() to be based on
partition_verity_sig_to_data(), so that we don't have to maintain two
lists of verity sig partition types.

diff --git a/src/shared/gpt.h b/src/shared/gpt.h
index 9e5ace35a45c32d9d806db96c4d1cecd0e269021..3261d0001b2fa4a33226a0a090f2395269870808 100644 (file)
--- a/src/shared/gpt.h
+++ b/src/shared/gpt.h
@@ -31,15 +31,19 @@ typedef enum PartitionDesignator {
 
 bool partition_designator_is_versioned(PartitionDesignator d) _const_;
 
-static inline bool partition_designator_is_verity_sig(PartitionDesignator d) {
-        return IN_SET(d, PARTITION_ROOT_VERITY_SIG, PARTITION_USR_VERITY_SIG);
-}
-
 PartitionDesignator partition_verity_of(PartitionDesignator p) _const_;
 PartitionDesignator partition_verity_sig_of(PartitionDesignator p) _const_;
 PartitionDesignator partition_verity_to_data(PartitionDesignator d) _const_;
 PartitionDesignator partition_verity_sig_to_data(PartitionDesignator d) _const_;
 
+static inline bool partition_designator_is_verity(PartitionDesignator d) {
+        return partition_verity_to_data(d) >= 0;
+}
+
+static inline bool partition_designator_is_verity_sig(PartitionDesignator d) {
+        return partition_verity_sig_to_data(d) >= 0;
+}
+
 const char* partition_designator_to_string(PartitionDesignator d) _const_;
 PartitionDesignator partition_designator_from_string(const char *name) _pure_;