diff options
| author | hbos <hbos@webrtc.org> | 2015-12-08 02:32:17 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-08 10:32:19 +0000 |
| commit | cd6f539a083f1c5ac4a548b73c03c444a813528d (patch) | |
| tree | 2769128aa1350341478ab7bbff6582d2147f774e /webrtc/base/rtccertificate.h | |
| parent | fe32a76d6001d17c34ab597026fd1e16e5c3b9ea (diff) | |
| download | webrtc-cd6f539a083f1c5ac4a548b73c03c444a813528d.tar.gz | |
Revert of RTCCertificate::Expires() and ::HasExpired() implemented (patchset #5 id:140001 of https://codereview.webrtc.org/1494103003/ )
Reason for revert:
RTCCertificate's expires_timestamp_ns was renamed to Expires but the old function is still used in one place in Chromium...
https://uberchromegw.corp.google.com/i/chromium.webrtc.fyi/builders/Mac%20Builder/builds/7405
Original issue's description:
> RTCCertificate::Expires() and ::HasExpired() implemented using SSLCertificate::CertificateExpirationTime().
>
> NOPRESUBMIT=true
> BUG=chromium:544894
>
> Committed: https://crrev.com/20ef654174e245b3a06c9e9045bb97be9acd90cf
> Cr-Commit-Position: refs/heads/master@{#10930}
TBR=torbjorng@webrtc.org,hta@webrtc.org,kjellander@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=chromium:544894
Review URL: https://codereview.webrtc.org/1506883005
Cr-Commit-Position: refs/heads/master@{#10933}
Diffstat (limited to 'webrtc/base/rtccertificate.h')
| -rw-r--r-- | webrtc/base/rtccertificate.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/webrtc/base/rtccertificate.h b/webrtc/base/rtccertificate.h index 600739bc86..d238938ae1 100644 --- a/webrtc/base/rtccertificate.h +++ b/webrtc/base/rtccertificate.h @@ -27,11 +27,8 @@ class RTCCertificate : public RefCountInterface { // Takes ownership of |identity|. static scoped_refptr<RTCCertificate> Create(scoped_ptr<SSLIdentity> identity); - // Returns the expiration time in ms relative to epoch, 1970-01-01T00:00:00Z. - uint64_t Expires() const; - // Checks if the certificate has expired, where |now| is expressed in ms - // relative to epoch, 1970-01-01T00:00:00Z. - bool HasExpired(uint64_t now) const; + uint64_t expires_timestamp_ns() const; + bool HasExpired() const; const SSLCertificate& ssl_certificate() const; // TODO(hbos): If possible, remove once RTCCertificate and its |