Merge pull request #1184 from calumgrant/cs/static-cryptotransform

hvitved · web-flow · commit 007cee8426e4 · 2019-04-01T16:03:53.000+02:00
C#: Remove static SHA1CryptoServiceProvider
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.Standalone/AssemblyInfo.cs b/csharp/extractor/Semmle.Extraction.CSharp.Standalone/AssemblyInfo.cs
@@ -139,6 +139,7 @@ public static AssemblyInfo ReadFromFile(string filename)
                  *  loading the same assembly from different locations.
                  */
                 using (var pereader = new System.Reflection.PortableExecutable.PEReader(new FileStream(filename, FileMode.Open, FileAccess.Read, FileShare.Read)))
+                using (var sha1 = new SHA1CryptoServiceProvider())
                 {
                     var metadata = pereader.GetMetadata();
                     unsafe
@@ -173,7 +174,5 @@ public static AssemblyInfo ReadFromFile(string filename)
 
             return result;
         }
-
-        static readonly SHA1CryptoServiceProvider sha1 = new SHA1CryptoServiceProvider();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,7 @@ public static AssemblyInfo ReadFromFile(string filename)`
`139`	`139`	`* loading the same assembly from different locations.`
`140`	`140`	`*/`
`141`	`141`	`using (var pereader = new System.Reflection.PortableExecutable.PEReader(new FileStream(filename, FileMode.Open, FileAccess.Read, FileShare.Read)))`
	`142`	`+ using (var sha1 = new SHA1CryptoServiceProvider())`
`142`	`143`	`{`
`143`	`144`	`var metadata = pereader.GetMetadata();`
`144`	`145`	`unsafe`
`@@ -173,7 +174,5 @@ public static AssemblyInfo ReadFromFile(string filename)`
`173`	`174`
`174`	`175`	`return result;`
`175`	`176`	`}`
`176`		`-`
`177`		`- static readonly SHA1CryptoServiceProvider sha1 = new SHA1CryptoServiceProvider();`
`178`	`177`	`}`
`179`	`178`	`}`