Skip to content

Commit 7a3341e

Browse files
vcsjonesvcsjones
committed
Minor language cleanup.
1 parent f60cdee commit 7a3341e

File tree

5 files changed

+47
-70
lines changed

5 files changed

+47
-70
lines changed

‎AuthenticodeLint/CommandLineParser.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
namespace AuthenticodeLint
66
{
77

8-
public struct CommandLineParameter
8+
public readonly struct CommandLineParameter
99
{
10-
private string _name, _value;
10+
private readonly string _name, _value;
1111

1212
public CommandLineParameter(string name, string value)
1313
{

‎AuthenticodeLint/Rules/10004-PublisherInformationRule.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ public RuleResult Validate(IReadOnlyList<ISignature> graph, SignatureLogger verb
4848
}
4949
else
5050
{
51-
Uri uri;
52-
if (!Uri.TryCreate(info.UrlLink, UriKind.Absolute, out uri))
51+
if (!Uri.TryCreate(info.UrlLink, UriKind.Absolute, out _))
5352
{
5453
result = RuleResult.Fail;
5554
verboseWriter.LogSignatureMessage(signature, "Signature's accompanying URL is not a valid URI.");

‎AuthenticodeLint/Rules/10011-StrongKeyLengthRule.cs

Lines changed: 18 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -24,41 +24,28 @@ public RuleResult Validate(IReadOnlyList<ISignature> graph, SignatureLogger verb
2424
var keyInfo = BitStrengthCalculator.CalculateStrength(signature.Certificate);
2525
switch (keyInfo.AlgorithmName)
2626
{
27-
case PublicKeyAlgorithm.ECDSA:
28-
if (keyInfo.BitSize == null)
29-
{
30-
verboseWriter.LogSignatureMessage(signature, "Signature uses ECDSA with an unknown curve.");
31-
result = RuleResult.Fail;
32-
}
27+
case PublicKeyAlgorithm.ECDSA when keyInfo.BitSize is null:
28+
verboseWriter.LogSignatureMessage(signature, "Signature uses ECDSA with an unknown curve.");
29+
result = RuleResult.Fail;
3330
//We don't actually check the key size for ECDSA since all known values are acceptable.
3431
break;
35-
case PublicKeyAlgorithm.RSA:
36-
if (keyInfo.BitSize == null)
37-
{
38-
verboseWriter.LogSignatureMessage(signature, "Signature has an unknown RSA key size.");
39-
result = RuleResult.Fail;
40-
}
41-
else if (keyInfo.BitSize < MIN_RSADSA_KEY_SIZE)
42-
{
43-
verboseWriter.LogSignatureMessage(signature, $"Signature uses a RSA key of size {keyInfo.BitSize} which is below the recommended {MIN_RSADSA_KEY_SIZE}.");
44-
result = RuleResult.Fail;
45-
}
32+
case PublicKeyAlgorithm.RSA when keyInfo.BitSize is null:
33+
verboseWriter.LogSignatureMessage(signature, "Signature has an unknown RSA key size.");
34+
result = RuleResult.Fail;
35+
break;
36+
case PublicKeyAlgorithm.RSA when keyInfo.BitSize < MIN_RSADSA_KEY_SIZE:
37+
verboseWriter.LogSignatureMessage(signature, $"Signature uses a RSA key of size {keyInfo.BitSize} which is below the recommended {MIN_RSADSA_KEY_SIZE}.");
38+
result = RuleResult.Fail;
4639
break;
47-
case PublicKeyAlgorithm.DSA:
48-
if (keyInfo.BitSize == null)
49-
{
50-
verboseWriter.LogSignatureMessage(signature, "Signature has an unknown DSA key size.");
51-
result = RuleResult.Fail;
52-
}
53-
else if (keyInfo.BitSize < MIN_RSADSA_KEY_SIZE)
54-
{
55-
//Effectively, 1024 is the max for a DSA key, so this will likely always fail.
56-
verboseWriter.LogSignatureMessage(signature, $"Signature uses a DSA key of size {keyInfo.BitSize} which is below the recommended {MIN_RSADSA_KEY_SIZE}.");
57-
result = RuleResult.Fail;
58-
}
40+
case PublicKeyAlgorithm.DSA when keyInfo.BitSize is null:
41+
verboseWriter.LogSignatureMessage(signature, "Signature has an unknown DSA key size.");
42+
result = RuleResult.Fail;
43+
break;
44+
case PublicKeyAlgorithm.DSA when keyInfo.BitSize < MIN_RSADSA_KEY_SIZE:
45+
//Effectively, 1024 is the max for a DSA key, so this will likely always fail.
46+
verboseWriter.LogSignatureMessage(signature, $"Signature uses a DSA key of size {keyInfo.BitSize} which is below the recommended {MIN_RSADSA_KEY_SIZE}.");
47+
result = RuleResult.Fail;
5948
break;
60-
case PublicKeyAlgorithm.Other:
61-
goto default;
6249
default:
6350
verboseWriter.LogSignatureMessage(signature, $"Signature uses an unknown algorithm.");
6451
result = RuleResult.Fail;

‎AuthenticodeLint/Rules/10013-MaxKeyLengthRule.cs

Lines changed: 21 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -26,44 +26,30 @@ public RuleResult Validate(IReadOnlyList<ISignature> graph, SignatureLogger verb
2626
var keyInfo = BitStrengthCalculator.CalculateStrength(signature.Certificate);
2727
switch (keyInfo.AlgorithmName)
2828
{
29-
case PublicKeyAlgorithm.ECDSA:
30-
if (keyInfo.BitSize == null)
31-
{
32-
verboseWriter.LogSignatureMessage(signature, "Signature uses ECDSA with an unknown curve.");
33-
result = RuleResult.Fail;
34-
}
35-
else if (keyInfo.BitSize > MAX_ECDSA_KEY_SIZE)
36-
{
37-
verboseWriter.LogSignatureMessage(signature, $"Signature uses ECDSA signature with a key size of {keyInfo.BitSize} exeeding maximum size of {MAX_ECDSA_KEY_SIZE}.");
38-
result = RuleResult.Fail;
39-
}
29+
case PublicKeyAlgorithm.ECDSA when keyInfo.BitSize is null:
30+
verboseWriter.LogSignatureMessage(signature, "Signature uses ECDSA with an unknown curve.");
31+
result = RuleResult.Fail;
4032
break;
41-
case PublicKeyAlgorithm.RSA:
42-
if (keyInfo.BitSize == null)
43-
{
44-
verboseWriter.LogSignatureMessage(signature, "Signature has an unknown RSA key size.");
45-
result = RuleResult.Fail;
46-
}
47-
else if (keyInfo.BitSize > MAX_RSA_KEY_SIZE)
48-
{
49-
verboseWriter.LogSignatureMessage(signature, $"Signature uses RSA signature with a key size of {keyInfo.BitSize} exeeding maximum size of {MAX_RSA_KEY_SIZE}.");
50-
result = RuleResult.Fail;
51-
}
33+
case PublicKeyAlgorithm.ECDSA when keyInfo.BitSize > MAX_ECDSA_KEY_SIZE:
34+
verboseWriter.LogSignatureMessage(signature, $"Signature uses ECDSA signature with a key size of {keyInfo.BitSize} exeeding maximum size of {MAX_ECDSA_KEY_SIZE}.");
35+
result = RuleResult.Fail;
5236
break;
53-
case PublicKeyAlgorithm.DSA:
54-
if (keyInfo.BitSize == null)
55-
{
56-
verboseWriter.LogSignatureMessage(signature, "Signature has an unknown DSA key size.");
57-
result = RuleResult.Fail;
58-
}
59-
else if (keyInfo.BitSize > MAX_DSA_KEY_SIZE)
60-
{
61-
verboseWriter.LogSignatureMessage(signature, $"Signature uses DSA signature with a key size of {keyInfo.BitSize} exeeding maximum size of {MAX_DSA_KEY_SIZE}.");
62-
result = RuleResult.Fail;
63-
}
37+
case PublicKeyAlgorithm.RSA when keyInfo.BitSize is null:
38+
verboseWriter.LogSignatureMessage(signature, "Signature has an unknown RSA key size.");
39+
result = RuleResult.Fail;
40+
break;
41+
case PublicKeyAlgorithm.RSA when keyInfo.BitSize > MAX_RSA_KEY_SIZE:
42+
verboseWriter.LogSignatureMessage(signature, $"Signature uses RSA signature with a key size of {keyInfo.BitSize} exeeding maximum size of {MAX_RSA_KEY_SIZE}.");
43+
result = RuleResult.Fail;
44+
break;
45+
case PublicKeyAlgorithm.DSA when keyInfo.BitSize is null:
46+
verboseWriter.LogSignatureMessage(signature, "Signature has an unknown DSA key size.");
47+
result = RuleResult.Fail;
48+
break;
49+
case PublicKeyAlgorithm.DSA when keyInfo.BitSize > MAX_DSA_KEY_SIZE:
50+
verboseWriter.LogSignatureMessage(signature, $"Signature uses DSA signature with a key size of {keyInfo.BitSize} exeeding maximum size of {MAX_DSA_KEY_SIZE}.");
51+
result = RuleResult.Fail;
6452
break;
65-
case PublicKeyAlgorithm.Other:
66-
goto default;
6753
default:
6854
verboseWriter.LogSignatureMessage(signature, $"Signature uses an unknown algorithm.");
6955
result = RuleResult.Fail;

‎Directory.Build.props

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<Project>
2+
<PropertyGroup>
3+
<LangVersion>7.3</LangVersion>
4+
</PropertyGroup>
5+
</Project>

0 commit comments

Comments
 (0)