From e80d3bad2cc380cb9dccac5bc89399cf55c045a6 Mon Sep 17 00:00:00 2001 From: Chris Lenk Date: Thu, 18 Jun 2020 10:35:15 -0400 Subject: [PATCH] Fix 2.0 HashesProperties --- stix2/v20/common.py | 2 +- stix2/v20/observables.py | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/stix2/v20/common.py b/stix2/v20/common.py index a92f81d..f2a371e 100644 --- a/stix2/v20/common.py +++ b/stix2/v20/common.py @@ -40,7 +40,7 @@ class ExternalReference(_STIXBase20): ('source_name', StringProperty(required=True)), ('description', StringProperty()), ('url', StringProperty()), - ('hashes', HashesProperty()), + ('hashes', HashesProperty(spec_version='2.0')), ('external_id', StringProperty()), ]) diff --git a/stix2/v20/observables.py b/stix2/v20/observables.py index 3491c47..79d4e79 100644 --- a/stix2/v20/observables.py +++ b/stix2/v20/observables.py @@ -30,7 +30,7 @@ class Artifact(_Observable): ('mime_type', StringProperty()), ('payload_bin', BinaryProperty()), ('url', StringProperty()), - ('hashes', HashesProperty()), + ('hashes', HashesProperty(spec_version='2.0')), ('extensions', ExtensionsProperty(spec_version="2.0", enclosing_type=_type)), ]) @@ -173,7 +173,7 @@ class AlternateDataStream(_STIXBase20): _properties = OrderedDict([ ('name', StringProperty(required=True)), - ('hashes', HashesProperty()), + ('hashes', HashesProperty(spec_version='2.0')), ('size', IntegerProperty()), ]) @@ -256,7 +256,7 @@ class WindowsPEOptionalHeaderType(_STIXBase20): ('size_of_heap_commit', IntegerProperty()), ('loader_flags_hex', HexProperty()), ('number_of_rva_and_sizes', IntegerProperty()), - ('hashes', HashesProperty()), + ('hashes', HashesProperty(spec_version='2.0')), ]) def _check_object_constraints(self): @@ -273,7 +273,7 @@ class WindowsPESection(_STIXBase20): ('name', StringProperty(required=True)), ('size', IntegerProperty()), ('entropy', FloatProperty()), - ('hashes', HashesProperty()), + ('hashes', HashesProperty(spec_version='2.0')), ]) @@ -293,7 +293,7 @@ class WindowsPEBinaryExt(_Extension): ('number_of_symbols', IntegerProperty()), ('size_of_optional_header', IntegerProperty()), ('characteristics_hex', HexProperty()), - ('file_header_hashes', HashesProperty()), + ('file_header_hashes', HashesProperty(spec_version='2.0')), ('optional_header', EmbeddedObjectProperty(type=WindowsPEOptionalHeaderType)), ('sections', ListProperty(EmbeddedObjectProperty(type=WindowsPESection))), ]) @@ -307,7 +307,7 @@ class File(_Observable): _type = 'file' _properties = OrderedDict([ ('type', TypeProperty(_type, spec_version='2.0')), - ('hashes', HashesProperty()), + ('hashes', HashesProperty(spec_version='2.0')), ('size', IntegerProperty()), ('name', StringProperty()), ('name_enc', StringProperty()), @@ -759,7 +759,7 @@ class X509Certificate(_Observable): _properties = OrderedDict([ ('type', TypeProperty(_type, spec_version='2.0')), ('is_self_signed', BooleanProperty()), - ('hashes', HashesProperty()), + ('hashes', HashesProperty(spec_version='2.0')), ('version', StringProperty()), ('serial_number', StringProperty()), ('signature_algorithm', StringProperty()),