Index: webrtc/base/ssladapter_unittest.cc |
diff --git a/webrtc/base/ssladapter_unittest.cc b/webrtc/base/ssladapter_unittest.cc |
index 9b6945132ae4e9235dcce36609ca595db6f0ee9f..b8c3cc85da52704f1989f493198cb428fbb47d4c 100644 |
--- a/webrtc/base/ssladapter_unittest.cc |
+++ b/webrtc/base/ssladapter_unittest.cc |
@@ -131,7 +131,7 @@ class SSLAdapterTestDummyClient : public sigslot::has_slots<> { |
class SSLAdapterTestDummyServer : public sigslot::has_slots<> { |
public: |
explicit SSLAdapterTestDummyServer(const rtc::SSLMode& ssl_mode, |
- const rtc::KeyType key_type) |
+ const rtc::KeyTypeFull key_type) |
: ssl_mode_(ssl_mode) { |
// Generate a key pair and a certificate for this host. |
ssl_identity_.reset(rtc::SSLIdentity::Generate(GetHostname(), key_type)); |
hbos
2015/09/29 13:53:18
DCHECK(ssl_identity_.get()) after this line?
|
@@ -271,7 +271,7 @@ class SSLAdapterTestBase : public testing::Test, |
public sigslot::has_slots<> { |
public: |
explicit SSLAdapterTestBase(const rtc::SSLMode& ssl_mode, |
- const rtc::KeyType key_type) |
+ const rtc::KeyTypeFull key_type) |
: ssl_mode_(ssl_mode), |
ss_scope_(new rtc::VirtualSocketServer(NULL)), |
server_(new SSLAdapterTestDummyServer(ssl_mode_, key_type)), |
@@ -348,25 +348,25 @@ class SSLAdapterTestBase : public testing::Test, |
class SSLAdapterTestTLS_RSA : public SSLAdapterTestBase { |
public: |
SSLAdapterTestTLS_RSA() |
- : SSLAdapterTestBase(rtc::SSL_MODE_TLS, rtc::KT_RSA) {} |
+ : SSLAdapterTestBase(rtc::SSL_MODE_TLS, rtc::KeyTypeFull::RSA()) {} |
}; |
class SSLAdapterTestTLS_ECDSA : public SSLAdapterTestBase { |
public: |
SSLAdapterTestTLS_ECDSA() |
- : SSLAdapterTestBase(rtc::SSL_MODE_TLS, rtc::KT_ECDSA) {} |
+ : SSLAdapterTestBase(rtc::SSL_MODE_TLS, rtc::KeyTypeFull::ECDSA()) {} |
}; |
class SSLAdapterTestDTLS_RSA : public SSLAdapterTestBase { |
public: |
SSLAdapterTestDTLS_RSA() |
- : SSLAdapterTestBase(rtc::SSL_MODE_DTLS, rtc::KT_RSA) {} |
+ : SSLAdapterTestBase(rtc::SSL_MODE_DTLS, rtc::KeyTypeFull::RSA()) {} |
}; |
class SSLAdapterTestDTLS_ECDSA : public SSLAdapterTestBase { |
public: |
SSLAdapterTestDTLS_ECDSA() |
- : SSLAdapterTestBase(rtc::SSL_MODE_DTLS, rtc::KT_ECDSA) {} |
+ : SSLAdapterTestBase(rtc::SSL_MODE_DTLS, rtc::KeyTypeFull::ECDSA()) {} |
}; |
#if SSL_USE_OPENSSL |