Merge branch 'main' into 309-asn1-module

Author: paulbastian

.github/workflows/archive.yml

@@ -20,7 +20,7 @@ jobs:
       contents: write
     steps:
     - name: "Checkout"
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     # Note: No caching for this build!
 
@@ -41,4 +41,5 @@ jobs:
     - name: "Save Archive"
       uses: actions/upload-artifact@v4
       with:
+        name: archive
         path: archive.json

.github/workflows/ghpages.yml

@@ -22,7 +22,7 @@ jobs:
       contents: write
     steps:
     - name: "Checkout"
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     - name: "Setup"
       id: setup
@@ -62,6 +62,7 @@ jobs:
     - name: "Archive Built Drafts"
       uses: actions/upload-artifact@v4
       with:
+        name: drafts
         path: |
           draft-*.html
           draft-*.txt

.github/workflows/publish.yml

@@ -17,7 +17,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: "Checkout"
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
+      with:
+        # Needed for tracing file history for replacement status
+        fetch-depth: 0
+        fetch-tags: true
 
     # See https://github.com/actions/checkout/issues/290
     - name: "Get Tag Annotations"
@@ -61,4 +65,5 @@ jobs:
     - name: "Archive Submitted Drafts"
       uses: actions/upload-artifact@v4
       with:
+        name: published
         path: "versioned/draft-*-[0-9][0-9].*"

.github/workflows/update.yml

@@ -22,9 +22,11 @@ jobs:
   build:
     name: "Update Files"
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     steps:
     - name: "Checkout"
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     - name: "Update Generated Files"
       uses: martinthomson/i-d-template@v1

.gitignore

@@ -1,26 +1,26 @@
-*~
-/*-[0-9][0-9].xml
-archive.json
-draft-ietf-oauth-status-list.xml
-/examples/
-Gemfile.lock
-/.gems/
+.tags
 *.html
-/.idea/
-/lib
-/.*.mk
-/node_modules/
-package-lock.json
 *.pdf
 *.redxml
-/.refcache
-report.xml
-/src/__pycache__/
 *.swp
-.tags
 *.txt
 *.upload
+*~
+/.*.mk
+/.gems/
+/.idea/
+/.refcache
 /.venv/
-/versioned/
 /.vscode/
+/*-[0-9][0-9].xml
+/examples/
+/lib
+/node_modules/
+/src/__pycache__/
+/versioned/
+archive.json
+draft-ietf-oauth-status-list.xml
+Gemfile.lock
+package-lock.json
+report.xml
 !requirements.txt

draft-ietf-oauth-status-list.md

@@ -361,13 +361,13 @@ This section defines the data structure for a JSON-encoded Status List:
 The following example illustrates the JSON representation of the Status List with `bits` 1 from the example above:
 
 ~~~~~~~~~~
-{::include ./examples/status_list_encoding_json}
+{::include examples/status_list_encoding_json}
 ~~~~~~~~~~
 
 The following example illustrates the JSON representation of the Status List with `bits` 2 from the example above:
 
 ~~~~~~~~~~
-{::include ./examples/status_list_encoding2_json}
+{::include examples/status_list_encoding2_json}
 ~~~~~~~~~~
 
 See section [](#test-vectors) for more test vectors.
@@ -394,13 +394,13 @@ StatusList = {
 The following example illustrates the CBOR representation of the Status List in Hex:
 
 ~~~~~~~~~~
-{::include ./examples/status_list_encoding_cbor}
+{::include examples/status_list_encoding_cbor}
 ~~~~~~~~~~
 
 The following is the CBOR Annotated Hex output of the example above:
 
 ~~~~~~~~~~
-{::include ./examples/status_list_encoding_cbor_diag}
+{::include examples/status_list_encoding_cbor_diag}
 ~~~~~~~~~~
 
 See section [](#test-vectors) for more test vectors.
@@ -440,7 +440,7 @@ The following additional rules apply:
 The following is a non-normative example of a Status List Token in JWT format:
 
 ~~~~~~~~~~
-{::include ./examples/status_list_jwt}
+{::include examples/status_list_jwt}
 ~~~~~~~~~~
 
 ## Status List Token in CWT Format {#status-list-token-cwt}
@@ -472,13 +472,13 @@ The following additional rules apply:
 The following is a non-normative example of a Status List Token in CWT format in Hex:
 
 ~~~~~~~~~~
-{::include ./examples/status_list_cwt}
+{::include examples/status_list_cwt}
 ~~~~~~~~~~
 
 The following is the CBOR Annotated Hex output of the example above:
 
 ~~~~~~~~~~
-{::include ./examples/status_list_cwt_diag}
+{::include examples/status_list_cwt_diag}
 ~~~~~~~~~~
 
 # Referenced Token {#referenced-token}
@@ -580,13 +580,13 @@ Application of additional restrictions and policies are at the discretion of the
 The following is a non-normative example of a Referenced Token in CWT format in Hex:
 
 ~~~~~~~~~~
-{::include ./examples/referenced_token_cwt}
+{::include examples/referenced_token_cwt}
 ~~~~~~~~~~
 
 The following is the CBOR Annotated Hex output of the example above:
 
 ~~~~~~~~~~
-{::include ./examples/referenced_token_cwt_diag}
+{::include examples/referenced_token_cwt_diag}
 ~~~~~~~~~~
 
 ISO mdoc {{ISO.mdoc}} may utilize the Status List mechanism by introducing the `status` parameter in the Mobile Security Object (MSO) as specified in Section 9.1.2. The `status` parameter uses the same encoding as a CWT as defined in {{referenced-token-cose}}.
@@ -783,7 +783,7 @@ Accept: application/statuslist+jwt
 HTTP/1.1 200 OK
 Content-Type: application/statuslist+jwt
 
-{::include ./examples/status_list_jwt_raw}
+{::include examples/status_list_jwt_raw}
 ~~~
 
 ## Status List Response {#status-list-response}
@@ -850,7 +850,7 @@ The following is a non-normative example of a response for the above Request:
 HTTP/1.1 200 OK
 Content-Type: application/statuslist+jwt
 
-{::include ./examples/status_list_jwt_raw}
+{::include examples/status_list_jwt_raw}
 ~~~
 
 # Status List Aggregation {#aggregation}
@@ -1616,13 +1616,13 @@ status[1000345]=1
 JSON encoding:
 
 ~~~~~~~~~~
-{::include ./examples/status_list_encoding1_long_json}
+{::include examples/status_list_encoding1_long_json}
 ~~~~~~~~~~
 
 CBOR encoding:
 
 ~~~~~~~~~~
-{::include ./examples/status_list_encoding1_long_cbor}
+{::include examples/status_list_encoding1_long_cbor}
 ~~~~~~~~~~
 
 ## 2 bit Status List
@@ -1647,13 +1647,13 @@ status[1000345]=3
 JSON encoding:
 
 ~~~~~~~~~~
-{::include ./examples/status_list_encoding2_long_json}
+{::include examples/status_list_encoding2_long_json}
 ~~~~~~~~~~
 
 CBOR encoding:
 
 ~~~~~~~~~~
-{::include ./examples/status_list_encoding2_long_cbor}
+{::include examples/status_list_encoding2_long_cbor}
 ~~~~~~~~~~
 
 ## 4 bit Status List
@@ -1682,13 +1682,13 @@ status[1030205]=15
 JSON encoding:
 
 ~~~~~~~~~~
-{::include ./examples/status_list_encoding4_json}
+{::include examples/status_list_encoding4_json}
 ~~~~~~~~~~
 
 CBOR encoding:
 
 ~~~~~~~~~~
-{::include ./examples/status_list_encoding4_cbor}
+{::include examples/status_list_encoding4_cbor}
 ~~~~~~~~~~
 
 ## 8 bit Status List
@@ -1958,13 +1958,13 @@ status[19535] = 255
 JSON encoding:
 
 ~~~~~~~~~~
-{::include ./examples/status_list_encoding8_json}
+{::include examples/status_list_encoding8_json}
 ~~~~~~~~~~
 
 CBOR encoding:
 
 ~~~~~~~~~~
-{::include ./examples/status_list_encoding8_cbor}
+{::include examples/status_list_encoding8_cbor}
 ~~~~~~~~~~