Merge pull request #188 from jimsch/New-numbers

Change to match set of one IANA assignments
cose-wg · Nov 22, 2016 · eee8588 · eee8588
2 parents e010b59 + 487c4fd
commit eee8588
Show file tree

Hide file tree

Showing 19 changed files with 72 additions and 72 deletions.
diff --git a/draft-ietf-cose-msg.xml b/draft-ietf-cose-msg.xml
@@ -389,12 +389,12 @@ values = any
       <!-- Table 1 -->
           <texttable anchor="CBOR-Tags" title="COSE Message Identification">
             <ttcol>CBOR Tag</ttcol>    <ttcol>cose-type</ttcol>        <ttcol>Data Item</ttcol>        <ttcol>Semantics</ttcol>
-            <c>TBD1</c>                 <c>cose-sign</c>                <c>COSE_Sign</c>                <c>COSE Signed Data Object</c>
-            <c>TBD7</c>                 <c>cose-sign1</c>               <c>COSE_Sign1</c>               <c>COSE Single Signer Data Object</c>
-            <c>TBD2</c>                 <c>cose-encrypt</c>           <c>COSE_Encrypt</c>           <c>COSE Encrypted Data Object</c>
-            <c>TBD3</c>                 <c>cose-encrypt0</c>           <c>COSE_Encrypt0</c>           <c>COSE Single Recipient Encrypted Data Object</c>
-            <c>TBD4</c>                 <c>cose-mac</c>                 <c>COSE_Mac</c>                 <c>COSE Mac-ed Data Object</c>
-            <c>TBD6</c>                 <c>cose-mac0</c>                <c>COSE_Mac0</c>                <c>COSE Mac w/o Recipients Object</c>
+            <c>98</c>                 <c>cose-sign</c>                <c>COSE_Sign</c>                <c>COSE Signed Data Object</c>
+            <c>18</c>                 <c>cose-sign1</c>               <c>COSE_Sign1</c>               <c>COSE Single Signer Data Object</c>
+            <c>96</c>                 <c>cose-encrypt</c>           <c>COSE_Encrypt</c>           <c>COSE Encrypted Data Object</c>
+            <c>16</c>                 <c>cose-encrypt0</c>           <c>COSE_Encrypt0</c>           <c>COSE Single Recipient Encrypted Data Object</c>
+            <c>97</c>                 <c>cose-mac</c>                 <c>COSE_Mac</c>                 <c>COSE Mac-ed Data Object</c>
+            <c>17</c>                 <c>cose-mac0</c>                <c>COSE_Mac0</c>                <c>COSE Mac w/o Recipients Object</c>
           </texttable>
 
       <!--
@@ -797,7 +797,7 @@ Generic_Headers = (
            This action needs to occur in the other locations that are similarly marked
       -->
       <figure><artwork type="CDDL"><![CDATA[
-COSE_Sign_Tagged = #6.991(COSE_Sign) ; Replace 991 with TBD1
+COSE_Sign_Tagged = #6.98(COSE_Sign)
 ]]></artwork></figure>
 
       <t>
@@ -905,7 +905,7 @@ COSE_Signature =  [
         </t>
 
         <figure><artwork type="CDDL"><![CDATA[
-COSE_Sign1_Tagged = #6.997(COSE_Sign1) ; Replace 997 with TBD7
+COSE_Sign1_Tagged = #6.18(COSE_Sign1)
 ]]></artwork></figure>
 
         <t>
@@ -1165,7 +1165,7 @@ Sig_structure = [
       </t>
 
       <figure><artwork type="CDDL"><![CDATA[
-COSE_Encrypt_Tagged = #6.992(COSE_Encrypt) ; Replace 992 with TBD2
+COSE_Encrypt_Tagged = #6.96(COSE_Encrypt)
 ]]></artwork></figure>
 
       <t>
@@ -1294,7 +1294,7 @@ COSE_recipient = [
       </t>
 
       <figure><artwork type="CDDL"><![CDATA[
-COSE_Encrypt0_Tagged = #6.993(COSE_Encrypt0) ; Replace 993 with TBD3
+COSE_Encrypt0_Tagged = #6.16(COSE_Encrypt0)
 ]]></artwork></figure>
 
 
@@ -1584,7 +1584,7 @@ Enc_structure = [
       </t>
 
       <figure><artwork type="CDDL"><![CDATA[
-COSE_Mac_Tagged = #6.994(COSE_Mac)         ; Replace 994 with TBD4
+COSE_Mac_Tagged = #6.97(COSE_Mac)
 ]]></artwork></figure>
 
       <t>
@@ -1655,7 +1655,7 @@ COSE_Mac = [
       </t>
 
       <figure><artwork type="CDDL"><![CDATA[
-COSE_Mac0_Tagged = #6.996(COSE_Mac0)    ; Replace 996 with TBD6
+COSE_Mac0_Tagged = #6.17(COSE_Mac0)
 ]]></artwork></figure>
 
       <t>

diff --git a/includes/Appendix_A.xml b/includes/Appendix_A.xml
@@ -1,7 +1,7 @@
-<t>Size of binary file is 184 bytes</t>
+<t>Size of binary file is 183 bytes</t>
 
 <figure><artwork type='CBORdiag'><![CDATA[
-992(
+96(
   [
     / protected / h'a10101' / {
         \ alg \ 1:1 \ AES-GCM 128 \

diff --git a/includes/Appendix_B_1_1.xml b/includes/Appendix_B_1_1.xml
@@ -1,7 +1,7 @@
-<t>Size of binary file is 104 bytes</t>
+<t>Size of binary file is 103 bytes</t>
 
 <figure><artwork type='CBORdiag'><![CDATA[
-991(
+98(
   [
     / protected / h'', 
     / unprotected / {}, 
@@ -14,9 +14,9 @@
         / unprotected / {
           / kid / 4:'11'
         }, 
-        / signature / h'eae868ecc176883766c5dc5ba5b8dca25dab3c2e56a5
-51ce5705b793914348e14eea4aee6e0c9f09db4ef3ddeca8f3506cd1a98a8fb64327
-be470355c9657ce0'
+        / signature / h'e2aeafd40d69d19dfe6e52077c5d7ff4e408282cbefb
+5d06cbf414af2e19d982ac45ac98b8544c908b4507de1e90b717c3d34816fe926a2b
+98f53afd2fa0f30a'
       ]
     ]
   ]

diff --git a/includes/Appendix_B_1_2.xml b/includes/Appendix_B_1_2.xml
@@ -1,7 +1,7 @@
-<t>Size of binary file is 278 bytes</t>
+<t>Size of binary file is 277 bytes</t>
 
 <figure><artwork type='CBORdiag'><![CDATA[
-991(
+98(
   [
     / protected / h'', 
     / unprotected / {}, 
@@ -14,9 +14,9 @@
         / unprotected / {
           / kid / 4:'11'
         }, 
-        / signature / h'0dc1c5e62719d8f3cce1468b7c881eee6a8088b46bf8
-36ae956dd38fe93199199951a6a5e02a24aed5edde3509748366b1c539aaef7dea34
-f2cd618fe19fe55d'
+        / signature / h'e2aeafd40d69d19dfe6e52077c5d7ff4e408282cbefb
+5d06cbf414af2e19d982ac45ac98b8544c908b4507de1e90b717c3d34816fe926a2b
+98f53afd2fa0f30a'
       ], 
       [
         / protected / h'a1013823' / {
@@ -25,11 +25,11 @@ f2cd618fe19fe55d'
         / unprotected / {
           / kid / 4:'[email protected]'
         }, 
-        / signature / h'012ce5b1dfe8b5aa6eaa09a54c58a84ad0900e4fdf27
-59ec22d1c861cccd75c7e1c4025a2da35e512fc2874d6ac8fd862d09ad07ed2deac2
-97b897561e04a8d42476017c11a4a34e26c570c9eff22c1dc84d56cdf6e03ed34bc9
-e934c5fdf676c7948d79e97dfe161730217c57748aadb364a0207cee811e9dde65ae
-37942e8a8348cc91'
+        / signature / h'00a2d28a7c2bdb1587877420f65adf7d0b9a06635dd1
+de64bb62974c863f0b160dd2163734034e6ac003b01e8705524c5c4ca479a952f024
+7ee8cb0b4fb7397ba08d009e0c8bf482270cc5771aa143966e5a469a09f613488030
+c5b07ec6d722e3835adb5b2d8c44e95ffb13877dd2582866883535de3bb03d01753f
+83ab87bb4f7a0297'
       ]
     ]
   ]

diff --git a/includes/Appendix_B_1_3.xml b/includes/Appendix_B_1_3.xml
@@ -1,7 +1,7 @@
-<t>Size of binary file is 181 bytes</t>
+<t>Size of binary file is 180 bytes</t>
 
 <figure><artwork type='CBORdiag'><![CDATA[
-991(
+98(
   [
     / protected / h'', 
     / unprotected / {
@@ -12,9 +12,9 @@
         / unprotected / {
           / kid / 4:'11'
         }, 
-        / signature / h'c9d3402485aa585cee3efc69b14496c0b00714584b26
-0f8e05764b7dbc70ae2b23b89812f5895b805f07a792f7ce77ef6d63875dc37d6a78
-ef4d175da45c9a51'
+        / signature / h'5ac05e289d5d0e1b0a7f048a5d2b643813ded50bc9e4
+9220f4f7278f85f19d4a77d655c9d3b51e805a74b099e1e085aacd97fc29d72f887e
+8802bb6650cceb2c'
       ]
     }, 
     / payload / 'This is the content.', 
@@ -26,9 +26,9 @@ ef4d175da45c9a51'
         / unprotected / {
           / kid / 4:'11'
         }, 
-        / signature / h'eae868ecc176883766c5dc5ba5b8dca25dab3c2e56a5
-51ce5705b793914348e14eea4aee6e0c9f09db4ef3ddeca8f3506cd1a98a8fb64327
-be470355c9657ce0'
+        / signature / h'e2aeafd40d69d19dfe6e52077c5d7ff4e408282cbefb
+5d06cbf414af2e19d982ac45ac98b8544c908b4507de1e90b717c3d34816fe926a2b
+98f53afd2fa0f30a'
       ]
     ]
   ]

diff --git a/includes/Appendix_B_1_4.xml b/includes/Appendix_B_1_4.xml
@@ -1,7 +1,7 @@
-<t>Size of binary file is 126 bytes</t>
+<t>Size of binary file is 125 bytes</t>
 
 <figure><artwork type='CBORdiag'><![CDATA[
-991(
+98(
   [
     / protected / h'a2687265736572766564f40281687265736572766564' / 
 {
@@ -20,9 +20,9 @@
         / unprotected / {
           / kid / 4:'11'
         }, 
-        / signature / h'eae868ecc176883766c5dc5ba5b8dca25dab3c2e56a5
-51ce5705b793914348e1ff259ead2c38d8a7d8a9c87c2ce534d762dab059773115a6
-176fa780e85b6b25'
+        / signature / h'3fc54702aa56e1b2cb20284294c9106a63f91bac658d
+69351210a031d8fc7c5ff3e4be39445b1a3e83e1510d1aca2f2e8a7c081c7645042b
+18aba9d1fad1bd9c'
       ]
     ]
   ]

diff --git a/includes/Appendix_B_2_1.xml b/includes/Appendix_B_2_1.xml
@@ -1,7 +1,7 @@
-<t>Size of binary file is 100 bytes</t>
+<t>Size of binary file is 98 bytes</t>
 
 <figure><artwork type='CBORdiag'><![CDATA[
-997(
+18(
   [
     / protected / h'a10126' / {
         \ alg \ 1:-7 \ ECDSA 256 \

diff --git a/includes/Appendix_B_3_1.xml b/includes/Appendix_B_3_1.xml
@@ -1,7 +1,7 @@
-<t>Size of binary file is 152 bytes</t>
+<t>Size of binary file is 151 bytes</t>
 
 <figure><artwork type='CBORdiag'><![CDATA[
-992(
+96(
   [
     / protected / h'a10101' / {
         \ alg \ 1:1 \ AES-GCM 128 \

diff --git a/includes/Appendix_B_3_2.xml b/includes/Appendix_B_3_2.xml
@@ -1,7 +1,7 @@
-<t>Size of binary file is 92 bytes</t>
+<t>Size of binary file is 91 bytes</t>
 
 <figure><artwork type='CBORdiag'><![CDATA[
-992(
+96(
   [
     / protected / h'a1010a' / {
         \ alg \ 1:10 \ AES-CCM-16-64-128 \

diff --git a/includes/Appendix_B_3_3.xml b/includes/Appendix_B_3_3.xml
@@ -1,7 +1,7 @@
-<t>Size of binary file is 327 bytes</t>
+<t>Size of binary file is 326 bytes</t>
 
 <figure><artwork type='CBORdiag'><![CDATA[
-992(
+96(
   [
     / protected / h'a10101' / {
         \ alg \ 1:1 \ AES-GCM 128 \
@@ -15,11 +15,11 @@
         / unprotected / {
           / kid / 4:'[email protected]'
         }, 
-        / signature / h'00aa98cbfd382610a375d046a275f30266e8d0faacb9
-069fde06e37825ae7825419c474f416ded0c8e3e7b55bff68f2a704135bdf99186f6
-6659461c8cf929cc7fb300f5e2b33c3b433655042ff719804ff73b0be3e988ecebc0
-c70ef6616996809c6eb59a918dbe0a5edb0d15137ece0aba2a0b0f68ad2631cb62f2
-ea4d7099804218b0'
+        / signature / h'00929663c8789bb28177ae28467e66377da12302d7f9
+594d2999afa5dfa531294f8896f2b6cdf1740014f4c7f1a358e3a6cf57f4ed6fb02f
+cf8f7aa989f5dfd07f0700a3a7d8f3c604ba70fa9411bd10c2591b483e1d2c31de00
+3183e434d8fba18f17a4c7e3dfa003ac1cf3d30d44d2533c4989d3ac38c38b71481c
+c3430c9d65e7ddff'
       ]
     }, 
     / ciphertext / h'7adbe2709ca818fb415f1e5df66f4e1a51053ba6d65a1a0

diff --git a/includes/Appendix_B_3_4.xml b/includes/Appendix_B_3_4.xml
@@ -1,7 +1,7 @@
-<t>Size of binary file is 174 bytes</t>
+<t>Size of binary file is 173 bytes</t>
 
 <figure><artwork type='CBORdiag'><![CDATA[
-992(
+96(
   [
     / protected / h'a10101' / {
         \ alg \ 1:1 \ AES-GCM 128 \

diff --git a/includes/Appendix_B_4_1.xml b/includes/Appendix_B_4_1.xml
@@ -1,7 +1,7 @@
-<t>Size of binary file is 54 bytes</t>
+<t>Size of binary file is 52 bytes</t>
 
 <figure><artwork type='CBORdiag'><![CDATA[
-993(
+16(
   [
     / protected / h'a1010a' / {
         \ alg \ 1:10 \ AES-CCM-16-64-128 \

diff --git a/includes/Appendix_B_4_2.xml b/includes/Appendix_B_4_2.xml
@@ -1,7 +1,7 @@
-<t>Size of binary file is 43 bytes</t>
+<t>Size of binary file is 41 bytes</t>
 
 <figure><artwork type='CBORdiag'><![CDATA[
-993(
+16(
   [
     / protected / h'a1010a' / {
         \ alg \ 1:10 \ AES-CCM-16-64-128 \

diff --git a/includes/Appendix_B_5_1.xml b/includes/Appendix_B_5_1.xml
@@ -1,7 +1,7 @@
-<t>Size of binary file is 58 bytes</t>
+<t>Size of binary file is 57 bytes</t>
 
 <figure><artwork type='CBORdiag'><![CDATA[
-994(
+97(
   [
     / protected / h'a1010f' / {
         \ alg \ 1:15 \ AES-CBC-MAC-256//64 \

diff --git a/includes/Appendix_B_5_2.xml b/includes/Appendix_B_5_2.xml
@@ -1,7 +1,7 @@
-<t>Size of binary file is 215 bytes</t>
+<t>Size of binary file is 214 bytes</t>
 
 <figure><artwork type='CBORdiag'><![CDATA[
-994(
+97(
   [
     / protected / h'a10105' / {
         \ alg \ 1:5 \ HMAC 256//256 \

diff --git a/includes/Appendix_B_5_3.xml b/includes/Appendix_B_5_3.xml
@@ -1,7 +1,7 @@
-<t>Size of binary file is 110 bytes</t>
+<t>Size of binary file is 109 bytes</t>
 
 <figure><artwork type='CBORdiag'><![CDATA[
-994(
+97(
   [
     / protected / h'a1010e' / {
         \ alg \ 1:14 \ AES-CBC-MAC-128//64 \

diff --git a/includes/Appendix_B_5_4.xml b/includes/Appendix_B_5_4.xml
@@ -1,7 +1,7 @@
-<t>Size of binary file is 310 bytes</t>
+<t>Size of binary file is 309 bytes</t>
 
 <figure><artwork type='CBORdiag'><![CDATA[
-994(
+97(
   [
     / protected / h'a10105' / {
         \ alg \ 1:5 \ HMAC 256//256 \

diff --git a/includes/Appendix_B_6_1.xml b/includes/Appendix_B_6_1.xml
@@ -1,7 +1,7 @@
-<t>Size of binary file is 39 bytes</t>
+<t>Size of binary file is 37 bytes</t>
 
 <figure><artwork type='CBORdiag'><![CDATA[
-996(
+17(
   [
     / protected / h'a1010f' / {
         \ alg \ 1:15 \ AES-CBC-MAC-256//64 \

diff --git a/includes/makefile b/includes/makefile
@@ -1,5 +1,5 @@
 Example_DIR = c:\projects\cose\examples\new\spec-examples
-DUMPER_DIR = c:\projects\cose\cose-c\build\dist\dumper\debug
+DUMPER_DIR = c:\projects\cose\cose-c\dist\dumper\debug
 
 .SUFFIXES:
 .SUFFIXES: .bin .fred .xml