cbor: Scapy-native fields, codec hardening, and cbor2 CI

.github/workflows/unittests.yml

@@ -193,6 +193,23 @@ jobs:
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
 
+
+  cbor2-interop:
+    name: cbor2 interoperability (Python 3.12)
+    runs-on: ubuntu-latest
+    needs: [commit, spdx]
+    steps:
+      - name: Checkout Scapy
+        uses: actions/checkout@v6
+      - name: Setup Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: "3.12"
+      - name: Install tox
+        run: pip install tox
+      - name: Run cbor2 differential tests
+        run: tox -e cbor2
+
   cryptography:
     name: pyca/cryptography test
     runs-on: ubuntu-latest

scapy/cbor/__init__.py

@@ -14,13 +14,15 @@
     CBOR_BadTag_Decoding_Error,
     CBOR_Codecs,
     CBOR_MajorTypes,
+    CBOR_SimpleValue,
     CBOR_Object,
     CBOR_UNSIGNED_INTEGER,
     CBOR_NEGATIVE_INTEGER,
     CBOR_BYTE_STRING,
     CBOR_TEXT_STRING,
     CBOR_ARRAY,
     CBOR_MAP,
+    CBORMapData,
     CBOR_SEMANTIC_TAG,
     CBOR_SIMPLE_VALUE,
     CBOR_FALSE,
@@ -47,6 +49,8 @@
 from scapy.cbor.cborfields import (
     CBORF_element,
     CBORF_field,
+    CBORF_ANY,
+    CBOR_ABSENT,
     CBORF_UNSIGNED_INTEGER,
     CBORF_NEGATIVE_INTEGER,
     CBORF_INTEGER,
@@ -56,12 +60,17 @@
     CBORF_NULL,
     CBORF_UNDEFINED,
     CBORF_FLOAT,
+    CBORF_ITEMS,
+    CBORF_REMAINDER_OF,
     CBORF_ARRAY,
     CBORF_ARRAY_OF,
+    CBORF_ARRAY_INDEFINITE,
     CBORF_MAP,
     CBORF_SEMANTIC_TAG,
     CBORF_optional,
+    CBORF_CONDITIONAL,
     CBORF_PACKET,
+    CBORF_BYTE_STRING_PACKET,
 )
 
 __all__ = [
@@ -73,6 +82,7 @@
     # Codecs
     "CBOR_Codecs",
     "CBOR_MajorTypes",
+    "CBOR_SimpleValue",
     # Objects
     "CBOR_Object",
     "CBOR_UNSIGNED_INTEGER",
@@ -81,6 +91,7 @@
     "CBOR_TEXT_STRING",
     "CBOR_ARRAY",
     "CBOR_MAP",
+    "CBORMapData",
     "CBOR_SEMANTIC_TAG",
     "CBOR_SIMPLE_VALUE",
     "CBOR_FALSE",
@@ -104,6 +115,8 @@
     # Field base classes
     "CBORF_element",
     "CBORF_field",
+    "CBORF_ANY",
+    "CBOR_ABSENT",
     # Scalar fields
     "CBORF_UNSIGNED_INTEGER",
     "CBORF_NEGATIVE_INTEGER",
@@ -115,11 +128,16 @@
     "CBORF_UNDEFINED",
     "CBORF_FLOAT",
     # Structured fields
+    "CBORF_ITEMS",
+    "CBORF_REMAINDER_OF",
     "CBORF_ARRAY",
     "CBORF_ARRAY_OF",
+    "CBORF_ARRAY_INDEFINITE",
     "CBORF_MAP",
     "CBORF_SEMANTIC_TAG",
     # Complex fields
     "CBORF_optional",
+    "CBORF_CONDITIONAL",
     "CBORF_PACKET",
+    "CBORF_BYTE_STRING_PACKET",
 ]