[28643] in Source-Commits
firefox-extension commit [debian]: Do not install MIT CA for new users
daemon@ATHENA.MIT.EDU (Anders Kaseorg)
Sat Jun 25 22:13:45 2016
Date: Sat, 25 Jun 2016 22:13:41 -0400
From: Anders Kaseorg <andersk@mit.edu>
Message-Id: <201606260213.u5Q2DfYA028391@drugstore.mit.edu>
To: source-commits@mit.edu
https://github.com/mit-athena/firefox-extension/commit/d29aab6f3d2e95c7a0f68c13127ea9d671bab0d3
commit d29aab6f3d2e95c7a0f68c13127ea9d671bab0d3
Author: Anders Kaseorg <andersk@mit.edu>
Date: Thu Jun 23 03:40:05 2016 -0400
Do not install MIT CA for new users
Makefile | 1 -
VERSION | 2 +-
chrome/content/athena.properties | 4 +---
chrome/content/mitca.pem | 21 ---------------------
install.rdf | 2 +-
5 files changed, 3 insertions(+), 27 deletions(-)
diff --git a/Makefile b/Makefile
index 3edea0b..45756de 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,6 @@ CHROME_FILES = \
content/athena.dtd \
content/athena.properties \
content/athena.xul \
- content/mitca.pem \
content/csailca.pem \
skin/icon.png
diff --git a/VERSION b/VERSION
index 68e8fce..ea657e0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-10.2.2
+10.2.3
diff --git a/chrome/content/athena.properties b/chrome/content/athena.properties
index e769be3..89de267 100644
--- a/chrome/content/athena.properties
+++ b/chrome/content/athena.properties
@@ -1,7 +1,5 @@
browser.startup.homepage=http://web.mit.edu
browser.startup.homepage_reset=http://web.mit.edu
athena.help.url=http://web.mit.edu/olh
-Cert1=mitca.pem
+Cert1=csailca.pem
CertTrust1=C,c,c
-Cert2=csailca.pem
-CertTrust2=C,c,c
\ No newline at end of file
diff --git a/chrome/content/mitca.pem b/chrome/content/mitca.pem
deleted file mode 100644
index 7738838..0000000
--- a/chrome/content/mitca.pem
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDZTCCAs6gAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJVUzEW
-MBQGA1UECBMNTWFzc2FjaHVzZXR0czEuMCwGA1UEChMlTWFzc2FjaHVzZXR0cyBJ
-bnN0aXR1dGUgb2YgVGVjaG5vbG9neTEkMCIGA1UECxMbTUlUIENlcnRpZmljYXRp
-b24gQXV0aG9yaXR5MB4XDTA2MDQwODE2NTAwNFoXDTI2MDgwMTE2NTAwNFowezEL
-MAkGA1UEBhMCVVMxFjAUBgNVBAgTDU1hc3NhY2h1c2V0dHMxLjAsBgNVBAoTJU1h
-c3NhY2h1c2V0dHMgSW5zdGl0dXRlIG9mIFRlY2hub2xvZ3kxJDAiBgNVBAsTG01J
-VCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
-gYkCgYEA09Dr51G1M3Wm2KOE6gJwXM+cIOALA4uORm4VJeF39mvEcN3UFgvMEYgx
-OAvufFkkV+mNzXX4UmPdMwzwT5+1/JGuMoWMGnVjGZiGHpIjsofz9cmmopdo8uyy
-Gq2z9e0J6sznvLRkUBXmVwAaesbe/uEwWFpdq7u0HBHsZMHTpFUCAwEAAaOB+DCB
-9TAdBgNVHQ4EFgQUU/WjDwZdZdiKj1JtafrrVS29iwwwgaUGA1UdIwSBnTCBmoAU
-U/WjDwZdZdiKj1JtafrrVS29iwyhf6R9MHsxCzAJBgNVBAYTAlVTMRYwFAYDVQQI
-Ew1NYXNzYWNodXNldHRzMS4wLAYDVQQKEyVNYXNzYWNodXNldHRzIEluc3RpdHV0
-ZSBvZiBUZWNobm9sb2d5MSQwIgYDVQQLExtNSVQgQ2VydGlmaWNhdGlvbiBBdXRo
-b3JpdHmCAQEwDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAQYwEQYJYIZIAYb4QgEB
-BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4GBAMTjXyVdM89JlPTzoe3o5CIvUP6TrWMN
-Bm3/mSX5pXeZWbWLtdVfUgQ9mW6UBYXaQSUPmz9C09ZNBH8N3vOoDS5/jD8MMcV/
-U/rOAIb4v2bMRKpPweSINGm72Pv/Pg15t1sRcnatBK94orekYvfJa3PiPU/3pfge
-RYhCd9zByXr2
------END CERTIFICATE-----
diff --git a/install.rdf b/install.rdf
index c6e0a85..cd43a76 100644
--- a/install.rdf
+++ b/install.rdf
@@ -5,7 +5,7 @@
<Description about="urn:mozilla:install-manifest">
<em:id>athena@mit.edu</em:id>
- <em:version>10.2.2</em:version>
+ <em:version>10.2.3</em:version>
<em:type>2</em:type>
<!-- Target Application this extension can install into,
