manual generation of cbor diagnost output

Author: c2bo

draft-ietf-oauth-status-list.md

@@ -229,7 +229,7 @@ The following example illustrates the CBOR representation of the Status List:
 The following is the CBOR diagnostic output of the example above:
 
 ~~~~~~~~~~
-{::include ./examples/status_list_encoding_cbor_diag}
+{::include ./example/status_list_encoding_cbor_diag}
 ~~~~~~~~~~
 
 # Status List Token {#status-list-token}
@@ -305,7 +305,7 @@ The following is a non-normative example for a Status List Token in CWT format (
 The following is the CBOR diagnostic output of the example above:
 
 ~~~~~~~~~~
-{::include ./examples/status_list_cwt_diag}
+{::include ./example/status_list_cwt_diag}
 ~~~~~~~~~~
 
 # Referenced Token {#referenced-token}

example/status_list_cwt_diag

@@ -0,0 +1,25 @@
+d2                              # tag(18)
+  84                            #   array(4)
+    53                          #     bytes(19)
+      a20126106e7374617475736c  #       "¢\x01&\x10nstatusl"
+      6973742b637774            #       "ist+cwt"
+    a1                          #     map(1)
+      04                        #       uint(4)
+      42                        #       bytes(2)
+        3132                    #         "12"
+    58 60                       #     bytes(96)
+      a502782168747470733a2f2f  #       "¥\x02x!https://"
+      6578616d706c652e636f6d2f  #       "example.com/"
+      7374617475736c697374732f  #       "statuslists/"
+      31017368747470733a2f2f65  #       "1\x01shttps://e"
+      78616d706c652e636f6d061a  #       "xample.com\x06\x1a"
+      648c3fca041a8898c3ca19ff  #       "d\x8c?Ê\x04\x1a\x88\x98ÃÊ\x19ÿ"
+      fe56a2646269747301636c73  #       "þV¢dbits\x01cls"
+      744a78dadbb918000217015d  #       "tJxÚÛ¹\x18\x00\x02\x17\x01]"
+    58 40                       #     bytes(64)
+      3fd60a6d10eb4b4131f1f6c1  #       "?Ö\x0am\x10ëKA1ñöÁ"
+      2fb365ae27b969e8e8df0b4f  #       "/³e®'¹ièèß\x0bO"
+      4029815b679cb1051c1c9eb3  #       "@)\x81[g\x9c±\x05\x1c\x1c\x9e³"
+      6aa72f6f17bcfdb5ed443bdf  #       "j§/o\x17¼ýµíD;ß"
+      c2339568ab42949169b413e7  #       "Â3\x95h«B\x94\x91i´\x13ç"
+      02ae1e6a                  #       "\x02®\x1ej"

example/status_list_encoding2_cbor_diag

@@ -0,0 +1,8 @@
+a2                              # map(2)
+  64                            #   string(4)
+    62697473                    #     "bits"
+  02                            #   uint(2)
+  63                            #   string(3)
+    6c7374                      #     "lst"
+  4b                            #   bytes(11)
+    78da3be9f2130003df0207      #     "xÚ;éò\x13\x00\x03ß\x02\x07"

example/status_list_encoding_cbor_diag

@@ -0,0 +1,8 @@
+a2                              # map(2)
+  64                            #   string(4)
+    62697473                    #     "bits"
+  01                            #   uint(1)
+  63                            #   string(3)
+    6c7374                      #     "lst"
+  4a                            #   bytes(10)
+    78dadbb918000217015d        #     "xÚÛ¹\x18\x00\x02\x17\x01]"

src/status_token.py

@@ -1,5 +1,5 @@
 from jwcrypto import jwk, jwt
-from cwt import COSE, COSEKey, CWTClaims
+from cwt import COSE, COSEKey, CWTClaims, COSEHeaders
 from status_list import StatusList
 from datetime import datetime
 from typing import Dict
@@ -139,8 +139,8 @@ def buildCWT(
             unprotected_header = {}
 
         if self._key.key_id:
-            unprotected_header[4] = self._key.key_id
-        protected_header[1] = self._alg
+            unprotected_header[COSEHeaders.KID] = self._key.key_id.encode('utf-8')
+        protected_header[COSEHeaders.ALG] = self._alg
         protected_header[16] = STATUS_LIST_TYP_CWT
 
         key = COSEKey.from_jwk(self._key)