New BPv7 with working UTS and patched cbor modules to support it

scapy/cbor/__init__.py

@@ -56,12 +56,16 @@
     CBORF_NULL,
     CBORF_UNDEFINED,
     CBORF_FLOAT,
+    CBORF_SEQUENCE,
+    CBORF_SEQUENCE_OF,
     CBORF_ARRAY,
     CBORF_ARRAY_OF,
     CBORF_MAP,
     CBORF_SEMANTIC_TAG,
     CBORF_optional,
+    CBORF_CONDITIONAL,
     CBORF_PACKET,
+    CBORF_BYTE_STRING_PACKET,
 )
 
 __all__ = [
@@ -115,11 +119,15 @@
     "CBORF_UNDEFINED",
     "CBORF_FLOAT",
     # Structured fields
+    "CBORF_SEQUENCE",
+    "CBORF_SEQUENCE_OF",
     "CBORF_ARRAY",
     "CBORF_ARRAY_OF",
     "CBORF_MAP",
     "CBORF_SEMANTIC_TAG",
     # Complex fields
     "CBORF_optional",
+    "CBORF_CONDITIONAL",
     "CBORF_PACKET",
+    "CBORF_BYTE_STRING_PACKET",
 ]

scapy/cbor/cbor.py

@@ -296,11 +296,12 @@ def __new__(cls,
             'Type[CBOR_Object[Any]]',
             super(CBOR_Object_metaclass, cls).__new__(cls, name, bases, dct)
         )
-        try:
-            c.tag.register_cbor_object(c)
-        except Exception:
-            # Some objects may not have tags yet
-            log_runtime.warning("Failed to register CBOR object %r" % c)
+        if c.tag is not None:
+            try:
+                c.tag.register_cbor_object(c)
+            except Exception:
+                # Some objects may not have tags yet
+                log_runtime.exception("Failed to register CBOR object %r" % c)
         return c
 
 

scapy/cbor/cborcodec.py

@@ -69,13 +69,15 @@ def __init__(self,
 
 
 def CBOR_encode_head(major_type, value):
-    # type: (int, int) -> bytes
+    # type: (int, Optional[int]) -> bytes
     """
     Encode CBOR initial byte and additional info.
     Format: 3 bits major type + 5 bits additional info
     """
-    if value < 24:
+    if value is None or value < 24:
         # Value fits in 5 bits
+        if value is None:
+            value = 0x1f
         return chb((major_type << 5) | value)
     elif value < 256:
         # 1-byte value follows
@@ -92,7 +94,7 @@ def CBOR_encode_head(major_type, value):
 
 
 def CBOR_decode_head(s):
-    # type: (bytes) -> Tuple[int, int, bytes]
+    # type: (bytes) -> Tuple[int, Optional[int], bytes]
     """
     Decode CBOR initial byte and additional info.
     Returns: (major_type, value, remaining_bytes)
@@ -134,6 +136,8 @@ def CBOR_decode_head(s):
                 "Not enough bytes for 8-byte value", remaining=s)
         value = struct.unpack(">Q", s[1:9])[0]
         return major_type, value, s[9:]
+    elif additional_info == 31:
+        return major_type, None, s[1:]
     else:
         raise CBOR_Codec_Decoding_Error(
             "Invalid additional info: %d" % additional_info, remaining=s)