Skip to content

Commit 6c4590a

Browse files
Merge pull request #33 from embray/check-signature
fix: actually note whether the pkcs7 signature is valid for the data
2 parents bc762d2 + f9f3554 commit 6c4590a

4 files changed

Lines changed: 6 additions & 1 deletion

File tree

PassValidator.Console/ConsoleValidator.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ private static bool IsPassSignatureValid(Validator.ValidationResult validationRe
5353
{
5454
return !validationResult.HasSignatureExpired &&
5555
validationResult.HasSignature &&
56+
validationResult.SignatureValid &&
5657
validationResult.SignedByApple;
5758
}
5859

PassValidator.Console/VerbosePrinter.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public static void PrintValidationResults(bool isVerbose, ValidationResult valid
2424
System.Console.WriteLine($"\tPass Type Identifier Matches: {validationResult.PassTypeIdentifierMatches}");
2525
System.Console.WriteLine($"\tSigned By Apple: {validationResult.SignedByApple}");
2626
System.Console.WriteLine($"\tSignature Expiration Date: {validationResult.SignatureExpirationDate}");
27+
System.Console.WriteLine($"\tSignature Valid: {validationResult.SignatureValid}");
2728
System.Console.WriteLine($"\tHas Icon 3x: {validationResult.HasIcon3x}");
2829
System.Console.WriteLine($"\tHas Icon 2x: {validationResult.HasIcon2x}");
2930
System.Console.WriteLine($"\tHas Icon 1x: {validationResult.HasIcon1x}");

PassValidator.Validator/ValidationResult.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ public class ValidationResult
1818

1919
public string SignatureExpirationDate { get; set; }
2020

21+
public bool SignatureValid { get; set; }
22+
2123
public bool HasIcon3x { get; set; }
2224

2325
public bool HasIcon2x { get; set; }

PassValidator.Validator/Validator.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,11 @@ public ValidationResult Validate(byte[] passContent)
150150
try
151151
{
152152
signedCms.CheckSignature(true);
153+
result.SignatureValid = true;
153154
}
154155
catch
155156
{
156-
// ignored
157+
result.SignatureValid = false;
157158
}
158159

159160
var signer = signedCms.SignerInfos[0];

0 commit comments

Comments
 (0)