RTCCertificate::Expires() and ::HasExpired() implemented

webrtc/base/rtccertificate.cc

 /*
  *  Copyright 2015 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 10 matching lines @@
 }
 
 RTCCertificate::RTCCertificate(SSLIdentity* identity)
     : identity_(identity) {
   RTC_DCHECK(identity_);
 }
 
 RTCCertificate::~RTCCertificate() {
 }
 
-uint64_t RTCCertificate::expires_timestamp_ns() const {
-  // TODO(hbos): Update once SSLIdentity/SSLCertificate supports expires field.
-  return 0;
+uint64_t RTCCertificate::Expires() const {
+  int64_t expires = ssl_certificate().CertificateExpirationTime();
+  if (expires != -1)
+    return static_cast<uint64_t>(expires) * 1000;  // s -> ms

[torbjorng (webrtc), 2015/12/07 12:43:19]

nit: use kNumMillisecsPerSec analogous to code below.

[hbos, 2015/12/07 14:20:50]

Done.

+  // If the expiration time could not be retrieved return an expired timestamp.
+  return 0;  // = 1970-01-01
 }
 
 bool RTCCertificate::HasExpired() const {
-  return expires_timestamp_ns() <= TimeNanos();
+  return Expires() <= TimeNanos() / kNumNanosecsPerMillisec;
 }
 
 const SSLCertificate& RTCCertificate::ssl_certificate() const {
   return identity_->certificate();
 }
 
 }  // namespace rtc