Rebuilt TXT and HTML

rohe · Jan 11, 2019 · 3a6c54a · 3a6c54a
1 parent 9867ca8
commit 3a6c54a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 18 deletions.
diff --git a/draft/oidcfed.hf.html b/draft/oidcfed.hf.html
@@ -707,10 +707,12 @@ <h1 id="rfc.section.1.2">
 <dl>
 <dt>Entity</dt>
 <dd style="margin-left: 8">Something that has a separate and distinct existence and that can be identified in a context.  </dd>
-<dt>Leaf Entity</dt>
-<dd style="margin-left: 8">An entity defined by a certain protocol. E.g. OpenID Provider/Relying Party.  </dd>
 <dt>Entity statement</dt>
 <dd style="margin-left: 8">An entity statement is always a signed JWT. An entity statement is issued by an entity, and concerns a subject entity and leaf entities.  </dd>
+<dt>Intermediate entity</dt>
+<dd style="margin-left: 8">A entity that issues an entity statement that appears somewhere in between those issued by the trust anchor and the leaf entity in a trust chain.  </dd>
+<dt>Leaf Entity</dt>
+<dd style="margin-left: 8">An entity defined by a certain protocol. E.g. OpenID Provider/Relying Party.  </dd>
 <dt>Trust Anchor</dt>
 <dd style="margin-left: 8">An entity that represents a trusted third party.  </dd>
 <dt>Trust Chain</dt>

diff --git a/draft/oidcfed.hf.txt b/draft/oidcfed.hf.txt
@@ -188,13 +188,17 @@ Hedberg, et al.           Expires July 13, 2019                 [Page 3]
    Entity  Something that has a separate and distinct existence and that
       can be identified in a context.
 
-   Leaf Entity  An entity defined by a certain protocol.  E.g.  OpenID
-      Provider/Relying Party.
-
    Entity statement  An entity statement is always a signed JWT.  An
       entity statement is issued by an entity, and concerns a subject
       entity and leaf entities.
 
+   Intermediate entity  A entity that issues an entity statement that
+      appears somewhere in between those issued by the trust anchor and
+      the leaf entity in a trust chain.
+
+   Leaf Entity  An entity defined by a certain protocol.  E.g.  OpenID
+      Provider/Relying Party.
+
    Trust Anchor  An entity that represents a trusted third party.
 
    Trust Chain  A sequence of entity statements that represents a chain
@@ -214,10 +218,6 @@ Hedberg, et al.           Expires July 13, 2019                 [Page 3]
       statement.  If the "iss" and the "sub" are identical, the issuer
       is making a statement about itself.
 
-   sub  REQUIRED.  The entity identifier of the subject
-
-   iat  REQUIRED.  The time the statement was issued.  Its value is a
-      JSON number representing the number of seconds from
 
 
 
@@ -226,6 +226,10 @@ Hedberg, et al.           Expires July 13, 2019                 [Page 4]
                         OpenID Connect Federation           January 2019
 
 
+   sub  REQUIRED.  The entity identifier of the subject
+
+   iat  REQUIRED.  The time the statement was issued.  Its value is a
+      JSON number representing the number of seconds from
       1970-01-01T0:0:0Z as measured in UTC until the date/time.  See RFC
       3339 [RFC3339]for details regarding date/times in general and UTC
       in particular.
@@ -269,10 +273,6 @@ Hedberg, et al.           Expires July 13, 2019                 [Page 4]
 
       If present and empty it blocks flattening of any metadata type.
 
-   sub_is_leaf  OPTIONAL.  Boolean value that indicates whether the
-      subject is considered a leaf entity.  A leaf entity is not trusted
-      to issue statements about other entities then itself.  If this
-      property is left out, it is considered to be "false".
 
 
 
@@ -282,6 +282,11 @@ Hedberg, et al.           Expires July 13, 2019                 [Page 5]
                         OpenID Connect Federation           January 2019
 
 
+   sub_is_leaf  OPTIONAL.  Boolean value that indicates whether the
+      subject is considered a leaf entity.  A leaf entity is not trusted
+      to issue statements about other entities then itself.  If this
+      property is left out, it is considered to be "false".
+
    sub_meta  OPTIONAL.  If present, a JSON object containing one or more
       of the properties listed below.  This is metadata describing the
       subject of this entity statement.  The metadata included in the
@@ -322,11 +327,6 @@ Hedberg, et al.           Expires July 13, 2019                 [Page 5]
 
 
 
-
-
-
-
-