From e08444fae7acb27974a4ef1fc7a132bd5d880eb5 Mon Sep 17 00:00:00 2001
From: brent s <bts@square-r00t.net>
Date: Tue, 10 Dec 2019 11:07:55 -0500
Subject: [PATCH] minor tweaks here

---
 schema/lib/types/std.xsd | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/schema/lib/types/std.xsd b/schema/lib/types/std.xsd
index 1e2f485..6227764 100644
--- a/schema/lib/types/std.xsd
+++ b/schema/lib/types/std.xsd
@@ -62,9 +62,10 @@
     </xs:simpleType>
 
     <xs:complexType name="t_std_gpg_keys">
-        <xs:sequence minOccurs="1" maxOccurs="unbounded">
-            <xs:element name="keyID" minOccurs="1" maxOccurs="unbounded" type="t_std_gpg_key_id"/>
-        </xs:sequence>
+        <xs:choice minOccurs="1" maxOccurs="unbounded">
+            <xs:element name="keyID" minOccurs="0" maxOccurs="unbounded" type="t_std_gpg_key_id"/>
+            <xs:element name="keyFile" minOccurs="0" maxOccurs="unbounded" type="t_std_uri"/>
+        </xs:choice>
     </xs:complexType>
     
     <xs:simpleType name="t_std_gpg_key_id">
@@ -100,14 +101,6 @@
     <xs:complexType name="t_std_verifyfile">
         <xs:choice minOccurs="1" maxOccurs="2">
             <xs:element name="gpg" minOccurs="0" maxOccurs="1" type="t_std_verify_gpg">
-                <xs:unique name="uniq_gpg_sig">
-                    <xs:selector xpath="signature"/>
-                    <xs:field xpath="."/>
-                </xs:unique>
-                <xs:unique name="uniq_gpg_sigfile">
-                    <xs:selector xpath="signatureFile"/>
-                    <xs:field xpath="."/>
-                </xs:unique>
             </xs:element>
             <xs:element name="hash" minOccurs="0" maxOccurs="1" type="t_std_verify_cksum"/>
         </xs:choice>
@@ -121,10 +114,24 @@
     </xs:complexType>
 
     <xs:complexType name="t_std_verify_gpg">
-        <xs:choice minOccurs="1" maxOccurs="1">
-            <xs:element name="signature" minOccurs="0" maxOccurs="unbounded" type="t_std_gpg_sig"/>
-            <xs:element name="signatureFile" minOccurs="0" maxOccurs="unbounded" type="t_std_uri"/>
-            <xs:element name="gpgKeyIDs" minOccurs="1" maxOccurs="1" type="t_std_gpg_keys">
+        <xs:choice minOccurs="1" maxOccurs="unbounded">
+            <xs:element name="sigs">
+                <xs:complexType>
+                    <xs:choice minOccurs="1" maxOccurs="unbounded">
+                        <xs:element name="signature" minOccurs="0" maxOccurs="unbounded" type="t_std_gpg_sig"/>
+                        <xs:element name="signatureFile" minOccurs="0" maxOccurs="unbounded" type="t_std_uri"/>
+                    </xs:choice>
+                </xs:complexType>
+                <xs:unique name="uniq_gpg_sig">
+                    <xs:selector xpath="signature"/>
+                    <xs:field xpath="."/>
+                </xs:unique>
+                <xs:unique name="uniq_gpg_sigfile">
+                    <xs:selector xpath="signatureFile"/>
+                    <xs:field xpath="."/>
+                </xs:unique>
+            </xs:element>
+            <xs:element name="keys" minOccurs="1" maxOccurs="1" type="t_std_gpg_keys">
                 <xs:unique name="uniq_key_id">
                     <xs:selector xpath="keyID"/>
                     <xs:field xpath="."/>