| Index: webrtc/base/ssladapter_unittest.cc
|
| diff --git a/webrtc/base/ssladapter_unittest.cc b/webrtc/base/ssladapter_unittest.cc
|
| index 7869b6eb63bc04faeee50f98adda8fb941f41092..9b6945132ae4e9235dcce36609ca595db6f0ee9f 100644
|
| --- a/webrtc/base/ssladapter_unittest.cc
|
| +++ b/webrtc/base/ssladapter_unittest.cc
|
| @@ -131,10 +131,10 @@
|
| class SSLAdapterTestDummyServer : public sigslot::has_slots<> {
|
| public:
|
| explicit SSLAdapterTestDummyServer(const rtc::SSLMode& ssl_mode,
|
| - const rtc::KeyParams& key_params)
|
| + const rtc::KeyType key_type)
|
| : ssl_mode_(ssl_mode) {
|
| // Generate a key pair and a certificate for this host.
|
| - ssl_identity_.reset(rtc::SSLIdentity::Generate(GetHostname(), key_params));
|
| + ssl_identity_.reset(rtc::SSLIdentity::Generate(GetHostname(), key_type));
|
|
|
| server_socket_.reset(CreateSocket(ssl_mode_));
|
|
|
| @@ -271,10 +271,10 @@
|
| public sigslot::has_slots<> {
|
| public:
|
| explicit SSLAdapterTestBase(const rtc::SSLMode& ssl_mode,
|
| - const rtc::KeyParams& key_params)
|
| + const rtc::KeyType key_type)
|
| : ssl_mode_(ssl_mode),
|
| ss_scope_(new rtc::VirtualSocketServer(NULL)),
|
| - server_(new SSLAdapterTestDummyServer(ssl_mode_, key_params)),
|
| + server_(new SSLAdapterTestDummyServer(ssl_mode_, key_type)),
|
| client_(new SSLAdapterTestDummyClient(ssl_mode_)),
|
| handshake_wait_(kTimeout) {}
|
|
|
| @@ -348,25 +348,25 @@
|
| class SSLAdapterTestTLS_RSA : public SSLAdapterTestBase {
|
| public:
|
| SSLAdapterTestTLS_RSA()
|
| - : SSLAdapterTestBase(rtc::SSL_MODE_TLS, rtc::KeyParams::RSA()) {}
|
| + : SSLAdapterTestBase(rtc::SSL_MODE_TLS, rtc::KT_RSA) {}
|
| };
|
|
|
| class SSLAdapterTestTLS_ECDSA : public SSLAdapterTestBase {
|
| public:
|
| SSLAdapterTestTLS_ECDSA()
|
| - : SSLAdapterTestBase(rtc::SSL_MODE_TLS, rtc::KeyParams::ECDSA()) {}
|
| + : SSLAdapterTestBase(rtc::SSL_MODE_TLS, rtc::KT_ECDSA) {}
|
| };
|
|
|
| class SSLAdapterTestDTLS_RSA : public SSLAdapterTestBase {
|
| public:
|
| SSLAdapterTestDTLS_RSA()
|
| - : SSLAdapterTestBase(rtc::SSL_MODE_DTLS, rtc::KeyParams::RSA()) {}
|
| + : SSLAdapterTestBase(rtc::SSL_MODE_DTLS, rtc::KT_RSA) {}
|
| };
|
|
|
| class SSLAdapterTestDTLS_ECDSA : public SSLAdapterTestBase {
|
| public:
|
| SSLAdapterTestDTLS_ECDSA()
|
| - : SSLAdapterTestBase(rtc::SSL_MODE_DTLS, rtc::KeyParams::ECDSA()) {}
|
| + : SSLAdapterTestBase(rtc::SSL_MODE_DTLS, rtc::KT_ECDSA) {}
|
| };
|
|
|
| #if SSL_USE_OPENSSL
|
|
|