OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright 2015 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2015 The WebRTC Project Authors. All rights reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
(...skipping 10 matching lines...) Expand all Loading... | |
21 } | 21 } |
22 | 22 |
23 RTCCertificate::RTCCertificate(SSLIdentity* identity) | 23 RTCCertificate::RTCCertificate(SSLIdentity* identity) |
24 : identity_(identity) { | 24 : identity_(identity) { |
25 RTC_DCHECK(identity_); | 25 RTC_DCHECK(identity_); |
26 } | 26 } |
27 | 27 |
28 RTCCertificate::~RTCCertificate() { | 28 RTCCertificate::~RTCCertificate() { |
29 } | 29 } |
30 | 30 |
31 uint64_t RTCCertificate::expires_timestamp_ns() const { | 31 uint64_t RTCCertificate::Expires() const { |
32 // TODO(hbos): Update once SSLIdentity/SSLCertificate supports expires field. | 32 int64_t expires = ssl_certificate().CertificateExpirationTime(); |
33 if (expires != -1) | |
34 return static_cast<uint64_t>(expires * 1000); // s -> ms | |
torbjorng (webrtc)
2015/12/03 13:05:18
nit: if uint64_t vs int64_t typing different reall
hbos
2015/12/03 16:03:48
Done. (It would work implicitly anyway just wanted
| |
35 // If the expiration time could not be retrieved return an expired timestamp. | |
torbjorng (webrtc)
2015/12/03 13:05:18
Might add why 0 is expired (i.e., say that this is
hbos
2015/12/03 16:03:48
Done.
| |
33 return 0; | 36 return 0; |
34 } | 37 } |
35 | 38 |
36 bool RTCCertificate::HasExpired() const { | 39 bool RTCCertificate::HasExpired() const { |
37 return expires_timestamp_ns() <= TimeNanos(); | 40 return Expires() <= TimeMicros(); |
torbjorng (webrtc)
2015/12/03 13:05:18
Isn't Expires in ms and TimeMicros in ms/1000?
hbos
2015/12/03 16:03:48
Yes, oops, clumsy.
| |
38 } | 41 } |
39 | 42 |
40 const SSLCertificate& RTCCertificate::ssl_certificate() const { | 43 const SSLCertificate& RTCCertificate::ssl_certificate() const { |
41 return identity_->certificate(); | 44 return identity_->certificate(); |
42 } | 45 } |
43 | 46 |
44 } // namespace rtc | 47 } // namespace rtc |
OLD | NEW |