| Index: webrtc/base/rtccertificate.h
|
| diff --git a/webrtc/base/rtccertificate.h b/webrtc/base/rtccertificate.h
|
| index dfc76808ac21f3343875d6055c2c7c0616b69cef..22d8fe754b7e7b4a8a4231b67d26cc03369e00aa 100644
|
| --- a/webrtc/base/rtccertificate.h
|
| +++ b/webrtc/base/rtccertificate.h
|
| @@ -11,77 +11,9 @@
|
| #ifndef WEBRTC_BASE_RTCCERTIFICATE_H_
|
| #define WEBRTC_BASE_RTCCERTIFICATE_H_
|
|
|
| -#include <stdint.h>
|
|
|
| -#include <memory>
|
| -
|
| -#include "webrtc/base/refcount.h"
|
| -#include "webrtc/base/scoped_ref_ptr.h"
|
| -#include "webrtc/base/sslidentity.h"
|
| -
|
| -namespace rtc {
|
| -
|
| -// This class contains PEM strings of an RTCCertificate's private key and
|
| -// certificate and acts as a text representation of RTCCertificate. Certificates
|
| -// can be serialized and deserialized to and from this format, which allows for
|
| -// cloning and storing of certificates to disk. The PEM format is that of
|
| -// |SSLIdentity::PrivateKeyToPEMString| and |SSLCertificate::ToPEMString|, e.g.
|
| -// the string representations used by OpenSSL.
|
| -class RTCCertificatePEM {
|
| - public:
|
| - RTCCertificatePEM(
|
| - const std::string& private_key,
|
| - const std::string& certificate)
|
| - : private_key_(private_key),
|
| - certificate_(certificate) {}
|
| -
|
| - const std::string& private_key() const { return private_key_; }
|
| - const std::string& certificate() const { return certificate_; }
|
| -
|
| - private:
|
| - std::string private_key_;
|
| - std::string certificate_;
|
| -};
|
| -
|
| -// A thin abstraction layer between "lower level crypto stuff" like
|
| -// SSLCertificate and WebRTC usage. Takes ownership of some lower level objects,
|
| -// reference counting protects these from premature destruction.
|
| -class RTCCertificate : public RefCountInterface {
|
| - public:
|
| - // Takes ownership of |identity|.
|
| - static scoped_refptr<RTCCertificate> Create(
|
| - std::unique_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;
|
| - const SSLCertificate& ssl_certificate() const;
|
| -
|
| - // TODO(hbos): If possible, remove once RTCCertificate and its
|
| - // ssl_certificate() is used in all relevant places. Should not pass around
|
| - // raw SSLIdentity* for the sake of accessing SSLIdentity::certificate().
|
| - // However, some places might need SSLIdentity* for its public/private key...
|
| - SSLIdentity* identity() const { return identity_.get(); }
|
| -
|
| - // To/from PEM, a text representation of the RTCCertificate.
|
| - RTCCertificatePEM ToPEM() const;
|
| - // Can return nullptr if the certificate is invalid.
|
| - static scoped_refptr<RTCCertificate> FromPEM(const RTCCertificatePEM& pem);
|
| - bool operator==(const RTCCertificate& certificate) const;
|
| - bool operator!=(const RTCCertificate& certificate) const;
|
| -
|
| - protected:
|
| - explicit RTCCertificate(SSLIdentity* identity);
|
| - ~RTCCertificate() override;
|
| -
|
| - private:
|
| - // The SSLIdentity is the owner of the SSLCertificate. To protect our
|
| - // ssl_certificate() we take ownership of |identity_|.
|
| - std::unique_ptr<SSLIdentity> identity_;
|
| -};
|
| -
|
| -} // namespace rtc
|
| +// This header is deprecated and is just left here temporarily during
|
| +// refactoring. See https://bugs.webrtc.org/7634 for more details.
|
| +#include "webrtc/rtc_base/rtccertificate.h"
|
|
|
| #endif // WEBRTC_BASE_RTCCERTIFICATE_H_
|
|
|