From 1759ab02b5087c2d6d313f8e0c960c9140f24b18 Mon Sep 17 00:00:00 2001
From: Michael Jones <michael_b_jones@hotmail.com>
Date: Sat, 30 Nov 2024 12:24:13 -0800
Subject: [PATCH 1/3] Allow multiple Trust Anchor values in resolve requests

---
 openid-federation-1_0.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/openid-federation-1_0.xml b/openid-federation-1_0.xml
index cb9c35b..e225268 100644
--- a/openid-federation-1_0.xml
+++ b/openid-federation-1_0.xml
@@ -4145,11 +4145,18 @@ Content-Type: application/json
                 REQUIRED. The Entity Identifier of the
                 Entity whose resolved data is requested.
               </t>
-              <t hangText="anchor">
+              <t hangText="anchor"> <!-- Note: Change "anchor" to "trust_anchor" below after #154 is merged -->
                 <vspace/>
                 REQUIRED. The Trust Anchor that the resolve endpoint
                 MUST use when resolving the metadata.
 		The value is an Entity identifier.
+		<vspace blankLine="1"/>
+		The <spanx style="verb">anchor</spanx> request parameter
+		MAY occur multiple times, in which case,
+		the resolver may return a successful resolve response
+		using any one of the Trust Anchor values provided
+		and the <spanx style="verb">trust_chain</spanx> claim
+		MUST be included in the resolve response JWT.
               </t>
               <t hangText="type">
                 <vspace/>
@@ -9976,6 +9983,9 @@ Host: op.umu.se
       <t>
 	-41
 	<list style="symbols">
+	  <t>
+	    Fixed #130: Allow multiple Trust Anchor values to be passed in resolve requests.
+	  </t>
 	  <t>
 	    Fixed #136: Defined additional error codes and rationalized naming.
 	    Renamed <spanx style="verb">trust_chain_validation_failed</spanx>

From 3a318713f4a7e0871211b438a19aac3758138711 Mon Sep 17 00:00:00 2001
From: Michael Jones <michael_b_jones@hotmail.com>
Date: Sat, 30 Nov 2024 13:03:54 -0800
Subject: [PATCH 2/3] Require trust_chain claim in resolve response

---
 openid-federation-1_0.xml | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/openid-federation-1_0.xml b/openid-federation-1_0.xml
index e225268..35bf8e5 100644
--- a/openid-federation-1_0.xml
+++ b/openid-federation-1_0.xml
@@ -4153,10 +4153,8 @@ Content-Type: application/json
 		<vspace blankLine="1"/>
 		The <spanx style="verb">anchor</spanx> request parameter
 		MAY occur multiple times, in which case,
-		the resolver may return a successful resolve response
-		using any one of the Trust Anchor values provided
-		and the <spanx style="verb">trust_chain</spanx> claim
-		MUST be included in the resolve response JWT.
+		the resolver MAY return a successful resolve response
+		using any one of the Trust Anchor values provided.
               </t>
               <t hangText="type">
                 <vspace/>
@@ -4217,7 +4215,7 @@ Host: openid.sunet.se
 	    with its value being the Key ID of the signing key used.
 	  </t>
           <t>
-            The resolve response JWT MAY return the Trust Chain
+            The resolve response JWT MUST return the Trust Chain
 	    from the subject to the Trust Anchor
 	    in its <spanx style="verb">trust_chain</spanx> parameter,
             sorted as shown in <xref target="trust_chain"/>.
@@ -4286,6 +4284,13 @@ Host: openid.sunet.se
                 and expressed in the <spanx style="verb">metadata</spanx> format
                 defined in <xref target="entity-statement"/>.
               </t>
+              <t hangText="trust_chain">
+                <vspace/>
+                REQUIRED. Array containing the sequence of Entity Statements
+                that compose the Trust Chain, starting with the subject and
+                ending with the selected Trust Anchor,
+                sorted as shown in <xref target="trust_chain"/>.
+              </t>
               <t hangText="trust_marks">
                 <vspace/>
                 OPTIONAL. Array of objects, each representing a Trust Mark,
@@ -4294,14 +4299,6 @@ Host: openid.sunet.se
                 issuers trusted by the Trust Anchor to issue such Trust Marks
 		MAY appear in the resolver response.
               </t>
-              <t hangText="trust_chain">
-                <vspace/>
-                OPTIONAL. Array containing the sequence of Entity Statements
-                that compose
-                the Trust Chain, starting with the subject and
-                ending with the selected Trust Anchor,
-                sorted as shown in <xref target="trust_chain"/>.
-              </t>
             </list>
           </t>
 
@@ -9985,6 +9982,7 @@ Host: op.umu.se
 	<list style="symbols">
 	  <t>
 	    Fixed #130: Allow multiple Trust Anchor values to be passed in resolve requests.
+	    Require <spanx style="verb">trust_chain</spanx> claim in resolve response.
 	  </t>
 	  <t>
 	    Fixed #136: Defined additional error codes and rationalized naming.

From e262dc6fc4c5a30476623cd59fb2d6761d321272 Mon Sep 17 00:00:00 2001
From: Michael Jones <michael_b_jones@hotmail.com>
Date: Wed, 18 Dec 2024 15:33:54 -0800
Subject: [PATCH 3/3] Apply Roland's suggestion

---
 openid-federation-1_0.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openid-federation-1_0.xml b/openid-federation-1_0.xml
index 99c0655..35809b1 100644
--- a/openid-federation-1_0.xml
+++ b/openid-federation-1_0.xml
@@ -4166,7 +4166,7 @@ Content-Type: application/json
 		The <spanx style="verb">trust_anchor</spanx> request parameter
 		MAY occur multiple times, in which case,
 		the resolver MAY return a successful resolve response
-		using any one of the Trust Anchor values provided.
+		using any of the Trust Anchor values provided.
               </t>
               <t hangText="entity_type">
                 <vspace/>