checking in some changes

schema/lib/types/gpg.xsd

@@ -17,6 +17,12 @@
         </xs:restriction>
     </xs:simpleType>
 
+    <xs:simpleType name="t_gpg_safe_key_id">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="\s*(0x)?[0-9A-Fa-f]{40}\s*"/><!-- Full key ID -->
+        </xs:restriction>
+    </xs:simpleType>
+
     <xs:simpleType name="t_gpg_key_id_search">
         <xs:union memberTypes="t_gpg_key_id t_net_email_addr"/>
     </xs:simpleType>

schema/lib/types/vaultpass.xsd

@@ -19,7 +19,7 @@
                 </xs:complexType>
             </xs:element>
             <!-- We don't support Boto3 because it requires an external session object. -->
-            <!-- We won't support EC2 Metadata auth unless requested because it's HELL complex. -->
+            <!-- We won't support EC2 Metadata auth unless requested because it's HELLA complex. -->
             <!-- TODO -->
             <!--
             <xs:element name="aws">
@@ -72,7 +72,7 @@
                     </xs:all>
                 </xs:complexType>
             </xs:element>
-            <!-- No longer supported upstream by HashiCorp. -->
+            <!-- No longer supported upstream by HashiCorp. At least, not in community? And I don't have an Enterprise handy. -->
             <!--
             <xs:element name="mfa"/>
             -->
@@ -137,6 +137,7 @@
         <xs:simpleContent>
             <xs:extension base="t_unix_filepath">
                 <xs:attribute name="gpgHome" type="t_unix_filepath" use="optional"/>
+                <xs:attribute name="gpgKeyId" type="t_gpg_safe_key_id" use="optional"/>
             </xs:extension>
         </xs:simpleContent>
     </xs:complexType>