From 4ad60f9b29b9548e1c65cd63a699e5f00eaaf6b1 Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 13 Oct 2022 18:46:24 +0200
Subject: [PATCH] schema: storage: Allow interleaving of 'cipher' and 'ivgen'
 elements
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 src/conf/schemas/storagecommon.rng | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/conf/schemas/storagecommon.rng b/src/conf/schemas/storagecommon.rng
index 76714c9aad..4d6e646c9a 100644
--- a/src/conf/schemas/storagecommon.rng
+++ b/src/conf/schemas/storagecommon.rng
@@ -28,12 +28,14 @@
         <interleave>
           <ref name="secret"/>
           <optional>
-            <element name="cipher">
-              <ref name="keycipher"/>
-            </element>
-            <element name="ivgen">
-              <ref name="keyivgen"/>
-            </element>
+            <interleave>
+              <element name="cipher">
+                <ref name="keycipher"/>
+              </element>
+              <element name="ivgen">
+                <ref name="keyivgen"/>
+              </element>
+            </interleave>
           </optional>
         </interleave>
       </optional>