From f2b6adbbd7e74fc1885f9dc18cf71ef1e573cf5c Mon Sep 17 00:00:00 2001
From: Phil Smart <philip.smart@jisc.ac.uk>
Date: Tue, 16 Apr 2024 15:10:32 +0100
Subject: [PATCH] Fix multi-predicate support in check_mdiop ruleset

From commit hash ukf/ukf-testbed/89589a98aea5c51a2cbd859d45f6bc08e0a00a67

See ukf/ukf-meta#416 for details
---
 mdx/_rules/check_mdiop.xsl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mdx/_rules/check_mdiop.xsl b/mdx/_rules/check_mdiop.xsl
index ee0ec366..42fb55d1 100644
--- a/mdx/_rules/check_mdiop.xsl
+++ b/mdx/_rules/check_mdiop.xsl
@@ -27,8 +27,7 @@
         Section 2.5.1: at least one representation must appear.
     -->
     <xsl:template match="md:KeyDescriptor
-        [not(ds:KeyInfo/ds:KeyValue)]
-        [not(ds:KeyInfo/ds:X509Data/ds:X509Certificate)]">
+        [not((ds:KeyInfo/ds:KeyValue) or (ds:KeyInfo/ds:X509Data/ds:X509Certificate))]">
         <xsl:call-template name="error">
             <xsl:with-param name="m">KeyDescriptor does not contain a key representation</xsl:with-param>
         </xsl:call-template>