From ec10654c350f8a316ebfb43c6e1ed39ea4cd0445 Mon Sep 17 00:00:00 2001
From: Jakob Naucke <naucke@linux.ibm.com>
Date: Wed, 15 Jan 2025 16:46:01 +0100
Subject: [PATCH] rust/pvimg: Make PCKMO plaintext control flags a constant
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The PCKMO plaintext control flags are used in several places as is
and are also to be used in an upcoming unit test. Make them a constant.

Reviewed-by: Steffen Eiden <seiden@linux.ibm.com>
Reviewed-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Reviewed-by: Hendrik Brueckner <brueckner@linux.ibm.com>
Signed-off-by: Jakob Naucke <naucke@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
---
 rust/pvimg/src/cmd/create.rs            | 14 ++++----------
 rust/pvimg/src/pv_utils/se_hdr/flags.rs |  9 ++++-----
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/rust/pvimg/src/cmd/create.rs b/rust/pvimg/src/cmd/create.rs
index c9d39745..ceeb90c2 100644
--- a/rust/pvimg/src/cmd/create.rs
+++ b/rust/pvimg/src/cmd/create.rs
@@ -58,16 +58,10 @@ fn parse_flags(
             .and(Some(PcfV1::all_enabled([PcfV1::AllowDumping]))),
         lf.disable_pckmo
             .filter(|x| *x)
-            .and(Some(PcfV1::all_disabled([
-                PcfV1::PckmoAes,
-                PcfV1::PckmoDeaTdea,
-                PcfV1::PckmoEcc,
-            ]))),
-        lf.enable_pckmo.filter(|x| *x).and(Some(PcfV1::all_enabled([
-            PcfV1::PckmoAes,
-            PcfV1::PckmoDeaTdea,
-            PcfV1::PckmoEcc,
-        ]))),
+            .and(Some(PcfV1::all_disabled(PlaintextControlFlagsV1::PCKMO))),
+        lf.enable_pckmo
+            .filter(|x| *x)
+            .and(Some(PcfV1::all_enabled(PlaintextControlFlagsV1::PCKMO))),
         lf.disable_pckmo_hmac
             .filter(|x| *x)
             .and(Some(PcfV1::all_disabled([PcfV1::PckmoHmac]))),
diff --git a/rust/pvimg/src/pv_utils/se_hdr/flags.rs b/rust/pvimg/src/pv_utils/se_hdr/flags.rs
index 0b5607bf..fdb6b5b8 100644
--- a/rust/pvimg/src/pv_utils/se_hdr/flags.rs
+++ b/rust/pvimg/src/pv_utils/se_hdr/flags.rs
@@ -169,14 +169,13 @@ pub enum PcfV1 {
     BackupTargetKeys = 62,
 }
 pub type PlaintextControlFlagsV1 = ControlFlags<PcfV1>;
+impl PlaintextControlFlagsV1 {
+    pub const PCKMO: [PcfV1; 3] = [PcfV1::PckmoAes, PcfV1::PckmoDeaTdea, PcfV1::PckmoEcc];
+}
 
 impl Default for PlaintextControlFlagsV1 {
     fn default() -> Self {
-        Self::from_flags(PcfV1::all_enabled([
-            PcfV1::PckmoAes,
-            PcfV1::PckmoDeaTdea,
-            PcfV1::PckmoEcc,
-        ]))
+        Self::from_flags(PcfV1::all_enabled(PlaintextControlFlagsV1::PCKMO))
     }
 }