Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/BinSkim.Driver/MultithreadedAnalyzeCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,14 @@ protected override void AnalyzeTarget(
IEnumerable<Skimmer<BinaryAnalyzerContext>> skimmers,
ISet<string> disabledSkimmers)
{
// Sarif.Driver 5 defaults to SHA-256 only, but BinSkim's --hashes contract emits both hashes.
if (context.DataToInsert.HasFlag(OptionallyEmittedData.Hashes))
{
context.Logger.FileRegionsCache = new FileRegionsCache(
fileSystem: context.FileSystem,
hashAlgorithms: HashAlgorithms.Sha1 | HashAlgorithms.Sha256);
}

if (!context.IgnoreBinaryAnalysisErrors)
{
base.AnalyzeTarget(context, skimmers, disabledSkimmers);
Expand Down
2 changes: 1 addition & 1 deletion src/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.10.1" />
<PackageVersion Include="Moq" Version="4.20.72" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
<PackageVersion Include="Sarif.Driver" Version="4.6.0" />
<PackageVersion Include="Sarif.Driver" Version="5.7.0" />
Comment thread
plade marked this conversation as resolved.
<PackageVersion Include="System.Collections.Immutable" Version="10.0.12" />
<PackageVersion Include="System.Composition" Version="10.0.12" />
<PackageVersion Include="System.Private.Uri" Version="4.3.2" />
Expand Down
2 changes: 1 addition & 1 deletion src/Nuget/BinaryParsers.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<iconUrl>https://go.microsoft.com/fwlink/?linkid=2008940</iconUrl>
<dependencies>
<group targetFramework=".NET9.0">
<dependency id="Sarif.Driver" version="4.5.4" exclude="Build,Analyzers" />
<dependency id="Sarif.Driver" version="5.7.0" exclude="Build,Analyzers" />
<dependency id="ELFSharp" version="2.17.3" exclude="Build,Analyzers" />
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
<dependency id="System.Collections.Immutable" version="9.0.0" exclude="Build,Analyzers" />
Expand Down
Loading