Add parsing code for TBSCertificate's "validity" field.

net/cert/internal/parse_certificate_unittest.cc

Index: net/cert/internal/parse_certificate_unittest.cc
diff --git a/net/cert/internal/parse_certificate_unittest.cc b/net/cert/internal/parse_certificate_unittest.cc
index 6663e2f973556714f93fc85c9b4b7f4a5c8c0bfe..cc64855f99aed8e30db3d3bac987c527e7e53114 100644
--- a/net/cert/internal/parse_certificate_unittest.cc
+++ b/net/cert/internal/parse_certificate_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "net/cert/internal/parse_certificate.h"
 
+#include "base/strings/stringprintf.h"
 #include "net/cert/internal/test_helpers.h"
 #include "net/der/input.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -232,6 +233,104 @@ TEST(ParseTbsCertificateTest, Version3DataAfterExtensions) {
   EnsureParsingTbsFails("tbs_v3_data_after_extensions.pem");
 }
 
+// Pretty-prints a GeneralizedTime as a human-readable string for use in test
+// expectations (it is more readable to specify the expected results as a
+// string).
+std::string ToString(const der::GeneralizedTime& time) {
+  return base::StringPrintf(
+      "year=%d, month=%d, day=%d, hours=%d, minutes=%d, seconds=%d", time.year,
+      time.month, time.day, time.hours, time.minutes, time.seconds);
+}
+
+// Reads the "VALIDITY" block from a PEM file.
+::testing::AssertionResult LoadTestValidity(const std::string& file_name,
+                                            std::string* validity) {
+  std::string path = GetFilePath(file_name);
+  const PemBlockMapping mappings[] = {{"VALIDITY", validity}};
+  return ReadTestDataFromPemFile(path, mappings);
+}
+
+// Parses a valid "validity" field, where both notBefore and notAfter are
+// expressed using UTCTime.
+TEST(ParseCertificateValidityTest, BothUtcTime) {
+  std::string validity;
+
+  ASSERT_TRUE(LoadTestValidity("validity_both_utc_time.pem", &validity));
+
+  der::GeneralizedTime validity_not_before;
+  der::GeneralizedTime validity_not_after;
+  ASSERT_TRUE(ParseValidity(InputFromString(&validity), &validity_not_before,
+                            &validity_not_after));
+
+  EXPECT_EQ("year=2012, month=10, day=18, hours=3, minutes=12, seconds=0",
+            ToString(validity_not_before));
+
+  EXPECT_EQ("year=2013, month=10, day=18, hours=14, minutes=59, seconds=59",
+            ToString(validity_not_after));
+}
+
+// Parses a valid "validity" field, where both notBefore and notAfter are
+// expressed using GeneralizedTime.
+TEST(ParseCertificateValidityTest, BothGeneralizedTime) {
+  std::string validity;
+
+  ASSERT_TRUE(
+      LoadTestValidity("validity_both_generalized_time.pem", &validity));
+
+  der::GeneralizedTime validity_not_before;
+  der::GeneralizedTime validity_not_after;
+  ASSERT_TRUE(ParseValidity(InputFromString(&validity), &validity_not_before,
+                            &validity_not_after));
+
+  EXPECT_EQ("year=2014, month=1, day=31, hours=0, minutes=0, seconds=0",
+            ToString(validity_not_before));
+
+  EXPECT_EQ("year=2016, month=2, day=29, hours=0, minutes=0, seconds=0",
+            ToString(validity_not_after));
+}
+
+// Parses a valid "validity" field, where notBefore is a UTCTime and notAfter is
+// a GeneralizedTime
+TEST(ParseCertificateValidityTest, UTCTimeAndGeneralizedTime) {
+  std::string validity;
+
+  ASSERT_TRUE(LoadTestValidity("validity_utc_time_and_generalized_time.pem",
+                               &validity));
+
+  der::GeneralizedTime validity_not_before;
+  der::GeneralizedTime validity_not_after;
+  ASSERT_TRUE(ParseValidity(InputFromString(&validity), &validity_not_before,
+                            &validity_not_after));
+
+  EXPECT_EQ("year=2012, month=10, day=18, hours=3, minutes=12, seconds=0",
+            ToString(validity_not_before));
+
+  EXPECT_EQ("year=2016, month=2, day=29, hours=0, minutes=0, seconds=0",
+            ToString(validity_not_after));
+}
+
+// Parses a valid "validity" field, where notBefore is a GeneralizedTime and
+// notAfter is
+// a UTCTime. Also of interest, notBefore > notAfter. Parsing will succeed,
+// however no time will fall in this range.

[davidben, 2015/08/18 17:24:27]

Nit: This looks like a wrapped funny.

+TEST(ParseCertificateValidityTest, GeneralizedTimeAndUTCTime) {
+  std::string validity;
+
+  ASSERT_TRUE(LoadTestValidity("validity_generalized_time_and_utc_time.pem",
+                               &validity));
+
+  der::GeneralizedTime validity_not_before;
+  der::GeneralizedTime validity_not_after;
+  ASSERT_TRUE(ParseValidity(InputFromString(&validity), &validity_not_before,
+                            &validity_not_after));
+
+  EXPECT_EQ("year=2014, month=1, day=31, hours=0, minutes=0, seconds=0",
+            ToString(validity_not_before));
+
+  EXPECT_EQ("year=2013, month=10, day=18, hours=14, minutes=59, seconds=59",
+            ToString(validity_not_after));
+}
+
 }  // namespace
 
 }  // namespace net