Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

Commit 67d81b5

Browse files
author
Brian Smith
committed
Bug 733632: Remove SSL/TLS Version UI, r=kaie, r=bsmith
--HG-- extra : rebase_source : cc07bd85a1edca19844fa41da2b0572538fff9c7
1 parent 0c3a721 commit 67d81b5

5 files changed

Lines changed: 7 additions & 94 deletions

File tree

‎browser/components/preferences/advanced.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -706,10 +706,6 @@ var gAdvancedPane = {
706706
/*
707707
* Preferences:
708708
*
709-
* security.enable_ssl3
710-
* - true if SSL 3 encryption is enabled, false otherwise
711-
* security.enable_tls
712-
* - true if TLS encryption is enabled, false otherwise
713709
* security.default_personal_cert
714710
* - a string:
715711
* "Select Automatically" select a certificate automatically when a site

‎browser/components/preferences/advanced.xul‎

Lines changed: 3 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,6 @@
9191
<preference id="browser.search.update" name="browser.search.update" type="bool"/>
9292

9393
<!-- Encryption tab -->
94-
<preference id="security.enable_ssl3" name="security.enable_ssl3" type="bool"/>
95-
<preference id="security.enable_tls" name="security.enable_tls" type="bool"/>
96-
9794
<preference id="security.default_personal_cert" name="security.default_personal_cert" type="string"/>
9895

9996
<preference id="security.disable_button.openCertManager"
@@ -124,7 +121,7 @@
124121
#endif
125122
<tab id="networkTab" label="&networkTab.label;" helpTopic="prefs-advanced-network"/>
126123
<tab id="updateTab" label="&updateTab.label;" helpTopic="prefs-advanced-update"/>
127-
<tab id="encryptionTab" label="&encryptionTab.label;" helpTopic="prefs-advanced-encryption"/>
124+
<tab id="encryptionTab" label="&certificateTab.label;" helpTopic="prefs-advanced-encryption"/>
128125
</tabs>
129126

130127
<tabpanels flex="1">
@@ -384,39 +381,9 @@
384381
</groupbox>
385382
</tabpanel>
386383

387-
<!-- Encryption -->
384+
<!-- Certificates -->
388385
<tabpanel id="encryptionPanel" orient="vertical">
389386

390-
<!-- Protocols -->
391-
<groupbox id="protocolsGroup">
392-
<caption label="&protocols.label;"/>
393-
394-
<grid>
395-
<columns>
396-
<column flex="1"/>
397-
<column flex="1"/>
398-
</columns>
399-
<rows>
400-
<row>
401-
<hbox>
402-
<checkbox id="useSSL3" label="&useSSL3.label;"
403-
accesskey="&useSSL3.accesskey;"
404-
preference="security.enable_ssl3"/>
405-
</hbox>
406-
<hbox>
407-
<checkbox id="useTLS1" label="&useTLS1.label;"
408-
accesskey="&useTLS1.accesskey;"
409-
preference="security.enable_tls"/>
410-
</hbox>
411-
</row>
412-
</rows>
413-
</grid>
414-
</groupbox>
415-
416-
<!-- Certificates -->
417-
<groupbox id="certificatesGroup">
418-
<caption id="CertGroupCaption" label="&certificates.label;"/>
419-
420387
<description id="CertSelectionDesc" control="certSelection">&certSelection.description;</description>
421388

422389
<!--
@@ -426,7 +393,7 @@
426393
-->
427394
<radiogroup id="certSelection" orient="horizontal" preftype="string"
428395
preference="security.default_personal_cert"
429-
aria-labelledby="CertGroupCaption CertSelectionDesc">
396+
aria-labelledby="CertSelectionDesc">
430397
<radio label="&certs.auto;" accesskey="&certs.auto.accesskey;"
431398
value="Select Automatically"/>
432399
<radio label="&certs.ask;" accesskey="&certs.ask.accesskey;"
@@ -462,7 +429,6 @@
462429
#ifdef XP_MACOSX
463430
</vbox>
464431
#endif
465-
</groupbox>
466432
</tabpanel>
467433

468434
</tabpanels>

‎browser/components/preferences/in-content/advanced.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -680,10 +680,6 @@ var gAdvancedPane = {
680680
/*
681681
* Preferences:
682682
*
683-
* security.enable_ssl3
684-
* - true if SSL 3 encryption is enabled, false otherwise
685-
* security.enable_tls
686-
* - true if TLS encryption is enabled, false otherwise
687683
* security.default_personal_cert
688684
* - a string:
689685
* "Select Automatically" select a certificate automatically when a site

‎browser/components/preferences/in-content/advanced.xul‎

Lines changed: 3 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,6 @@
103103
type="bool"/>
104104

105105
<!-- Encryption tab -->
106-
<preference id="security.enable_ssl3"
107-
name="security.enable_ssl3"
108-
type="bool"/>
109-
<preference id="security.enable_tls"
110-
name="security.enable_tls"
111-
type="bool"/>
112-
113106
<preference id="security.default_personal_cert"
114107
name="security.default_personal_cert"
115108
type="string"/>
@@ -146,7 +139,7 @@
146139
#endif
147140
<tab id="networkTab" label="&networkTab.label;" helpTopic="prefs-advanced-network"/>
148141
<tab id="updateTab" label="&updateTab.label;" helpTopic="prefs-advanced-update"/>
149-
<tab id="encryptionTab" label="&encryptionTab.label;" helpTopic="prefs-advanced-encryption"/>
142+
<tab id="encryptionTab" label="&certificateTab.label;" helpTopic="prefs-advanced-encryption"/>
150143
</tabs>
151144

152145
<tabpanels flex="1">
@@ -403,39 +396,9 @@
403396
</groupbox>
404397
</tabpanel>
405398

406-
<!-- Encryption -->
399+
<!-- Certificates -->
407400
<tabpanel id="encryptionPanel" orient="vertical">
408401

409-
<!-- Protocols -->
410-
<groupbox id="protocolsGroup">
411-
<caption label="&protocols.label;"/>
412-
413-
<grid>
414-
<columns>
415-
<column flex="1"/>
416-
<column flex="1"/>
417-
</columns>
418-
<rows>
419-
<row>
420-
<hbox>
421-
<checkbox id="useSSL3" label="&useSSL3.label;"
422-
accesskey="&useSSL3.accesskey;"
423-
preference="security.enable_ssl3"/>
424-
</hbox>
425-
<hbox>
426-
<checkbox id="useTLS1" label="&useTLS1.label;"
427-
accesskey="&useTLS1.accesskey;"
428-
preference="security.enable_tls"/>
429-
</hbox>
430-
</row>
431-
</rows>
432-
</grid>
433-
</groupbox>
434-
435-
<!-- Certificates -->
436-
<groupbox id="certificatesGroup">
437-
<caption id="CertGroupCaption" label="&certificates.label;"/>
438-
439402
<description id="CertSelectionDesc" control="certSelection">&certSelection.description;</description>
440403

441404
<!--
@@ -445,7 +408,7 @@
445408
-->
446409
<radiogroup id="certSelection" orient="horizontal" preftype="string"
447410
preference="security.default_personal_cert"
448-
aria-labelledby="CertGroupCaption CertSelectionDesc">
411+
aria-labelledby="CertSelectionDesc">
449412
<radio label="&certs.auto;" accesskey="&certs.auto.accesskey;"
450413
value="Select Automatically"/>
451414
<radio label="&certs.ask;" accesskey="&certs.ask.accesskey;"
@@ -481,7 +444,6 @@
481444
#ifdef XP_MACOSX
482445
</vbox>
483446
#endif
484-
</groupbox>
485447
</tabpanel>
486448
</tabpanels>
487449
</tabbox>

‎browser/locales/en-US/chrome/browser/preferences/advanced.dtd‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,7 @@
115115
<!ENTITY offlineAppsListRemove.accesskey "R">
116116
<!ENTITY offlineAppRemove.confirm "Remove offline data">
117117

118-
<!ENTITY encryptionTab.label "Encryption">
119-
120-
<!ENTITY protocols.label "Protocols">
121-
<!ENTITY useSSL3.label "Use SSL 3.0">
122-
<!ENTITY useSSL3.accesskey "3">
123-
<!ENTITY useTLS1.label "Use TLS 1.0">
124-
<!ENTITY useTLS1.accesskey "1">
125-
<!ENTITY certificates.label "Certificates">
118+
<!ENTITY certificateTab.label "Certificates">
126119
<!ENTITY certSelection.description "When a server requests my personal certificate:">
127120
<!ENTITY certs.auto "Select one automatically">
128121
<!ENTITY certs.auto.accesskey "l">

0 commit comments

Comments
 (0)