Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

Side by Side Diff: webrtc/base/sslstreamadapter_unittest.cc

Issue 2204883004: Remove StartSSLWithServer from SSLStreamAdapter. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Removing unused variable. Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/base/sslstreamadapter.h ('k') | webrtc/p2p/base/dtlstransportchannel.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2011 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2011 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 ASSERT((mtu_ == 1460) && (loss_ == 0) && (lose_first_packet_ == 0)); 378 ASSERT((mtu_ == 1460) && (loss_ == 0) && (lose_first_packet_ == 0));
379 } 379 }
380 380
381 if (!identities_set_) 381 if (!identities_set_)
382 SetPeerIdentitiesByDigest(true); 382 SetPeerIdentitiesByDigest(true);
383 383
384 // Start the handshake 384 // Start the handshake
385 int rv; 385 int rv;
386 386
387 server_ssl_->SetServerRole(); 387 server_ssl_->SetServerRole();
388 rv = server_ssl_->StartSSLWithPeer(); 388 rv = server_ssl_->StartSSL();
389 ASSERT_EQ(0, rv); 389 ASSERT_EQ(0, rv);
390 390
391 rv = client_ssl_->StartSSLWithPeer(); 391 rv = client_ssl_->StartSSL();
392 ASSERT_EQ(0, rv); 392 ASSERT_EQ(0, rv);
393 393
394 // Now run the handshake 394 // Now run the handshake
395 if (expect_success) { 395 if (expect_success) {
396 EXPECT_TRUE_WAIT((client_ssl_->GetState() == rtc::SS_OPEN) 396 EXPECT_TRUE_WAIT((client_ssl_->GetState() == rtc::SS_OPEN)
397 && (server_ssl_->GetState() == rtc::SS_OPEN), 397 && (server_ssl_->GetState() == rtc::SS_OPEN),
398 handshake_wait_); 398 handshake_wait_);
399 } else { 399 } else {
400 EXPECT_TRUE_WAIT(client_ssl_->GetState() == rtc::SS_CLOSED, 400 EXPECT_TRUE_WAIT(client_ssl_->GetState() == rtc::SS_CLOSED,
401 handshake_wait_); 401 handshake_wait_);
(...skipping 756 matching lines...) Expand 10 before | Expand all | Expand 10 after
1158 rtc::KeyParams::ECDSA(rtc::EC_NIST_P256)))); 1158 rtc::KeyParams::ECDSA(rtc::EC_NIST_P256))));
1159 INSTANTIATE_TEST_CASE_P( 1159 INSTANTIATE_TEST_CASE_P(
1160 SSLStreamAdapterTestsDTLS, 1160 SSLStreamAdapterTestsDTLS,
1161 SSLStreamAdapterTestDTLS, 1161 SSLStreamAdapterTestDTLS,
1162 Combine(Values(rtc::KeyParams::RSA(1024, 65537), 1162 Combine(Values(rtc::KeyParams::RSA(1024, 65537),
1163 rtc::KeyParams::RSA(1152, 65537), 1163 rtc::KeyParams::RSA(1152, 65537),
1164 rtc::KeyParams::ECDSA(rtc::EC_NIST_P256)), 1164 rtc::KeyParams::ECDSA(rtc::EC_NIST_P256)),
1165 Values(rtc::KeyParams::RSA(1024, 65537), 1165 Values(rtc::KeyParams::RSA(1024, 65537),
1166 rtc::KeyParams::RSA(1152, 65537), 1166 rtc::KeyParams::RSA(1152, 65537),
1167 rtc::KeyParams::ECDSA(rtc::EC_NIST_P256)))); 1167 rtc::KeyParams::ECDSA(rtc::EC_NIST_P256))));
OLDNEW
« no previous file with comments | « webrtc/base/sslstreamadapter.h ('k') | webrtc/p2p/base/dtlstransportchannel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698