MISP
/
cti-python-stix2
mirror of https://github.com/MISP/cti-python-stix2
2
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #358 from chisholm/software_cpe_swid 

Add swid property to the software SCO
master
Chris Lenk 2020-03-11 23:03:18 -04:00 committed by GitHub
parent 33fb31421b 2472af387b
commit 87c5ef30ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
stix2/test/v21/test_observed_data.py
View File

@ -1300,6 +1300,7 @@ def test_software_example():
s = stix2.v21.Software( s = stix2.v21.Software(
name="Word", name="Word",
cpe="cpe:2.3:a:microsoft:word:2000:*:*:*:*:*:*:*", cpe="cpe:2.3:a:microsoft:word:2000:*:*:*:*:*:*:*",
swid="com.acme.rms-ce-v4-1-5-0",
version="2002", version="2002",
vendor="Microsoft", vendor="Microsoft",
) )

1
stix2/v21/observables.py
View File

@ -760,6 +760,7 @@ class Software(_Observable):
('id', IDProperty(_type, spec_version='2.1')), ('id', IDProperty(_type, spec_version='2.1')),
('name', StringProperty(required=True)), ('name', StringProperty(required=True)),
('cpe', StringProperty()), ('cpe', StringProperty()),
('swid', StringProperty()),
('languages', ListProperty(StringProperty)), ('languages', ListProperty(StringProperty)),
('vendor', StringProperty()), ('vendor', StringProperty()),
('version', StringProperty()), ('version', StringProperty()),