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

Side by Side Diff: chrome/browser/dom_ui/options/advanced_options_handler.cc

Issue 4091005: Remove SSL 2.0 support. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Sync with ToT Created 10 years 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "chrome/browser/dom_ui/options/advanced_options_handler.h" 5 #include "chrome/browser/dom_ui/options/advanced_options_handler.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 localized_strings->SetString("certificatesManageButton", 89 localized_strings->SetString("certificatesManageButton",
90 l10n_util::GetStringUTF16(IDS_OPTIONS_CERTIFICATES_MANAGE_BUTTON)); 90 l10n_util::GetStringUTF16(IDS_OPTIONS_CERTIFICATES_MANAGE_BUTTON));
91 localized_strings->SetString("proxiesLabel", 91 localized_strings->SetString("proxiesLabel",
92 l10n_util::GetStringUTF16(IDS_OPTIONS_PROXIES_LABEL)); 92 l10n_util::GetStringUTF16(IDS_OPTIONS_PROXIES_LABEL));
93 localized_strings->SetString("proxiesConfigureButton", 93 localized_strings->SetString("proxiesConfigureButton",
94 l10n_util::GetStringUTF16(IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON)); 94 l10n_util::GetStringUTF16(IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON));
95 localized_strings->SetString("safeBrowsingEnableProtection", 95 localized_strings->SetString("safeBrowsingEnableProtection",
96 l10n_util::GetStringUTF16(IDS_OPTIONS_SAFEBROWSING_ENABLEPROTECTION)); 96 l10n_util::GetStringUTF16(IDS_OPTIONS_SAFEBROWSING_ENABLEPROTECTION));
97 localized_strings->SetString("sslGroupDescription", 97 localized_strings->SetString("sslGroupDescription",
98 l10n_util::GetStringUTF16(IDS_OPTIONS_SSL_GROUP_DESCRIPTION)); 98 l10n_util::GetStringUTF16(IDS_OPTIONS_SSL_GROUP_DESCRIPTION));
99 localized_strings->SetString("sslUseSSL2",
100 l10n_util::GetStringUTF16(IDS_OPTIONS_SSL_USESSL2));
101 localized_strings->SetString("sslCheckRevocation", 99 localized_strings->SetString("sslCheckRevocation",
102 l10n_util::GetStringUTF16(IDS_OPTIONS_SSL_CHECKREVOCATION)); 100 l10n_util::GetStringUTF16(IDS_OPTIONS_SSL_CHECKREVOCATION));
103 localized_strings->SetString("sslUseSSL3", 101 localized_strings->SetString("sslUseSSL3",
104 l10n_util::GetStringUTF16(IDS_OPTIONS_SSL_USESSL3)); 102 l10n_util::GetStringUTF16(IDS_OPTIONS_SSL_USESSL3));
105 localized_strings->SetString("sslUseTLS1", 103 localized_strings->SetString("sslUseTLS1",
106 l10n_util::GetStringUTF16(IDS_OPTIONS_SSL_USETLS1)); 104 l10n_util::GetStringUTF16(IDS_OPTIONS_SSL_USETLS1));
107 localized_strings->SetString("networkDNSPrefetchEnabledDescription", 105 localized_strings->SetString("networkDNSPrefetchEnabledDescription",
108 l10n_util::GetStringUTF16(IDS_NETWORK_DNS_PREFETCH_ENABLED_DESCRIPTION)); 106 l10n_util::GetStringUTF16(IDS_NETWORK_DNS_PREFETCH_ENABLED_DESCRIPTION));
109 localized_strings->SetString("privacyContentSettingsButton", 107 localized_strings->SetString("privacyContentSettingsButton",
110 l10n_util::GetStringUTF16(IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON)); 108 l10n_util::GetStringUTF16(IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON));
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 dom_ui_->RegisterMessageCallback("showNetworkProxySettings", 255 dom_ui_->RegisterMessageCallback("showNetworkProxySettings",
258 NewCallback(this, 256 NewCallback(this,
259 &AdvancedOptionsHandler::ShowNetworkProxySettings)); 257 &AdvancedOptionsHandler::ShowNetworkProxySettings));
260 #endif 258 #endif
261 259
262 #if defined(OS_WIN) 260 #if defined(OS_WIN)
263 // Setup Windows specific callbacks. 261 // Setup Windows specific callbacks.
264 dom_ui_->RegisterMessageCallback("checkRevocationCheckboxAction", 262 dom_ui_->RegisterMessageCallback("checkRevocationCheckboxAction",
265 NewCallback(this, 263 NewCallback(this,
266 &AdvancedOptionsHandler::HandleCheckRevocationCheckbox)); 264 &AdvancedOptionsHandler::HandleCheckRevocationCheckbox));
267 dom_ui_->RegisterMessageCallback("useSSL2CheckboxAction",
268 NewCallback(this,
269 &AdvancedOptionsHandler::HandleUseSSL2Checkbox));
270 dom_ui_->RegisterMessageCallback("useSSL3CheckboxAction", 265 dom_ui_->RegisterMessageCallback("useSSL3CheckboxAction",
271 NewCallback(this, 266 NewCallback(this,
272 &AdvancedOptionsHandler::HandleUseSSL3Checkbox)); 267 &AdvancedOptionsHandler::HandleUseSSL3Checkbox));
273 dom_ui_->RegisterMessageCallback("useTLS1CheckboxAction", 268 dom_ui_->RegisterMessageCallback("useTLS1CheckboxAction",
274 NewCallback(this, 269 NewCallback(this,
275 &AdvancedOptionsHandler::HandleUseTLS1Checkbox)); 270 &AdvancedOptionsHandler::HandleUseTLS1Checkbox));
276 dom_ui_->RegisterMessageCallback("showGearsSettings", 271 dom_ui_->RegisterMessageCallback("showGearsSettings",
277 NewCallback(this, 272 NewCallback(this,
278 &AdvancedOptionsHandler::HandleShowGearsSettings)); 273 &AdvancedOptionsHandler::HandleShowGearsSettings));
279 #endif 274 #endif
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 const ListValue* args) { 361 const ListValue* args) {
367 std::string checked_str = WideToUTF8(ExtractStringValue(args)); 362 std::string checked_str = WideToUTF8(ExtractStringValue(args));
368 bool enabled = (checked_str == "true"); 363 bool enabled = (checked_str == "true");
369 std::string metric = 364 std::string metric =
370 (enabled ? "Options_CheckCertRevocation_Enable" 365 (enabled ? "Options_CheckCertRevocation_Enable"
371 : "Options_CheckCertRevocation_Disable"); 366 : "Options_CheckCertRevocation_Disable");
372 UserMetricsRecordAction(UserMetricsAction(metric.c_str())); 367 UserMetricsRecordAction(UserMetricsAction(metric.c_str()));
373 net::SSLConfigServiceWin::SetRevCheckingEnabled(enabled); 368 net::SSLConfigServiceWin::SetRevCheckingEnabled(enabled);
374 } 369 }
375 370
376 void AdvancedOptionsHandler::HandleUseSSL2Checkbox(const ListValue* args) {
377 std::string checked_str = WideToUTF8(ExtractStringValue(args));
378 bool enabled = (checked_str == "true");
379 std::string metric =
380 (enabled ? "Options_SSL2_Enable" : "Options_SSL2_Disable");
381 UserMetricsRecordAction(UserMetricsAction(metric.c_str()));
382 net::SSLConfigServiceWin::SetSSL2Enabled(enabled);
383 }
384
385 void AdvancedOptionsHandler::HandleUseSSL3Checkbox(const ListValue* args) { 371 void AdvancedOptionsHandler::HandleUseSSL3Checkbox(const ListValue* args) {
386 std::string checked_str = WideToUTF8(ExtractStringValue(args)); 372 std::string checked_str = WideToUTF8(ExtractStringValue(args));
387 bool enabled = (checked_str == "true"); 373 bool enabled = (checked_str == "true");
388 std::string metric = 374 std::string metric =
389 (enabled ? "Options_SSL3_Enable" : "Options_SSL3_Disable"); 375 (enabled ? "Options_SSL3_Enable" : "Options_SSL3_Disable");
390 UserMetricsRecordAction(UserMetricsAction(metric.c_str())); 376 UserMetricsRecordAction(UserMetricsAction(metric.c_str()));
391 net::SSLConfigServiceWin::SetSSL3Enabled(enabled); 377 net::SSLConfigServiceWin::SetSSL3Enabled(enabled);
392 } 378 }
393 379
394 void AdvancedOptionsHandler::HandleUseTLS1Checkbox(const ListValue* args) { 380 void AdvancedOptionsHandler::HandleUseTLS1Checkbox(const ListValue* args) {
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
548 } 534 }
549 StringValue label(label_str); 535 StringValue label(label_str);
550 536
551 dom_ui_->CallJavascriptFunction( 537 dom_ui_->CallJavascriptFunction(
552 L"options.AdvancedOptions.SetupProxySettingsSection", disabled, label); 538 L"options.AdvancedOptions.SetupProxySettingsSection", disabled, label);
553 } 539 }
554 540
555 #if defined(OS_WIN) 541 #if defined(OS_WIN)
556 void AdvancedOptionsHandler::SetupSSLConfigSettings() { 542 void AdvancedOptionsHandler::SetupSSLConfigSettings() {
557 bool checkRevocationSetting = false; 543 bool checkRevocationSetting = false;
558 bool useSSL2Setting = false;
559 bool useSSL3Setting = false; 544 bool useSSL3Setting = false;
560 bool useTLS1Setting = false; 545 bool useTLS1Setting = false;
561 bool disabled = false; 546 bool disabled = false;
562 547
563 net::SSLConfig config; 548 net::SSLConfig config;
564 if (net::SSLConfigServiceWin::GetSSLConfigNow(&config)) { 549 if (net::SSLConfigServiceWin::GetSSLConfigNow(&config)) {
565 checkRevocationSetting = config.rev_checking_enabled; 550 checkRevocationSetting = config.rev_checking_enabled;
566 useSSL2Setting = config.ssl2_enabled;
567 useSSL3Setting = config.ssl3_enabled; 551 useSSL3Setting = config.ssl3_enabled;
568 useTLS1Setting = config.tls1_enabled; 552 useTLS1Setting = config.tls1_enabled;
569 } else { 553 } else {
570 disabled = true; 554 disabled = true;
571 } 555 }
572 FundamentalValue disabledValue(disabled); 556 FundamentalValue disabledValue(disabled);
573 FundamentalValue checkRevocationValue(checkRevocationSetting); 557 FundamentalValue checkRevocationValue(checkRevocationSetting);
574 dom_ui_->CallJavascriptFunction( 558 dom_ui_->CallJavascriptFunction(
575 L"options.AdvancedOptions.SetCheckRevocationCheckboxState", 559 L"options.AdvancedOptions.SetCheckRevocationCheckboxState",
576 checkRevocationValue, disabledValue); 560 checkRevocationValue, disabledValue);
577 FundamentalValue useSSL2Value(useSSL2Setting);
578 dom_ui_->CallJavascriptFunction(
579 L"options.AdvancedOptions.SetUseSSL2CheckboxState",
580 useSSL2Value, disabledValue);
581 FundamentalValue useSSL3Value(useSSL3Setting); 561 FundamentalValue useSSL3Value(useSSL3Setting);
582 dom_ui_->CallJavascriptFunction( 562 dom_ui_->CallJavascriptFunction(
583 L"options.AdvancedOptions.SetUseSSL3CheckboxState", 563 L"options.AdvancedOptions.SetUseSSL3CheckboxState",
584 useSSL3Value, disabledValue); 564 useSSL3Value, disabledValue);
585 FundamentalValue useTLS1Value(useTLS1Setting); 565 FundamentalValue useTLS1Value(useTLS1Setting);
586 dom_ui_->CallJavascriptFunction( 566 dom_ui_->CallJavascriptFunction(
587 L"options.AdvancedOptions.SetUseTLS1CheckboxState", 567 L"options.AdvancedOptions.SetUseTLS1CheckboxState",
588 useTLS1Value, disabledValue); 568 useTLS1Value, disabledValue);
589 } 569 }
590 #endif 570 #endif
OLDNEW
« no previous file with comments | « chrome/browser/dom_ui/options/advanced_options_handler.h ('k') | chrome/browser/gtk/options/advanced_contents_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698