undo SSL certificates switched to AWS

hyphanet · Apr 7, 2018 · cea38ac · cea38ac
1 parent 08c27db
commit cea38ac
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 83 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -10,6 +10,7 @@ next ():
 - optimization
 - Persist "Bookmark Updated" notifications across restarts
 - minimum bandwidth increased to 10KiB again
+- undo update of pinned SSL certificates (site no longer exists)
 
 1480:
 

diff --git a/src/freenet/clients/http/staticfiles/AmazonRootCA1.pem b/src/freenet/clients/http/staticfiles/AmazonRootCA1.pem
diff --git a/src/freenet/clients/http/staticfiles/AmazonRootCA2.pem b/src/freenet/clients/http/staticfiles/AmazonRootCA2.pem
diff --git a/src/freenet/clients/http/staticfiles/AmazonRootCA3.pem b/src/freenet/clients/http/staticfiles/AmazonRootCA3.pem
diff --git a/src/freenet/clients/http/staticfiles/AmazonRootCA4.pem b/src/freenet/clients/http/staticfiles/AmazonRootCA4.pem
diff --git a/src/freenet/pluginmanager/PluginDownLoaderOfficialHTTPS.java b/src/freenet/pluginmanager/PluginDownLoaderOfficialHTTPS.java
@@ -28,13 +28,7 @@
 
 public class PluginDownLoaderOfficialHTTPS extends PluginDownLoaderURL {
 	private static final String certurlNew = "freenet/clients/http/staticfiles/globalsign.pem";
-	// amazon root certificate, so we can rekey the S3-based site more easily
-	private static final String certurlAmazon1 = "freenet/clients/http/staticfiles/AmazonRootCA1.pem";
-	private static final String certurlAmazon2 = "freenet/clients/http/staticfiles/AmazonRootCA2.pem";
-	private static final String certurlAmazon3 = "freenet/clients/http/staticfiles/AmazonRootCA3.pem";
-	private static final String certurlAmazon4 = "freenet/clients/http/staticfiles/AmazonRootCA4.pem";
-	private static final String[] certURLs = new String[] {
-		certurlNew, certurlAmazon1, certurlAmazon2, certurlAmazon3, certurlAmazon4};
+	private static final String[] certURLs = new String[] { certurlNew };
 	public static final String certfileOld = "startssl.pem";
 	private static final String certfile = "sslcerts.pem";