From bc50e937d5cd4b41553a0589ca9eb11aa546dcb4 Mon Sep 17 00:00:00 2001
From: ivysrono <ivysrono@users.noreply.github.com>
Date: Tue, 25 Jul 2017 18:58:28 +0800
Subject: [PATCH 1/4] Update FS_CDN.org.xml

---
 src/chrome/content/rules/FS_CDN.org.xml | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/chrome/content/rules/FS_CDN.org.xml b/src/chrome/content/rules/FS_CDN.org.xml
index 49dd173a8ab0..0b473d4fc7c4 100644
--- a/src/chrome/content/rules/FS_CDN.org.xml
+++ b/src/chrome/content/rules/FS_CDN.org.xml
@@ -1,17 +1,10 @@
-
 <!--
-Disabled by https-everywhere-checker because:
-Fetch error: http://edge.fscdn.org/ => https://edge.fscdn.org/: (28, 'Operation timed out after 15001 milliseconds with 0 bytes received')
-
-	For other Church of Jesus Christ of Latter-day Saints coverage, see TheChurchofJesusChristofLatterdaySaints.xml.
-
+	Related:
+		LDS.org.xml.
 -->
-<ruleset name="FS CDN.org">
-
+<ruleset name="FS_CDN.org">
 	<target host="edge.fscdn.org" />
+		<test url="http://edge.fscdn.org/assets/img/FamilySearch-donation-guidelines-Revised-04292016-55aeebad1fb45bdf05de2f103dd7b4f0.pdf" />
 
-
-	<rule from="^http:"
-		to="https:" />
-
+	<rule from="^http:" to="https:" />
 </ruleset>

From 2b837e5c7207c30d5c24e946b7c399faebaf9228 Mon Sep 17 00:00:00 2001
From: ivysrono <ivysrono@users.noreply.github.com>
Date: Tue, 25 Jul 2017 19:00:54 +0800
Subject: [PATCH 2/4] Create LDS_CDN.org.xml

---
 src/chrome/content/rules/LDS_CDN.org.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 src/chrome/content/rules/LDS_CDN.org.xml

diff --git a/src/chrome/content/rules/LDS_CDN.org.xml b/src/chrome/content/rules/LDS_CDN.org.xml
new file mode 100644
index 000000000000..4e2de37f2c97
--- /dev/null
+++ b/src/chrome/content/rules/LDS_CDN.org.xml
@@ -0,0 +1,17 @@
+<!--
+	Related:
+		LDS.org.xml
+
+	Invalid cert:
+		media2.ldscdn.org
+-->
+<ruleset name="LDS_CDN.org">
+	<target host="ldscdn.org"/>
+	<target host="www.ldscdn.org"/>
+	<target host="edge.ldscdn.org"/>
+		<test url="http://edge.ldscdn.org/ml/ldsorg/fonts/ldsicon/ldsicon.ttf" />
+	<target host="media.ldscdn.org"/>
+		<test url="http://media.ldscdn.org/images/media-library/mormonads/family-and-family-history/mormonad-invest-time-1118192-gallery.jpg" />
+
+	<rule from="^http:" to="https:"/>
+</ruleset>

From a9261e04085df643042a2f4b69eccaab25409171 Mon Sep 17 00:00:00 2001
From: ivysrono <ivysrono@users.noreply.github.com>
Date: Tue, 25 Jul 2017 19:02:21 +0800
Subject: [PATCH 3/4] Update TheChurchofJesusChristofLatterdaySaints.xml

---
 ...heChurchofJesusChristofLatterdaySaints.xml | 126 +++++-------------
 1 file changed, 31 insertions(+), 95 deletions(-)

diff --git a/src/chrome/content/rules/TheChurchofJesusChristofLatterdaySaints.xml b/src/chrome/content/rules/TheChurchofJesusChristofLatterdaySaints.xml
index 7065fae8e8d9..0216a7e59ff6 100644
--- a/src/chrome/content/rules/TheChurchofJesusChristofLatterdaySaints.xml
+++ b/src/chrome/content/rules/TheChurchofJesusChristofLatterdaySaints.xml
@@ -1,102 +1,38 @@
 <!--
- (The following is removed when the extension is built,
- allowing for notes to be viewed by other devs without 
- cluttering up the final ruleset file.)
- 
- === About ===
- 
- Secures connections to lds.org (and ldscdn.org), the official
- site of The Church of Jesus Christ of Latter-day Saints,
- also known as the 'LDS Church' or 'Mormon Church'.
- 
- As to the choice of the ruleset name, the Church prefers
- that people refer to them by their actual name and not 
- their nickname(s). This is just for future reference.
- 
- Refer to http://newsroom.lds.org/style-guide
- 
- === Notes ===
- 
- These sites appear okay:
-  tech.lds.org
-  history.lds.org
-  store.lds.org
-  institute.lds.org (just need iperceptions ruleset for full encrypt)
-  seminary.lds.org  (same as above)
-  ldsces.org  (will do later, see below)
-  
- The following sites redirect to already https supported site:
-  feeds.lds.org      	> google feedburner
-  broadcast.lds.org  	> to http://lds.org/broadcast
-  clerk.lds.org      	> http://lds.org/ldsorg/v/index.jsp...
-  scriptures.lds.org 	> lds.org/scriptures
-  music.lds.org      	> lds.org/music
-  youth.lds.org     	> lds.org/youth
-  new.lds.org			> lds.org
-  (probably more)
- 
- Following ones do not support https:
-  classic.lds.org
-  lds.org/ldsorg/... This is just the classic.lds.org under a 
-    different path. For example, the following fails to load:
-    https://lds.org/ldsorg/v/index.jsp?locale=0&vgnextoid=22dfd7256ec8b010VgnVCM1000004d82620aRCRD
-  jesuschrist.lds.org
- 
- Already forces encryption:
-  secure.lds.org
-  cdol.lds.org
- 
- ldscdn that work under https:
-  media.ldscdn.org
-  edge.ldscdn.org
-  ldscdn.org
+	Related:
+		LDS_CDN.org.xml
+		FS_CDN.org.xml
 
- ldscdn that did not work:
-  media2.ldscdn.org    invalid cert (a248.e.akamai.net)
+	404:
+		new.lds.org
 
+	Failed:
+		feeds.lds.org
+		music.lds.org
+		secure.lds.org
 
+	Too many redirects:
+		youth.lds.org
 
-ldsces.org - Try out at a later time
-<target host="ldsces.org"/>
-<rule from="^http://(?:www\.)?ldsces\.org/" to="https://ldsces.org/"/>
-
--->
-
-<ruleset name="The Church of Jesus Christ of Latter-day Saints" platform="mixedcontent">
-
-<target host="history.lds.org"/>
-<target host="store.lds.org"/>
-<target host="tech.lds.org"/>
-<target host="www.lds.org"/>
-<target host="lds.org"/>
-<!--
-Incomplete encryption without iPerceptions ruleset:
--->
-<target host="institute.lds.org"/>
-<target host="seminary.lds.org"/>
-
-<target host="edge.ldscdn.org"/>
-<target host="media.ldscdn.org"/>
-<target host="www.ldscdn.org"/>
-<target host="ldscdn.org"/>
-
-<!--
-This excludes http://lds.org/ldsorg/... (classic.lds.org) from using
-https, as some of it pages cannot be loaded (see above)
--->
-<exclusion pattern="^http://lds\.org/ldsorg"/>
-
-<!--
-Secure the cookies for the above sites (only)
+	Invalid cert:
+		ldsces.org
+		www.ldsces.org
 -->
-<securecookie host="^(?:.*\.)?lds\.org$" name=".*"/>
-<securecookie host="^(?:.*\.)?ldscdn\.org$" name=".*"/>
-
-
-<rule from="^http://(?:www\.)?lds\.org/" to="https://www.lds.org/"/>
-<rule from="^http://(history|store|tech|institute|seminary)\.lds\.org/" to="https://$1.lds.org/"/>
-
-<rule from="^http://(?:www\.)?ldscdn\.org/" to="https://www.ldscdn.org/"/>
-<rule from="^http://(edge|media)\.ldscdn\.org/" to="https://$1.ldscdn.org/"/>
-
+<ruleset name="LDS.org">
+	<target host="lds.org"/>
+	<target host="www.lds.org"/>
+	<target host="broadcast.lds.org"/>
+	<target host="cdol.lds.org"/>
+	<target host="clerk.lds.org"/>
+	<target host="history.lds.org"/>
+	<target host="ident.lds.org"/>
+		<test url="http://ident.lds.org/sso/lds/privacy.html" />
+	<target host="institute.lds.org"/>
+	<target host="outofservice.lds.org"/>
+	<target host="scriptures.lds.org"/>
+	<target host="seminary.lds.org"/>
+	<target host="store.lds.org"/>
+	<target host="tech.lds.org"/>
+
+	<rule from="^http:" to="https:"/>
 </ruleset>

From a1f0c73cfe92ac5d6bc2868ae93c409adbb2c856 Mon Sep 17 00:00:00 2001
From: ivysrono <ivysrono@users.noreply.github.com>
Date: Tue, 25 Jul 2017 19:02:49 +0800
Subject: [PATCH 4/4] Rename TheChurchofJesusChristofLatterdaySaints.xml to
 LDS.org.xml

---
 .../{TheChurchofJesusChristofLatterdaySaints.xml => LDS.org.xml}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/chrome/content/rules/{TheChurchofJesusChristofLatterdaySaints.xml => LDS.org.xml} (100%)

diff --git a/src/chrome/content/rules/TheChurchofJesusChristofLatterdaySaints.xml b/src/chrome/content/rules/LDS.org.xml
similarity index 100%
rename from src/chrome/content/rules/TheChurchofJesusChristofLatterdaySaints.xml
rename to src/chrome/content/rules/LDS.org.xml