From 4e2b018272b8964b2e6acc5772e1701af43f1434 Mon Sep 17 00:00:00 2001 From: Michael Chisholm Date: Mon, 2 Mar 2020 16:57:18 -0500 Subject: [PATCH 1/2] Add a property to the software SCO, due to STIX spec change. --- stix2/test/v21/test_observed_data.py | 1 + stix2/v21/observables.py | 1 + 2 files changed, 2 insertions(+) diff --git a/stix2/test/v21/test_observed_data.py b/stix2/test/v21/test_observed_data.py index 71bad46..1854e40 100644 --- a/stix2/test/v21/test_observed_data.py +++ b/stix2/test/v21/test_observed_data.py @@ -1300,6 +1300,7 @@ def test_software_example(): s = stix2.v21.Software( name="Word", cpe="cpe:2.3:a:microsoft:word:2000:*:*:*:*:*:*:*", + swid="e2489b43-a436-47fd-9ea5-165ff0316114", version="2002", vendor="Microsoft", ) diff --git a/stix2/v21/observables.py b/stix2/v21/observables.py index ed560a6..68115a0 100644 --- a/stix2/v21/observables.py +++ b/stix2/v21/observables.py @@ -760,6 +760,7 @@ class Software(_Observable): ('id', IDProperty(_type, spec_version='2.1')), ('name', StringProperty(required=True)), ('cpe', StringProperty()), + ('swid', StringProperty()), ('languages', ListProperty(StringProperty)), ('vendor', StringProperty()), ('version', StringProperty()), From 2472af387b0e94aa9a5de76fea4db53eec465203 Mon Sep 17 00:00:00 2001 From: Michael Chisholm Date: Wed, 11 Mar 2020 15:21:34 -0400 Subject: [PATCH 2/2] Change a SWID tagId in a unit test from a UUID to something more plausible. --- stix2/test/v21/test_observed_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stix2/test/v21/test_observed_data.py b/stix2/test/v21/test_observed_data.py index 1854e40..abcbb7b 100644 --- a/stix2/test/v21/test_observed_data.py +++ b/stix2/test/v21/test_observed_data.py @@ -1300,7 +1300,7 @@ def test_software_example(): s = stix2.v21.Software( name="Word", cpe="cpe:2.3:a:microsoft:word:2000:*:*:*:*:*:*:*", - swid="e2489b43-a436-47fd-9ea5-165ff0316114", + swid="com.acme.rms-ce-v4-1-5-0", version="2002", vendor="Microsoft", )