BJA-236 added check against PKIXParameters

dghgit · dghgit · commit da5f0f12675f · 2015-02-15T16:43:43.000+11:00
diff --git a/mail/src/main/java/org/bouncycastle/mail/smime/validator/SignedMailValidator.java b/mail/src/main/java/org/bouncycastle/mail/smime/validator/SignedMailValidator.java
@@ -311,7 +311,11 @@ protected void validateSignatures(PKIXParameters pkixParam)
                     ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,
                         "SignedMailValidator.noSigningTime");
                     notifications.add(msg);
-                    signTime = new Date();
+                    signTime = pkixParam.getDate();
+                    if (signTime == null)
+                    {
+                        signTime = new Date();
+                    }
                 }
                 else
                 {

Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,11 @@ protected void validateSignatures(PKIXParameters pkixParam)`
`311`	`311`	`ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,`
`312`	`312`	`"SignedMailValidator.noSigningTime");`
`313`	`313`	`notifications.add(msg);`
`314`		`- signTime = new Date();`
	`314`	`+ signTime = pkixParam.getDate();`
	`315`	`+ if (signTime == null)`
	`316`	`+ {`
	`317`	`+ signTime = new Date();`
	`318`	`+ }`
`315`	`319`	`}`
`316`	`320`	`else`
`317`	`321`	`{`