Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev

Author: stevespringett

schema/2.0/cyclonedx-2.0-bundled.min.schema.json

@@ -2860,6 +2860,8 @@
                     "kwp",
                     "cts",
                     "xts",
+                    "gmac",
+                    "cmac",
                     "xpn",
                     "ff1",
                     "ff3-1",
@@ -2882,6 +2884,8 @@
                     "kwp": "AES Key Wrap with Padding (RFC 5649).",
                     "cts": "Ciphertext Stealing mode.",
                     "xts": "XEX Tweaked-codebook with Stealing (disk encryption).",
+                    "gmac": "Galois Message Authentication Code",
+                    "cmac": "Cipher-based Message Authentication Code",
                     "xpn": "Extended Packet Numbering mode.",
                     "ff1": "Format-preserving encryption mode 1.",
                     "ff3-1": "Format-preserving encryption mode 3, update 1.",
@@ -3661,6 +3665,7 @@
             "decapsulate",
             "keyagree",
             "wrap",
+            "unwrap",
             "other",
             "unknown"
           ],
@@ -3681,6 +3686,7 @@
             "decapsulate": "Decapsulates a secret using a private key (KEM).",
             "keyagree": "Derives a shared secret between parties.",
             "wrap": "Encrypts a key for secure storage or transport.",
+            "unwrap": "Decrypts a wrapped key to recover the original key.",
             "other": "Another cryptographic function.",
             "unknown": "The cryptographic function is not known."
           }

schema/2.0/cyclonedx-2.0-bundled.schema.json

@@ -79,6 +79,9 @@
     "citations": {
       "$ref": "model/cyclonedx-citation-2.0.schema.json#/$defs/citations"
     },
+    "perspectives": {
+      "$ref": "model/cyclonedx-perspective-2.0.schema.json#/$defs/perspectives"
+    },
     "properties": {
       "$ref": "model/cyclonedx-common-2.0.schema.json#/$defs/properties"
     },

schema/2.0/cyclonedx-2.0.schema.json

@@ -215,6 +215,7 @@
             "codified-infrastructure",
             "quality-metrics",
             "poam",
+            "perspective",
             "electronic-signature",
             "digital-signature",
             "rfc-9116",
@@ -264,6 +265,7 @@
             "codified-infrastructure": "Code or configuration that defines and provisions virtualized infrastructure, commonly referred to as Infrastructure as Code (IaC).",
             "quality-metrics": "Report or system in which quality metrics can be obtained.",
             "poam": "Plans of Action and Milestones (POA&M) complement an \"attestation\" external reference. POA&M is defined by NIST as a \"document that identifies tasks needing to be accomplished. It details resources required to accomplish the elements of the plan, any milestones in meeting the tasks and scheduled completion dates for the milestones\".",
+            "perspective": "A CycloneDX perspective defines a domain-specific view, enabling different audiences to interpret and navigate the data through their own conceptual lens.",
             "electronic-signature": "An e-signature is commonly a scanned representation of a written signature or a stylized script of the person's name.",
             "digital-signature": "A signature that leverages cryptography, typically public/private key pairs, which provides strong authenticity verification.",
             "rfc-9116": "Document that complies with [RFC 9116](https://www.ietf.org/rfc/rfc9116.html) (A File Format to Aid in Security Vulnerability Disclosure)",

schema/2.0/model/cyclonedx-common-2.0.schema.json

@@ -257,6 +257,8 @@
                 "kwp",
                 "cts",
                 "xts",
+                "gmac",
+                "cmac",
                 "xpn",
                 "ff1",
                 "ff3-1",
@@ -279,6 +281,8 @@
                 "kwp": "AES Key Wrap with Padding (RFC 5649).",
                 "cts": "Ciphertext Stealing mode.",
                 "xts": "XEX Tweaked-codebook with Stealing (disk encryption).",
+                "gmac": "Galois Message Authentication Code",
+                "cmac": "Cipher-based Message Authentication Code",
                 "xpn": "Extended Packet Numbering mode.",
                 "ff1": "Format-preserving encryption mode 1.",
                 "ff3-1": "Format-preserving encryption mode 3, update 1.",
@@ -1058,6 +1062,7 @@
         "decapsulate",
         "keyagree",
         "wrap",
+        "unwrap",
         "other",
         "unknown"
       ],
@@ -1078,6 +1083,7 @@
         "decapsulate": "Decapsulates a secret using a private key (KEM).",
         "keyagree": "Derives a shared secret between parties.",
         "wrap": "Encrypts a key for secure storage or transport.",
+        "unwrap": "Decrypts a wrapped key to recover the original key.",
         "other": "Another cryptographic function.",
         "unknown": "The cryptographic function is not known."
       }