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

Fix 2.0 HashesProperties

pull/1/head
Chris Lenk 2020-06-18 10:35:15 -04:00
parent f78b396648
commit e80d3bad2c
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stix2/v20/common.py
View File

@ -40,7 +40,7 @@ class ExternalReference(_STIXBase20):
('source_name', StringProperty(required=True)), ('source_name', StringProperty(required=True)),
('description', StringProperty()), ('description', StringProperty()),
('url', StringProperty()), ('url', StringProperty()),
('hashes', HashesProperty()), ('hashes', HashesProperty(spec_version='2.0')),
('external_id', StringProperty()), ('external_id', StringProperty()),
]) ])

14
stix2/v20/observables.py
View File

@ -30,7 +30,7 @@ class Artifact(_Observable):
('mime_type', StringProperty()), ('mime_type', StringProperty()),
('payload_bin', BinaryProperty()), ('payload_bin', BinaryProperty()),
('url', StringProperty()), ('url', StringProperty()),
('hashes', HashesProperty()), ('hashes', HashesProperty(spec_version='2.0')),
('extensions', ExtensionsProperty(spec_version="2.0", enclosing_type=_type)), ('extensions', ExtensionsProperty(spec_version="2.0", enclosing_type=_type)),
]) ])
@ -173,7 +173,7 @@ class AlternateDataStream(_STIXBase20):
_properties = OrderedDict([ _properties = OrderedDict([
('name', StringProperty(required=True)), ('name', StringProperty(required=True)),
('hashes', HashesProperty()), ('hashes', HashesProperty(spec_version='2.0')),
('size', IntegerProperty()), ('size', IntegerProperty()),
]) ])
@ -256,7 +256,7 @@ class WindowsPEOptionalHeaderType(_STIXBase20):
('size_of_heap_commit', IntegerProperty()), ('size_of_heap_commit', IntegerProperty()),
('loader_flags_hex', HexProperty()), ('loader_flags_hex', HexProperty()),
('number_of_rva_and_sizes', IntegerProperty()), ('number_of_rva_and_sizes', IntegerProperty()),
('hashes', HashesProperty()), ('hashes', HashesProperty(spec_version='2.0')),
]) ])
def _check_object_constraints(self): def _check_object_constraints(self):
@ -273,7 +273,7 @@ class WindowsPESection(_STIXBase20):
('name', StringProperty(required=True)), ('name', StringProperty(required=True)),
('size', IntegerProperty()), ('size', IntegerProperty()),
('entropy', FloatProperty()), ('entropy', FloatProperty()),
('hashes', HashesProperty()), ('hashes', HashesProperty(spec_version='2.0')),
]) ])
@ -293,7 +293,7 @@ class WindowsPEBinaryExt(_Extension):
('number_of_symbols', IntegerProperty()), ('number_of_symbols', IntegerProperty()),
('size_of_optional_header', IntegerProperty()), ('size_of_optional_header', IntegerProperty()),
('characteristics_hex', HexProperty()), ('characteristics_hex', HexProperty()),
('file_header_hashes', HashesProperty()), ('file_header_hashes', HashesProperty(spec_version='2.0')),
('optional_header', EmbeddedObjectProperty(type=WindowsPEOptionalHeaderType)), ('optional_header', EmbeddedObjectProperty(type=WindowsPEOptionalHeaderType)),
('sections', ListProperty(EmbeddedObjectProperty(type=WindowsPESection))), ('sections', ListProperty(EmbeddedObjectProperty(type=WindowsPESection))),
]) ])
@ -307,7 +307,7 @@ class File(_Observable):
_type = 'file' _type = 'file'
_properties = OrderedDict([ _properties = OrderedDict([
('type', TypeProperty(_type, spec_version='2.0')), ('type', TypeProperty(_type, spec_version='2.0')),
('hashes', HashesProperty()), ('hashes', HashesProperty(spec_version='2.0')),
('size', IntegerProperty()), ('size', IntegerProperty()),
('name', StringProperty()), ('name', StringProperty()),
('name_enc', StringProperty()), ('name_enc', StringProperty()),
@ -759,7 +759,7 @@ class X509Certificate(_Observable):
_properties = OrderedDict([ _properties = OrderedDict([
('type', TypeProperty(_type, spec_version='2.0')), ('type', TypeProperty(_type, spec_version='2.0')),
('is_self_signed', BooleanProperty()), ('is_self_signed', BooleanProperty()),
('hashes', HashesProperty()), ('hashes', HashesProperty(spec_version='2.0')),
('version', StringProperty()), ('version', StringProperty()),
('serial_number', StringProperty()), ('serial_number', StringProperty()),
('signature_algorithm', StringProperty()), ('signature_algorithm', StringProperty()),