| OLD | NEW |
| 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 623 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 634 | 634 |
| 635 // Create two channels with DTLS 1.0 and check ciphers. | 635 // Create two channels with DTLS 1.0 and check ciphers. |
| 636 TEST_F(DtlsTransportChannelTest, TestDtls12None) { | 636 TEST_F(DtlsTransportChannelTest, TestDtls12None) { |
| 637 MAYBE_SKIP_TEST(HaveDtls); | 637 MAYBE_SKIP_TEST(HaveDtls); |
| 638 SetChannelCount(2); | 638 SetChannelCount(2); |
| 639 PrepareDtls(true, true, rtc::KT_DEFAULT); | 639 PrepareDtls(true, true, rtc::KT_DEFAULT); |
| 640 SetMaxProtocolVersions(rtc::SSL_PROTOCOL_DTLS_10, rtc::SSL_PROTOCOL_DTLS_10); | 640 SetMaxProtocolVersions(rtc::SSL_PROTOCOL_DTLS_10, rtc::SSL_PROTOCOL_DTLS_10); |
| 641 ASSERT_TRUE(Connect()); | 641 ASSERT_TRUE(Connect()); |
| 642 } | 642 } |
| 643 | 643 |
| 644 #if defined(MEMORY_SANITIZER) | |
| 645 // Fails under MemorySanitizer: | |
| 646 // See https://code.google.com/p/webrtc/issues/detail?id=5381. | |
| 647 #define MAYBE_TestDtls12Both DISABLED_TestDtls12Both | |
| 648 #else | |
| 649 #define MAYBE_TestDtls12Both TestDtls12Both | |
| 650 #endif | |
| 651 // Create two channels with DTLS 1.2 and check ciphers. | 644 // Create two channels with DTLS 1.2 and check ciphers. |
| 652 TEST_F(DtlsTransportChannelTest, MAYBE_TestDtls12Both) { | 645 TEST_F(DtlsTransportChannelTest, TestDtls12Both) { |
| 653 MAYBE_SKIP_TEST(HaveDtls); | 646 MAYBE_SKIP_TEST(HaveDtls); |
| 654 SetChannelCount(2); | 647 SetChannelCount(2); |
| 655 PrepareDtls(true, true, rtc::KT_DEFAULT); | 648 PrepareDtls(true, true, rtc::KT_DEFAULT); |
| 656 SetMaxProtocolVersions(rtc::SSL_PROTOCOL_DTLS_12, rtc::SSL_PROTOCOL_DTLS_12); | 649 SetMaxProtocolVersions(rtc::SSL_PROTOCOL_DTLS_12, rtc::SSL_PROTOCOL_DTLS_12); |
| 657 ASSERT_TRUE(Connect()); | 650 ASSERT_TRUE(Connect()); |
| 658 } | 651 } |
| 659 | 652 |
| 660 // Create two channels with DTLS 1.0 / DTLS 1.2 and check ciphers. | 653 // Create two channels with DTLS 1.0 / DTLS 1.2 and check ciphers. |
| 661 TEST_F(DtlsTransportChannelTest, TestDtls12Client1) { | 654 TEST_F(DtlsTransportChannelTest, TestDtls12Client1) { |
| 662 MAYBE_SKIP_TEST(HaveDtls); | 655 MAYBE_SKIP_TEST(HaveDtls); |
| (...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 891 // Each side's remote certificate is the other side's local certificate. | 884 // Each side's remote certificate is the other side's local certificate. |
| 892 ASSERT_TRUE( | 885 ASSERT_TRUE( |
| 893 client1_.transport()->GetRemoteSSLCertificate(remote_cert1.accept())); | 886 client1_.transport()->GetRemoteSSLCertificate(remote_cert1.accept())); |
| 894 ASSERT_EQ(remote_cert1->ToPEMString(), | 887 ASSERT_EQ(remote_cert1->ToPEMString(), |
| 895 certificate2->ssl_certificate().ToPEMString()); | 888 certificate2->ssl_certificate().ToPEMString()); |
| 896 ASSERT_TRUE( | 889 ASSERT_TRUE( |
| 897 client2_.transport()->GetRemoteSSLCertificate(remote_cert2.accept())); | 890 client2_.transport()->GetRemoteSSLCertificate(remote_cert2.accept())); |
| 898 ASSERT_EQ(remote_cert2->ToPEMString(), | 891 ASSERT_EQ(remote_cert2->ToPEMString(), |
| 899 certificate1->ssl_certificate().ToPEMString()); | 892 certificate1->ssl_certificate().ToPEMString()); |
| 900 } | 893 } |
| OLD | NEW |