2bf0e90c9d
I'm reverting the patch due to compilation issues. It would be great if we could make sure Chromium is ready for the patch before we land it in WebRTC.
As is, we're trying to roll webrtc into Chromium and we can't (this is not the only reason though). I might reland this after the roll, depending on how that goes though.
Here's an example failure:
e:\b\build\slave\win_gn\build\src\jingle\glue\channel_socket_adapter_unittest.cc(77) : error C2259: 'jingle_glue::MockTransportChannel' : cannot instantiate abstract class
due to following members:
'bool cricket::TransportChannel::GetSslCipher(std::string *)' : is abstract
e:\b\build\slave\win_gn\build\src\third_party\webrtc\p2p\base\transportchannel.h(107) : see declaration of 'cricket::TransportChannel::GetSslCipher'
ninja: build stopped: subcommand failed.
> This CL adds an API to the SSL stream adapters and transport channels to get the SSL cipher that was negotiated with the remote peer.
>
> BUG=3976
> R=davidben@chromium.org, juberti@webrtc.org, pthatcher@webrtc.org
>
> Review URL: https://webrtc-codereview.appspot.com/26009004
TBR=pthatcher@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/40689004
Cr-Commit-Position: refs/heads/master@{#8282}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8282 4adac7df-926f-26a2-2b94-8c16560cd09d
78 lines
2.3 KiB
C++
78 lines
2.3 KiB
C++
/*
|
|
* Copyright 2004 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.
|
|
*/
|
|
|
|
#if HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif // HAVE_CONFIG_H
|
|
|
|
#include "webrtc/base/sslstreamadapter.h"
|
|
#include "webrtc/base/sslconfig.h"
|
|
|
|
#if SSL_USE_SCHANNEL
|
|
|
|
// SChannel support for DTLS and peer-to-peer mode are not
|
|
// done.
|
|
#elif SSL_USE_OPENSSL // && !SSL_USE_SCHANNEL
|
|
|
|
#include "webrtc/base/opensslstreamadapter.h"
|
|
|
|
#elif SSL_USE_NSS // && !SSL_USE_SCHANNEL && !SSL_USE_OPENSSL
|
|
|
|
#include "webrtc/base/nssstreamadapter.h"
|
|
|
|
#endif // !SSL_USE_OPENSSL && !SSL_USE_SCHANNEL && !SSL_USE_NSS
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
namespace rtc {
|
|
|
|
SSLStreamAdapter* SSLStreamAdapter::Create(StreamInterface* stream) {
|
|
#if SSL_USE_SCHANNEL
|
|
return NULL;
|
|
#elif SSL_USE_OPENSSL // !SSL_USE_SCHANNEL
|
|
return new OpenSSLStreamAdapter(stream);
|
|
#elif SSL_USE_NSS // !SSL_USE_SCHANNEL && !SSL_USE_OPENSSL
|
|
return new NSSStreamAdapter(stream);
|
|
#else // !SSL_USE_SCHANNEL && !SSL_USE_OPENSSL && !SSL_USE_NSS
|
|
return NULL;
|
|
#endif
|
|
}
|
|
|
|
// Note: this matches the logic above with SCHANNEL dominating
|
|
#if SSL_USE_SCHANNEL
|
|
bool SSLStreamAdapter::HaveDtls() { return false; }
|
|
bool SSLStreamAdapter::HaveDtlsSrtp() { return false; }
|
|
bool SSLStreamAdapter::HaveExporter() { return false; }
|
|
#elif SSL_USE_OPENSSL
|
|
bool SSLStreamAdapter::HaveDtls() {
|
|
return OpenSSLStreamAdapter::HaveDtls();
|
|
}
|
|
bool SSLStreamAdapter::HaveDtlsSrtp() {
|
|
return OpenSSLStreamAdapter::HaveDtlsSrtp();
|
|
}
|
|
bool SSLStreamAdapter::HaveExporter() {
|
|
return OpenSSLStreamAdapter::HaveExporter();
|
|
}
|
|
#elif SSL_USE_NSS
|
|
bool SSLStreamAdapter::HaveDtls() {
|
|
return NSSStreamAdapter::HaveDtls();
|
|
}
|
|
bool SSLStreamAdapter::HaveDtlsSrtp() {
|
|
return NSSStreamAdapter::HaveDtlsSrtp();
|
|
}
|
|
bool SSLStreamAdapter::HaveExporter() {
|
|
return NSSStreamAdapter::HaveExporter();
|
|
}
|
|
#endif // !SSL_USE_SCHANNEL && !SSL_USE_OPENSSL && !SSL_USE_NSS
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
} // namespace rtc
|