From 86c542fd47a6bff2e5e86154007e2776be59c23c Mon Sep 17 00:00:00 2001 From: Johanna Amann Date: Wed, 11 Sep 2024 17:06:01 +0200 Subject: [PATCH 1/3] Spicy SSL: reformat with new version of spicy format --- src/analyzer/protocol/ssl/spicy/SSL.spicy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/analyzer/protocol/ssl/spicy/SSL.spicy b/src/analyzer/protocol/ssl/spicy/SSL.spicy index 76b1be2a0f..e03910dde2 100644 --- a/src/analyzer/protocol/ssl/spicy/SSL.spicy +++ b/src/analyzer/protocol/ssl/spicy/SSL.spicy @@ -701,7 +701,7 @@ type SSL2Record = unit(lengthone: uint8, inout msg: Message, inout sh: Share) { var length: uint16; on lengthtwo { - self.length = (cast(lengthone) & 0x7F)<<8 | self.lengthtwo; + self.length = (cast(lengthone) & 0x7F) << 8 | self.lengthtwo; } message_type: uint8; @@ -712,7 +712,7 @@ type SSL2Record = unit(lengthone: uint8, inout msg: Message, inout sh: Share) { SSL2ProtocolMessages::ssl_server_verify -> : skip bytes &size=self.length; SSL2ProtocolMessages::ssl_request_certificate -> : skip bytes &size=self.length; SSL2ProtocolMessages::ssl_client_certificate -> : skip bytes &size=self.length; - } if(get_encrypted(sh) == False) ; + } if(get_encrypted(sh) == False); : skip bytes &size=self.length if(get_encrypted(sh) == True); on %done { @@ -842,7 +842,7 @@ function determine_encryption_on(pr: PlaintextRecord, content_type: uint8, hands return False; if (content_type != 23) # application_data - return False; + return False; ## in theory, we should check for TLS13 or draft-TLS13 instead of doing the reverse. ## But - people use weird version numbers. And all of those weird version numbers are From c9e84883d684bb4edbe2d87184e530b938582d04 Mon Sep 17 00:00:00 2001 From: Johanna Amann Date: Wed, 11 Sep 2024 17:08:16 +0200 Subject: [PATCH 2/3] Bump spicy-format to 0.16.1 --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e5638912cd..b6c463515c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -34,7 +34,7 @@ repos: exclude: '^(.typos.toml|src/SmithWaterman.cc|testing/.*|auxil/.*|scripts/base/frameworks/files/magic/.*|CHANGES)$' - repo: https://github.com/bbannier/spicy-format - rev: v0.15.0 + rev: v0.16.1 hooks: - id: spicy-format # TODO: Reformat existing large analyzers just before 8.0. From 0ef7a4e5dc1fd59a3631186a0fcc5462d781e463 Mon Sep 17 00:00:00 2001 From: Johanna Amann Date: Wed, 11 Sep 2024 17:58:13 +0200 Subject: [PATCH 3/3] Bump spicy-format to 0.16.2 --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b6c463515c..aaecc7c5ee 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -34,7 +34,7 @@ repos: exclude: '^(.typos.toml|src/SmithWaterman.cc|testing/.*|auxil/.*|scripts/base/frameworks/files/magic/.*|CHANGES)$' - repo: https://github.com/bbannier/spicy-format - rev: v0.16.1 + rev: v0.16.2 hooks: - id: spicy-format # TODO: Reformat existing large analyzers just before 8.0.