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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: net/ssl/ssl_config_service_unittest.cc

Issue 1139013002: Completely remove SSLv3 support. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
« net/socket/ssl_client_socket_openssl.cc ('K') | « net/ssl/ssl_config.h ('k') | net/url_request/url_request_unittest.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 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/ssl/ssl_config_service.h" 5 #include "net/ssl/ssl_config_service.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "testing/gmock/include/gmock/gmock.h" 10 #include "testing/gmock/include/gmock/gmock.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 42
43 MOCK_METHOD0(OnSSLConfigChanged, void()); 43 MOCK_METHOD0(OnSSLConfigChanged, void());
44 }; 44 };
45 45
46 } // namespace 46 } // namespace
47 47
48 TEST(SSLConfigServiceTest, NoChangesWontNotifyObservers) { 48 TEST(SSLConfigServiceTest, NoChangesWontNotifyObservers) {
49 SSLConfig initial_config; 49 SSLConfig initial_config;
50 initial_config.rev_checking_enabled = true; 50 initial_config.rev_checking_enabled = true;
51 initial_config.false_start_enabled = false; 51 initial_config.false_start_enabled = false;
52 initial_config.version_min = SSL_PROTOCOL_VERSION_SSL3; 52 initial_config.version_min = SSL_PROTOCOL_VERSION_TLS1;
53 initial_config.version_max = SSL_PROTOCOL_VERSION_TLS1_1; 53 initial_config.version_max = SSL_PROTOCOL_VERSION_TLS1_2;
54 54
55 scoped_refptr<MockSSLConfigService> mock_service( 55 scoped_refptr<MockSSLConfigService> mock_service(
56 new MockSSLConfigService(initial_config)); 56 new MockSSLConfigService(initial_config));
57 MockSSLConfigServiceObserver observer; 57 MockSSLConfigServiceObserver observer;
58 mock_service->AddObserver(&observer); 58 mock_service->AddObserver(&observer);
59 59
60 EXPECT_CALL(observer, OnSSLConfigChanged()).Times(0); 60 EXPECT_CALL(observer, OnSSLConfigChanged()).Times(0);
61 mock_service->SetSSLConfig(initial_config); 61 mock_service->SetSSLConfig(initial_config);
62 62
63 mock_service->RemoveObserver(&observer); 63 mock_service->RemoveObserver(&observer);
64 } 64 }
65 65
66 TEST(SSLConfigServiceTest, ConfigUpdatesNotifyObservers) { 66 TEST(SSLConfigServiceTest, ConfigUpdatesNotifyObservers) {
67 SSLConfig initial_config; 67 SSLConfig initial_config;
68 initial_config.rev_checking_enabled = true; 68 initial_config.rev_checking_enabled = true;
69 initial_config.false_start_enabled = false; 69 initial_config.false_start_enabled = false;
70 initial_config.version_min = SSL_PROTOCOL_VERSION_SSL3; 70 initial_config.version_min = SSL_PROTOCOL_VERSION_TLS1;
71 initial_config.version_max = SSL_PROTOCOL_VERSION_TLS1_1; 71 initial_config.version_max = SSL_PROTOCOL_VERSION_TLS1_2;
72 72
73 scoped_refptr<MockSSLConfigService> mock_service( 73 scoped_refptr<MockSSLConfigService> mock_service(
74 new MockSSLConfigService(initial_config)); 74 new MockSSLConfigService(initial_config));
75 MockSSLConfigServiceObserver observer; 75 MockSSLConfigServiceObserver observer;
76 mock_service->AddObserver(&observer); 76 mock_service->AddObserver(&observer);
77 77
78 // Test that the basic boolean preferences trigger updates. 78 // Test that the basic boolean preferences trigger updates.
79 initial_config.rev_checking_enabled = false; 79 initial_config.rev_checking_enabled = false;
80 EXPECT_CALL(observer, OnSSLConfigChanged()).Times(1); 80 EXPECT_CALL(observer, OnSSLConfigChanged()).Times(1);
81 mock_service->SetSSLConfig(initial_config); 81 mock_service->SetSSLConfig(initial_config);
82 82
83 initial_config.false_start_enabled = true; 83 initial_config.false_start_enabled = true;
84 EXPECT_CALL(observer, OnSSLConfigChanged()).Times(1); 84 EXPECT_CALL(observer, OnSSLConfigChanged()).Times(1);
85 mock_service->SetSSLConfig(initial_config); 85 mock_service->SetSSLConfig(initial_config);
86 86
87 // Test that changing the SSL version range triggers updates. 87 // Test that changing the SSL version range triggers updates.
88 initial_config.version_min = SSL_PROTOCOL_VERSION_TLS1; 88 initial_config.version_min = SSL_PROTOCOL_VERSION_TLS1_1;
89 EXPECT_CALL(observer, OnSSLConfigChanged()).Times(1); 89 EXPECT_CALL(observer, OnSSLConfigChanged()).Times(1);
90 mock_service->SetSSLConfig(initial_config); 90 mock_service->SetSSLConfig(initial_config);
91 91
92 initial_config.version_max = SSL_PROTOCOL_VERSION_SSL3; 92 initial_config.version_max = SSL_PROTOCOL_VERSION_TLS1_1;
93 EXPECT_CALL(observer, OnSSLConfigChanged()).Times(1); 93 EXPECT_CALL(observer, OnSSLConfigChanged()).Times(1);
94 mock_service->SetSSLConfig(initial_config); 94 mock_service->SetSSLConfig(initial_config);
95 95
96 // Test that disabling certain cipher suites triggers an update. 96 // Test that disabling certain cipher suites triggers an update.
97 std::vector<uint16> disabled_ciphers; 97 std::vector<uint16> disabled_ciphers;
98 disabled_ciphers.push_back(0x0004u); 98 disabled_ciphers.push_back(0x0004u);
99 disabled_ciphers.push_back(0xBEEFu); 99 disabled_ciphers.push_back(0xBEEFu);
100 disabled_ciphers.push_back(0xDEADu); 100 disabled_ciphers.push_back(0xDEADu);
101 initial_config.disabled_cipher_suites = disabled_ciphers; 101 initial_config.disabled_cipher_suites = disabled_ciphers;
102 EXPECT_CALL(observer, OnSSLConfigChanged()).Times(1); 102 EXPECT_CALL(observer, OnSSLConfigChanged()).Times(1);
(...skipping 10 matching lines...) Expand all
113 // cipher suites disabled, triggers an update. 113 // cipher suites disabled, triggers an update.
114 disabled_ciphers.pop_back(); 114 disabled_ciphers.pop_back();
115 initial_config.disabled_cipher_suites = disabled_ciphers; 115 initial_config.disabled_cipher_suites = disabled_ciphers;
116 EXPECT_CALL(observer, OnSSLConfigChanged()).Times(1); 116 EXPECT_CALL(observer, OnSSLConfigChanged()).Times(1);
117 mock_service->SetSSLConfig(initial_config); 117 mock_service->SetSSLConfig(initial_config);
118 118
119 mock_service->RemoveObserver(&observer); 119 mock_service->RemoveObserver(&observer);
120 } 120 }
121 121
122 } // namespace net 122 } // namespace net
OLDNEW
« net/socket/ssl_client_socket_openssl.cc ('K') | « net/ssl/ssl_config.h ('k') | net/url_request/url_request_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698