Make date format consistent with Java tests
3 files changed, 9 insertions, 9 deletions
diff --git a/crypto/src/pkix/Rfc3280CertPathUtilities.cs b/crypto/src/pkix/Rfc3280CertPathUtilities.cs
index bae657d90..c6f3fbff9 100644
--- a/crypto/src/pkix/Rfc3280CertPathUtilities.cs
+++ b/crypto/src/pkix/Rfc3280CertPathUtilities.cs
@@ -1197,10 +1197,10 @@ namespace Org.BouncyCastle.Pkix
}
if (certStatus.Status != CertStatus.Unrevoked)
{
- // TODO This format is forced by the NistCertPath tests
- string formattedDate = certStatus.RevocationDate.Value.ToString(
- "G", new CultureInfo("en-us"));
- string message = "Certificate revocation after " + formattedDate;
+ // This format is enforced by the NistCertPath tests
+ string formattedDate = certStatus.RevocationDate.Value.ToString(
+ "ddd MMM dd HH:mm:ss K yyyy");
+ string message = "Certificate revocation after " + formattedDate;
message += ", reason: " + CrlReasons[certStatus.Status];
throw new Exception(message);
}
diff --git a/crypto/src/pkix/Rfc3281CertPathUtilities.cs b/crypto/src/pkix/Rfc3281CertPathUtilities.cs
index bda2aa737..101ef5e11 100644
--- a/crypto/src/pkix/Rfc3281CertPathUtilities.cs
+++ b/crypto/src/pkix/Rfc3281CertPathUtilities.cs
@@ -195,10 +195,10 @@ namespace Org.BouncyCastle.Pkix
}
if (certStatus.Status != CertStatus.Unrevoked)
{
- // TODO This format is forced by the NistCertPath tests
- string formattedDate = certStatus.RevocationDate.Value.ToString(
- "G", new CultureInfo("en-us"));
- string message = "Attribute certificate revocation after "
+ // This format is enforced by the NistCertPath tests
+ string formattedDate = certStatus.RevocationDate.Value.ToString(
+ "ddd MMM dd HH:mm:ss K yyyy");
+ string message = "Attribute certificate revocation after "
+ formattedDate;
message += ", reason: "
+ Rfc3280CertPathUtilities.CrlReasons[certStatus.Status];
diff --git a/crypto/test/src/test/nist/NistCertPathTest.cs b/crypto/test/src/test/nist/NistCertPathTest.cs
index f42f64ca2..fed98a778 100644
--- a/crypto/test/src/test/nist/NistCertPathTest.cs
+++ b/crypto/test/src/test/nist/NistCertPathTest.cs
@@ -185,7 +185,7 @@ namespace Org.BouncyCastle.Tests.Nist
new string[] { "NegativeSerialNumberCACert", "InvalidNegativeSerialNumberTest15EE" },
new string[] { TRUST_ANCHOR_ROOT_CRL, "NegativeSerialNumberCACRL" },
0,
- "Certificate revocation after 4/19/2001 2:57:20 PM",
+ "Certificate revocation after Thu Apr 19 14:57:20",
"reason: keyCompromise");
}
|
