| Index: webrtc/base/ssladapter.h
|
| diff --git a/webrtc/base/ssladapter.h b/webrtc/base/ssladapter.h
|
| index 0317544f92283af284478406e4f830185ae35896..3d432ecd0c714dfb21802deabea75ae699c7f629 100644
|
| --- a/webrtc/base/ssladapter.h
|
| +++ b/webrtc/base/ssladapter.h
|
| @@ -11,55 +11,9 @@
|
| #ifndef WEBRTC_BASE_SSLADAPTER_H_
|
| #define WEBRTC_BASE_SSLADAPTER_H_
|
|
|
| -#include "webrtc/base/asyncsocket.h"
|
| -#include "webrtc/base/sslstreamadapter.h"
|
|
|
| -namespace rtc {
|
| -
|
| -///////////////////////////////////////////////////////////////////////////////
|
| -
|
| -class SSLAdapter : public AsyncSocketAdapter {
|
| - public:
|
| - explicit SSLAdapter(AsyncSocket* socket)
|
| - : AsyncSocketAdapter(socket), ignore_bad_cert_(false) { }
|
| -
|
| - bool ignore_bad_cert() const { return ignore_bad_cert_; }
|
| - void set_ignore_bad_cert(bool ignore) { ignore_bad_cert_ = ignore; }
|
| -
|
| - // Do DTLS or TLS (default is TLS, if unspecified)
|
| - virtual void SetMode(SSLMode mode) = 0;
|
| -
|
| - // StartSSL returns 0 if successful.
|
| - // If StartSSL is called while the socket is closed or connecting, the SSL
|
| - // negotiation will begin as soon as the socket connects.
|
| - virtual int StartSSL(const char* hostname, bool restartable) = 0;
|
| -
|
| - // Create the default SSL adapter for this platform. On failure, returns null
|
| - // and deletes |socket|. Otherwise, the returned SSLAdapter takes ownership
|
| - // of |socket|.
|
| - static SSLAdapter* Create(AsyncSocket* socket);
|
| -
|
| - private:
|
| - // If true, the server certificate need not match the configured hostname.
|
| - bool ignore_bad_cert_;
|
| -};
|
| -
|
| -///////////////////////////////////////////////////////////////////////////////
|
| -
|
| -typedef bool (*VerificationCallback)(void* cert);
|
| -
|
| -// Call this on the main thread, before using SSL.
|
| -// Call CleanupSSLThread when finished with SSL.
|
| -bool InitializeSSL(VerificationCallback callback = nullptr);
|
| -
|
| -// Call to initialize additional threads.
|
| -bool InitializeSSLThread();
|
| -
|
| -// Call to cleanup additional threads, and also the main thread.
|
| -bool CleanupSSL();
|
| -
|
| -///////////////////////////////////////////////////////////////////////////////
|
| -
|
| -} // 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/ssladapter.h"
|
|
|
| #endif // WEBRTC_BASE_SSLADAPTER_H_
|
|
|