Certificate Transparency: Correct month calculation.

net/cert/cert_policy_enforcer.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/cert/cert_policy_enforcer.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/build_time.h"
@@ skipping 25 matching lines @@
 bool IsBuildTimely() {
 #if defined(DONT_EMBED_BUILD_METADATA) && !defined(OFFICIAL_BUILD)
   return true;
 #else
   const base::Time build_time = base::GetBuildTime();
   // We consider built-in information to be timely for 10 weeks.
   return (base::Time::Now() - build_time).InDays() < 70 /* 10 weeks */;
 #endif
 }
 
-uint32_t ApproximateMonthDifference(const base::Time& start,
-                                    const base::Time& end) {
+struct MonthsDiff {
+  MonthsDiff() : num_months(0), last_month_is_full(false) {}

[davidben, 2015/03/25 19:10:11]

Per https://chromium-cpp.appspot.com/, these can be inline initializers. So just

struct MonthsDiff {
  size_t num_months = 0;
  bool last_month_is_full = false;
};

[Ryan Sleevi, 2015/03/25 19:16:07]

That said, please just use two out variables; don't encapsulate this in a
struct.

(Yes, I'm generally anti-tuple)

[Eran Messeri, 2015/03/26 10:47:17]

Done - as Ryan suggested.

+  size_t num_months;
+  bool last_month_is_full;

[davidben, 2015/03/25 19:10:11]

last_month_is_full to me reads like you're rounding up and then reporting
whether the last month in num_months was full or partial.

Whereas you're rounding down and then reporting whether or not there was
*additional* time after adding num_months. Perhaps has_extra or
has_partial_month? (Note: that would invert the meaning of the boolean.)

[Eran Messeri, 2015/03/26 10:47:17]

Renamed to has_partial_month as suggested.

+};
+
+/*

[davidben, 2015/03/25 19:10:11]

Use // C++-style comments rather than /* C-style */.

[Eran Messeri, 2015/03/26 10:47:17]

Done.

+ * Returns a rounded-down months difference of |start| and |end|,
+ * together with an indication of whether the last month was
+ * a full month, because the range starts specified in the policy
+ * are not consistent in terms of including the range start value.
+ */
+MonthsDiff RoundedDownMonthDifference(const base::Time& start,
+                                      const base::Time& end) {
   base::Time::Exploded exploded_start;
   base::Time::Exploded exploded_expiry;
   start.UTCExplode(&exploded_start);
   end.UTCExplode(&exploded_expiry);
+  if (end < start)
+    return MonthsDiff();

[davidben, 2015/03/25 19:10:11]

Not that it matters, but I think this actually wants to return (0, true) by your
current meaning, not (0, false). Though see comment above; I think inverting the
meaning of the boolean makes it clearer anyway.

[Eran Messeri, 2015/03/26 10:47:17]

Done.

+
+  MonthsDiff ret;
+  ret.last_month_is_full = false;
   uint32_t month_diff = (exploded_expiry.year - exploded_start.year) * 12 +
                         (exploded_expiry.month - exploded_start.month);
+  if (exploded_expiry.day_of_month < exploded_start.day_of_month)
+    --month_diff;
+  else if (exploded_expiry.day_of_month == exploded_start.day_of_month)
+    ret.last_month_is_full = true;

[davidben, 2015/03/25 19:10:11]

It occurs to me this also doesn't account for hours and seconds and such. I
don't know how much we care since that's kind of tedious. (Both the < and the ==
comparisons would need to be modified. That or you unexplode the time, but then
you run into problems of what the unexplode function does if you pass in
February 31st.)

[Eran Messeri, 2015/03/26 10:47:17]

No benefit to being that tedious, it'd be extra code for no good reason. The
whole point behind this policy is to guarantee that long-lived certificates have
enough SCTs, nitpicking on the time of day will not matter much.

 
-  // Add any remainder as a full month.
-  if (exploded_expiry.day_of_month > exploded_start.day_of_month)
-    ++month_diff;
-
-  return month_diff;
+  ret.num_months = month_diff;
+  return ret;
 }
 
 bool HasRequiredNumberOfSCTs(const X509Certificate& cert,
                              const ct::CTVerifyResult& ct_result) {
   // TODO(eranm): Count the number of *independent* SCTs once the information
   // about log operators is available, crbug.com/425174
   size_t num_valid_scts = ct_result.verified_scts.size();
   size_t num_embedded_scts =
       std::count_if(ct_result.verified_scts.begin(),
                     ct_result.verified_scts.end(), IsEmbeddedSCT);
 
   size_t num_non_embedded_scts = num_valid_scts - num_embedded_scts;
   // If at least two valid SCTs were delivered by means other than embedding
   // (i.e. in a TLS extension or OCSP), then the certificate conforms to bullet
   // number 3 of the "Qualifying Certificate" section of the CT/EV policy.
   if (num_non_embedded_scts >= 2)
     return true;
 
   if (cert.valid_start().is_null() || cert.valid_expiry().is_null() ||
       cert.valid_start().is_max() || cert.valid_expiry().is_max()) {
     // Will not be able to calculate the certificate's validity period.
     return false;
   }
 
-  uint32_t expiry_in_months_approx =
-      ApproximateMonthDifference(cert.valid_start(), cert.valid_expiry());
+  MonthsDiff exp =

[davidben, 2015/03/25 19:10:11]

exp -> lifetime? I first read that as exponentiation and was very confused. :-)
It's also not really the expiration, right? It's the total lifetime of the
certificate.

[Eran Messeri, 2015/03/26 10:47:17]

Done - rename to lifetime. You're right, it's not the expiration.

+      RoundedDownMonthDifference(cert.valid_start(), cert.valid_expiry());
 
   // For embedded SCTs, if the certificate has the number of SCTs specified in
   // table 1 of the "Qualifying Certificate" section of the CT/EV policy, then
   // it qualifies.
   size_t num_required_embedded_scts;
-  if (expiry_in_months_approx > 39) {
+  if ((exp.num_months > 39) ||
+      (exp.num_months == 39 && !exp.last_month_is_full)) {
     num_required_embedded_scts = 5;
-  } else if (expiry_in_months_approx > 27) {
+  } else if ((exp.num_months > 27) ||
+             (exp.num_months == 27 && !exp.last_month_is_full)) {
     num_required_embedded_scts = 4;
-  } else if (expiry_in_months_approx >= 15) {
+  } else if (exp.num_months >= 15) {
     num_required_embedded_scts = 3;
   } else {
     num_required_embedded_scts = 2;
   }
 
   return num_embedded_scts >= num_required_embedded_scts;
 }
 
 enum CTComplianceStatus {
   CT_NOT_COMPLIANT = 0,
@@ skipping 160 matching lines @@
 
   LogCTComplianceStatusToUMA(details.status, ev_whitelist);
 
   if (details.status == CT_IN_WHITELIST || details.status == CT_ENOUGH_SCTS)
     return true;
 
   return false;
 }
 
 }  // namespace net