From 6b226773474eb0df3b13309c288f772f2a151e04 Mon Sep 17 00:00:00 2001
From: "bugzilla%arlen.demon.co.uk"
 <bugzilla%arlen.demon.co.uk@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 22 May 2006 14:33:09 +0000
Subject: [PATCH] Bug 235773 TLS ECC cipher suites: PSM backend, SeaMonkey UI
 Removal of files and entries in jar.mn r=kengert

git-svn-id: svn://10.0.0.236/trunk@198153 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../pki/resources/content/cipherinfo.js       |   0
 .../pki/resources/content/cipherinfo.xul      |   0
 .../pki/resources/content/pref-ciphers.js     |   0
 .../pki/resources/content/pref-ciphers.xul    |   0
 .../pki/resources/content/ssl2ciphers.xul     |   0
 .../pki/resources/content/ssl3tlsciphers.xul  |   0
 .../pki/resources/content/ssl3tlsciphers2.xul | 134 ------------------
 mozilla/security/manager/pki/resources/jar.mn |   6 -
 8 files changed, 140 deletions(-)
 delete mode 100644 mozilla/security/manager/pki/resources/content/cipherinfo.js
 delete mode 100644 mozilla/security/manager/pki/resources/content/cipherinfo.xul
 delete mode 100644 mozilla/security/manager/pki/resources/content/pref-ciphers.js
 delete mode 100644 mozilla/security/manager/pki/resources/content/pref-ciphers.xul
 delete mode 100644 mozilla/security/manager/pki/resources/content/ssl2ciphers.xul
 delete mode 100644 mozilla/security/manager/pki/resources/content/ssl3tlsciphers.xul
 delete mode 100644 mozilla/security/manager/pki/resources/content/ssl3tlsciphers2.xul

diff --git a/mozilla/security/manager/pki/resources/content/cipherinfo.js b/mozilla/security/manager/pki/resources/content/cipherinfo.js
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/mozilla/security/manager/pki/resources/content/cipherinfo.xul b/mozilla/security/manager/pki/resources/content/cipherinfo.xul
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/mozilla/security/manager/pki/resources/content/pref-ciphers.js b/mozilla/security/manager/pki/resources/content/pref-ciphers.js
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/mozilla/security/manager/pki/resources/content/pref-ciphers.xul b/mozilla/security/manager/pki/resources/content/pref-ciphers.xul
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/mozilla/security/manager/pki/resources/content/ssl2ciphers.xul b/mozilla/security/manager/pki/resources/content/ssl2ciphers.xul
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/mozilla/security/manager/pki/resources/content/ssl3tlsciphers.xul b/mozilla/security/manager/pki/resources/content/ssl3tlsciphers.xul
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/mozilla/security/manager/pki/resources/content/ssl3tlsciphers2.xul b/mozilla/security/manager/pki/resources/content/ssl3tlsciphers2.xul
deleted file mode 100644
index a74d849c550..00000000000
--- a/mozilla/security/manager/pki/resources/content/ssl3tlsciphers2.xul
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0"?>
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp..
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Kai Engert <kaie@netscape.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE overlay SYSTEM "chrome://pippki/locale/pref-ssl.dtd">
-
-<overlay id="ExtraSSL3TLSOverlay" 
-         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
-         xmlns:cert="http://netscape.com/rdf-cert#" 
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <vbox id="ssl3tls_extra_ciphers">
-    <groupbox align="start">
-      <caption label="&cipher.ssl3_extra.label;"/>
-
-      <grid>
-        <columns>
-          <column/>
-          <column/>
-        </columns>
-        <rows>
-          <row>
-            <checkbox label="&cipher.ssl3.dhe_rsa_aes_256_sha;"
-                      prefstring="security.ssl3.dhe_rsa_aes_256_sha"/>
-            <button label="&cipher.details;"
-                    oncommand="showInfo('security.ssl3.dhe_rsa_aes_256_sha');"/>
-          </row>
-          <row>
-            <checkbox label="&cipher.ssl3.dhe_dss_aes_256_sha;"
-                      prefstring="security.ssl3.dhe_dss_aes_256_sha"/>
-            <button label="&cipher.details;"
-                    oncommand="showInfo('security.ssl3.dhe_dss_aes_256_sha');"/>
-          </row>
-          <row>
-            <checkbox label="&cipher.ssl3.rsa_aes_256_sha;"
-                      prefstring="security.ssl3.rsa_aes_256_sha"/>
-            <button label="&cipher.details;"
-                    oncommand="showInfo('security.ssl3.rsa_aes_256_sha');"/>
-          </row>
-          <row>
-            <checkbox label="&cipher.ssl3.dhe_rsa_aes_128_sha;"
-                      prefstring="security.ssl3.dhe_rsa_aes_128_sha"/>
-            <button label="&cipher.details;"
-                    oncommand="showInfo('security.ssl3.dhe_rsa_aes_128_sha');"/>
-          </row>
-          <row>
-            <checkbox label="&cipher.ssl3.dhe_dss_aes_128_sha;"
-                      prefstring="security.ssl3.dhe_dss_aes_128_sha"/>
-            <button label="&cipher.details;"
-                    oncommand="showInfo('security.ssl3.dhe_dss_aes_128_sha');"/>
-          </row>
-          <row>
-            <checkbox label="&cipher.ssl3.rsa_aes_128_sha;"
-                      prefstring="security.ssl3.rsa_aes_128_sha"/>
-            <button label="&cipher.details;"
-                    oncommand="showInfo('security.ssl3.rsa_aes_128_sha');"/>
-          </row>
-          <row>
-            <checkbox label="&cipher.ssl3.dhe_rsa_des_ede3_sha;"
-                      prefstring="security.ssl3.dhe_rsa_des_ede3_sha"/>
-            <button label="&cipher.details;"
-                    oncommand="showInfo('security.ssl3.dhe_rsa_des_ede3_sha');"/>
-          </row>
-          <row>
-            <checkbox label="&cipher.ssl3.dhe_dss_des_ede3_sha;"
-                      prefstring="security.ssl3.dhe_dss_des_ede3_sha"/>
-            <button label="&cipher.details;"
-                    oncommand="showInfo('security.ssl3.dhe_dss_des_ede3_sha');"/>
-          </row>
-          <row>
-            <checkbox label="&cipher.ssl3.dhe_rsa_des_sha;"
-                      prefstring="security.ssl3.dhe_rsa_des_sha"/>
-            <button label="&cipher.details;"
-                    oncommand="showInfo('security.ssl3.dhe_rsa_des_sha');"/>
-          </row>
-          <row>
-            <checkbox label="&cipher.ssl3.dhe_dss_des_sha;"
-                      prefstring="security.ssl3.dhe_dss_des_sha"/>
-            <button label="&cipher.details;"
-                    oncommand="showInfo('security.ssl3.dhe_dss_des_sha');"/>
-          </row>
-          <row>
-            <checkbox label="&cipher.ssl3.rsa_null_sha;"
-                      prefstring="security.ssl3.rsa_null_sha"/>
-            <button label="&cipher.details;"
-                    oncommand="showInfo('security.ssl3.rsa_null_sha');"/>
-          </row>
-          <row>
-            <checkbox label="&cipher.ssl3.rsa_null_md5;"
-                      prefstring="security.ssl3.rsa_null_md5"/>
-            <button label="&cipher.details;"
-                    oncommand="showInfo('security.ssl3.rsa_null_md5');"/>
-          </row>
-        </rows>
-      </grid>
-    </groupbox>
-  </vbox>
-</overlay>
diff --git a/mozilla/security/manager/pki/resources/jar.mn b/mozilla/security/manager/pki/resources/jar.mn
index 6c3c7097b89..cbc26d6f7ec 100644
--- a/mozilla/security/manager/pki/resources/jar.mn
+++ b/mozilla/security/manager/pki/resources/jar.mn
@@ -13,12 +13,6 @@ pippki.jar:
     content/pippki/pref-security.js          (content/pref-security.js)
     content/pippki/pref-ssl.xul              (content/pref-ssl.xul)
     content/pippki/pref-certs.xul            (content/pref-certs.xul)
-    content/pippki/pref-ciphers.xul          (content/pref-ciphers.xul)
-    content/pippki/pref-ciphers.js           (content/pref-ciphers.js)
-    content/pippki/cipherinfo.xul            (content/cipherinfo.xul)
-    content/pippki/cipherinfo.js             (content/cipherinfo.js)
-    content/pippki/ssl3tlsciphers.xul        (content/ssl3tlsciphers.xul)
-    content/pippki/ssl3tlsciphers2.xul       (content/ssl3tlsciphers2.xul)
     content/pippki/PageInfoOverlay.xul       (content/PageInfoOverlay.xul)
     content/pippki/newserver.js              (content/newserver.js)
 *   content/pippki/newserver.xul             (content/newserver.xul)