[or-cvs] [https-everywhere/master 1/2] Use an update-signing key

[pde at torproject.org]

Author: Peter Eckersley <pde at eff.org>
Date: Fri, 29 Oct 2010 15:49:20 -0700
Subject: Use an update-signing key
Commit: fed7d966a51e54966f73eb9a496d8b33fc52f722

---
 src/install.rdf |   59 ++++++++++++++++++++++++------------------------------
 1 files changed, 26 insertions(+), 33 deletions(-)

diff --git a/src/install.rdf b/src/install.rdf
index 19a1d42..03cb167 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -1,34 +1,27 @@
 <?xml version="1.0"?>
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
-    <Description about="urn:mozilla:install-manifest">
-        <em:name>HTTPS-Everywhere</em:name>
-        <em:creator>Mike Perry &amp; Peter Eckersley</em:creator>
-        <em:id>https-everywhere at eff.org</em:id>
-        <em:version>0.2.3.development.2</em:version>
-        <em:homepageURL>https://www.eff.org/https-everywhere</em:homepageURL>
-        <em:optionsURL>chrome://https-everywhere/content/preferences.xul</em:optionsURL>
-        <em:iconURL>chrome://https-everywhere/skin/https-everywhere.png</em:iconURL>
-        <em:updateURL>https://www.eff.org/files/https-everywhere-update.rdf</em:updateURL>
-		<em:unpack>true</em:unpack> <!-- Required for Firefox 4 -->
-        <!-- We'll use this once we're public
-        <em:updateKey>MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDPdGEDZWu/Ya4kCqsxAZSVXr5bBbBc6rpYjDJrI/4bENFXXOgSeADkv0ODzUhIztUn5i3vPwpZydomVERriXDF8FLhShEPGMN+1sC2nC9dA5MXnx67JIiZRmS84pDSklTkxvgxp89jwbB1QicQJKCCyTjvj4uKzsxlSDAKxXpRJwIDAQAB</em:updateKey>-->
-        <!-- firefox -->
-        <em:targetApplication>
-            <Description>
-                <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-                <em:minVersion>3.0</em:minVersion>
-                <em:maxVersion>4.0</em:maxVersion>
-            </Description>
-        </em:targetApplication>
-        <!-- Seamonkey -->
-        <em:targetApplication>
-            <Description>
-                <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
-                <em:minVersion>1.0</em:minVersion>
-                <em:maxVersion>2.0.*</em:maxVersion>
-            </Description>
-        </em:targetApplication>
-    </Description>
-</RDF>
+<RDF:RDF xmlns:em="http://www.mozilla.org/2004/em-rdf#"
+         xmlns:NC="http://home.netscape.com/NC-rdf#"
+         xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+  <RDF:Description RDF:about="rdf:#$RVNn+"
+                   em:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
+                   em:minVersion="3.0"
+                   em:maxVersion="4.0" />
+  <RDF:Description RDF:about="urn:mozilla:install-manifest"
+                   em:name="HTTPS-Everywhere"
+                   em:creator="Mike Perry &amp; Peter Eckersley"
+                   em:id="https-everywhere at eff.org"
+                   em:version="0.2.3.development.2"
+                   em:homepageURL="https://www.eff.org/https-everywhere"
+                   em:optionsURL="chrome://https-everywhere/content/preferences.xul"
+                   em:iconURL="chrome://https-everywhere/skin/https-everywhere.png"
+                   em:updateURL="https://www.eff.org/files/https-everywhere-update.rdf"
+                   em:unpack="true"
+                   em:updateKey="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDSry2bbc4waMQHAqFZ7dR53eJUXR8EMAW/TxMqT2Tnx1Zd16nh7RCv2/lVWpSD706SmZC39mUpJPkc53XEZtdRelWIh0+oBK5kjhDx+C+N6IzWPScbL+NdIymNpA4yIHMYkfX5XJgJ67l6JkFzqoWPorcw8dhxUeRASMwEM6B1EQIDAQAB">
+    <em:targetApplication RDF:resource="rdf:#$RVNn+"/>
+    <em:targetApplication RDF:resource="rdf:#$WVNn+"/>
+  </RDF:Description>
+  <RDF:Description RDF:about="rdf:#$WVNn+"
+                   em:id="{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}"
+                   em:minVersion="1.0"
+                   em:maxVersion="2.0.*" />
+</RDF:RDF>
-- 
1.7.1