Add the CBOR Object Signing and Encryption tags (RFC 8152)

This also adds #defines for the CborXxxTag identifiers so user code can

Signed-off-by: Thiago Macieira <[email protected]>

Author: thiagomacieira

src/cbor.h

@@ -103,6 +103,9 @@ typedef enum CborKnownTags {
     CborNegativeBignumTag          = 3,
     CborDecimalTag                 = 4,
     CborBigfloatTag                = 5,
+    CborCOSE_Encrypt0Tag           = 16,
+    CborCOSE_Mac0Tag               = 17,
+    CborCOSE_Sign1Tag              = 18,
     CborExpectedBase64urlTag       = 21,
     CborExpectedBase64Tag          = 22,
     CborExpectedBase16Tag          = 23,
@@ -112,9 +115,36 @@ typedef enum CborKnownTags {
     CborBase64Tag                  = 34,
     CborRegularExpressionTag       = 35,
     CborMimeMessageTag             = 36,
+    CborCOSE_EncryptTag            = 96,
+    CborCOSE_MacTag                = 97,
+    CborCOSE_SignTag               = 98,
     CborSignatureTag               = 55799
 } CborKnownTags;
 
+/* #define the constants so we can check with #ifdef */
+#define CborDateTimeStringTag CborDateTimeStringTag
+#define CborUnixTime_tTag CborUnixTime_tTag
+#define CborPositiveBignumTag CborPositiveBignumTag
+#define CborNegativeBignumTag CborNegativeBignumTag
+#define CborDecimalTag CborDecimalTag
+#define CborBigfloatTag CborBigfloatTag
+#define CborCOSE_Encrypt0Tag CborCOSE_Encrypt0Tag
+#define CborCOSE_Mac0Tag CborCOSE_Mac0Tag
+#define CborCOSE_Sign1Tag CborCOSE_Sign1Tag
+#define CborExpectedBase64urlTag CborExpectedBase64urlTag
+#define CborExpectedBase64Tag CborExpectedBase64Tag
+#define CborExpectedBase16Tag CborExpectedBase16Tag
+#define CborEncodedCborTag CborEncodedCborTag
+#define CborUrlTag CborUrlTag
+#define CborBase64urlTag CborBase64urlTag
+#define CborBase64Tag CborBase64Tag
+#define CborRegularExpressionTag CborRegularExpressionTag
+#define CborMimeMessageTag CborMimeMessageTag
+#define CborCOSE_EncryptTag CborCOSE_EncryptTag
+#define CborCOSE_MacTag CborCOSE_MacTag
+#define CborCOSE_SignTag CborCOSE_SignTag
+#define CborSignatureTag CborSignatureTag
+
 /* Error API */
 
 typedef enum CborError {

src/cborvalidation.c

@@ -153,6 +153,21 @@
     <td>array</td>
     <td>Bigfloat</td>
   </td>
+  <tr>
+    <td>16</td>
+    <td>array</td>
+    <td>COSE Single Recipient Encrypted Data Object (RFC 8152)</td>
+  </td>
+  <tr>
+    <td>17</td>
+    <td>array</td>
+    <td>COSE Mac w/o Recipients Object (RFC 8152)</td>
+  </td>
+  <tr>
+    <td>18</td>
+    <td>array</td>
+    <td>COSE Single Signer Data Object (RFC 8162)</td>
+  </td>
   <tr>
     <td>21</td>
     <td>byte string, array, map</td>
@@ -198,6 +213,21 @@
     <td>UTF-8 text string</td>
     <td>MIME message</td>
   </td>
+  <tr>
+    <td>96</td>
+    <td>array</td>
+    <td>COSE Encrypted Data Object (RFC 8152)</td>
+  </td>
+  <tr>
+    <td>97</td>
+    <td>array</td>
+    <td>COSE MACed Data Object (RFC 8152)</td>
+  </td>
+  <tr>
+    <td>98</td>
+    <td>array</td>
+    <td>COSE Signed Data Object (RFC 8152)</td>
+  </td>
   <tr>
     <td>55799</td>
     <td>any</td>
@@ -214,6 +244,9 @@ static const struct KnownTagData knownTagData[] = {
     { 3, (uint8_t)CborByteStringType },
     { 4, (uint8_t)CborArrayType },
     { 5, (uint8_t)CborArrayType },
+    { 16, (uint8_t)CborArrayType },
+    { 17, (uint8_t)CborArrayType },
+    { 18, (uint8_t)CborArrayType },
     { 21, (uint8_t)CborByteStringType | ((uint8_t)CborArrayType << 8) | ((uint8_t)CborMapType << 16) },
     { 22, (uint8_t)CborByteStringType | ((uint8_t)CborArrayType << 8) | ((uint8_t)CborMapType << 16) },
     { 23, (uint8_t)CborByteStringType | ((uint8_t)CborArrayType << 8) | ((uint8_t)CborMapType << 16) },
@@ -223,6 +256,9 @@ static const struct KnownTagData knownTagData[] = {
     { 34, (uint8_t)CborTextStringType },
     { 35, (uint8_t)CborTextStringType },
     { 36, (uint8_t)CborTextStringType },
+    { 96, (uint8_t)CborArrayType },
+    { 97, (uint8_t)CborArrayType },
+    { 98, (uint8_t)CborArrayType },
     { 55799, 0U }
 };
 

src/parsetags.pl

@@ -85,6 +85,10 @@
     $comma = ",";
 }
 print "\n} CborKnownTags;";
+print "\n/* #define the constants so we can check with #ifdef */";
+for my $n (@tagnumbers) {
+    printf "#define Cbor%sTag Cbor%sTag\n", $tags{$n}{id}, $tags{$n}{id};
+}
 
 print "\n==== search table ====\n";
 print "struct KnownTagData { uint32_t tag; uint32_t types; };";

src/tags.txt

@@ -5,6 +5,9 @@
 3;NegativeBignum;ByteString;Negative bignum
 4;Decimal;Array;Decimal fraction
 5;Bigfloat;Array;Bigfloat
+16;COSE_Encrypt0;Array;COSE Single Recipient Encrypted Data Object (RFC 8152)
+17;COSE_Mac0;Array;COSE Mac w/o Recipients Object (RFC 8152)
+18;COSE_Sign1;Array;COSE Single Signer Data Object (RFC 8162)
 21;ExpectedBase64url;ByteString,Array,Map;Expected conversion to base64url encoding
 22;ExpectedBase64;ByteString,Array,Map;Expected conversion to base64 encoding
 23;ExpectedBase16;ByteString,Array,Map;Expected conversion to base16 encoding
@@ -14,4 +17,7 @@
 34;Base64;TextString;base64
 35;RegularExpression;TextString;Regular expression
 36;MimeMessage;TextString;MIME message
+96;COSE_Encrypt;Array;COSE Encrypted Data Object (RFC 8152)
+97;COSE_Mac;Array;COSE MACed Data Object (RFC 8152)
+98;COSE_Sign;Array;COSE Signed Data Object (RFC 8152)
 55799;Signature;;Self-describe CBOR