From cb7d6ed68be95b3052a2fad2577213a8791ac0ac Mon Sep 17 00:00:00 2001
From: J0WI <sjw@gmx.ch>
Date: Sun, 24 May 2015 17:34:59 +0200
Subject: [PATCH 1/4] Update Swisscom.ch.xml

---
 src/chrome/content/rules/Swisscom.ch.xml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/chrome/content/rules/Swisscom.ch.xml b/src/chrome/content/rules/Swisscom.ch.xml
index 4b97f298fbe4..ab008270657c 100644
--- a/src/chrome/content/rules/Swisscom.ch.xml
+++ b/src/chrome/content/rules/Swisscom.ch.xml
@@ -1,7 +1,4 @@
 <!--
-Disabled by https-everywhere-checker because:
-Fetch error: http://swissdigicert.ch/ => https://www.swissdigicert.ch/: (6, 'Could not resolve host: swissdigicert.ch')
-Fetch error: http://www.swissdigicert.ch/ => https://www.swissdigicert.ch/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 	Other Swisscom rulesets:
 
 		- Bluewin.ch.xml
@@ -55,13 +52,11 @@ Fetch error: http://www.swissdigicert.ch/ => https://www.swissdigicert.ch/: (60,
 
 
 -->
-<ruleset name="Swisscom.ch" default_off='failed ruleset test'>
-
+<ruleset name="Swisscom.ch">
 	<target host="swisscom.ch" />
 	<target host="*.swisscom.ch" />
 	<target host="swisscom.com" />
 	<target host="*.swisscom.com" />
-	<target host="swissdigicert.ch"/>
 	<target host="www.swissdigicert.ch"/>
 
 
@@ -92,5 +87,4 @@ Fetch error: http://www.swissdigicert.ch/ => https://www.swissdigicert.ch/: (60,
 		
 	<rule from="^http://(?:www\.)?swissdigicert\.ch/"
 		to="https://www.swissdigicert.ch/"/>
-
 </ruleset>

From f07936a46e43cb6808b1b082348257ea51c9a86f Mon Sep 17 00:00:00 2001
From: J0WI <sjw@gmx.ch>
Date: Sat, 30 May 2015 21:01:21 +0200
Subject: [PATCH 2/4] Update Swisscom.ch.xml

---
 src/chrome/content/rules/Swisscom.ch.xml | 165 ++++++++++++++---------
 1 file changed, 99 insertions(+), 66 deletions(-)

diff --git a/src/chrome/content/rules/Swisscom.ch.xml b/src/chrome/content/rules/Swisscom.ch.xml
index ab008270657c..b6d5710685a0 100644
--- a/src/chrome/content/rules/Swisscom.ch.xml
+++ b/src/chrome/content/rules/Swisscom.ch.xml
@@ -5,86 +5,119 @@
 		- Bluewin-HostCenter.xml
 		- Scssstatic.ch.xml
 
-
-		- swisscom.ch.122.2o7.net
-
-			- o.swisscom.ch
-
-
-	Nonfunctional subdomains:
-
-		- web.tvair *
-		- web.tvonline *
-
-	* Shows services.snoopy; mismatched, CN: services.snoopy.swisscom.com)
-
-
 	Problematic subdomains:
-
-		- ^		(cert only matches www)
-		- de		(http reply)
-		- o		(mismatched, CN: *.122.2o7.net)
-		- sommer	(works; mismatched, CN: *.hostcenter.com)
-
-
-	Partially covered subdomains:
-
-		- de		(→ www)
-
-
-	Fully covered domains:
-
-		- swisscom.ch subdomains:
-
-			- (www.)	(^ → www)
-			- o		(→ swisscom-ch.122.2o7.net)
-			- so
-			- supportcommunity
-			- ict
-			- vidia
-			- io
-			- extranet
-			- openairbuddy
-
-		- (www.)swisscom.com
-		- services.snoopy.swisscom.com
-		- www.swissdigicert.ch
-
-
+		swisscom.ch:
+			Missmatch:
+				- community
+				- cr
+				- deezer
+				- hotspotlocator
+				- internetbox
+				- labs
+				- lpn
+				- mobileemail
+					- www.mobileemail
+				- report
+				- shoplocator
+				- sommer
+				- tvair
+					- web.tvair
+				- tvonline
+					- web.tvonline
+	
+			Unknown issuer:
+				- expats
+
+			Refused:
+				- devicesupport
+				- mobileaid
+				- tv
+
+		swisscom.com:
+			Missmatch:
+				- mobileemail
+					- www.mobileemail
+				- www.mafo
+	
+			Refused:
+				- documents
+				- ictquiz
+				- quiz365d
 -->
 <ruleset name="Swisscom.ch">
 	<target host="swisscom.ch" />
-	<target host="*.swisscom.ch" />
+	<target host="www.swisscom.ch" />
+	<target host="businessapps.swisscom.ch" />
+	<target host="cockpit.swisscom.ch" />
+	<target host="conferencing.swisscom.ch" />
+	<target host="developer.swisscom.ch" />
+	<target host="extranet.swisscom.ch" />
+	<target host="ict.swisscom.ch" />
+	<target host="io.swisscom.ch" />
+	<target host="issue.swisscom.ch" />
+	<target host="itunes.swisscom.ch" />
+	<target host="jobs.swisscom.ch" />
+	<target host="o.swisscom.ch" />
+	<target host="so.swisscom.ch" />
+	<target host="supportcommunity.swisscom.ch" />
+	<target host="tools.swisscom.ch" />
+	<target host="vidia.swisscom.ch" />
+	<target host="www2.swisscom.ch" />
+	
 	<target host="swisscom.com" />
-	<target host="*.swisscom.com" />
+	<target host="www.swisscom.com" />
+	<target host="bfm.swisscom.com" />
+	<target host="developer.swisscom.com" />
+	<target host="docsafe.swisscom.com" />
+	<target host="itsalm1.swisscom.com" />
+	<target host="jobsp.swisscom.com" />
+	<target host="remas.swisscom.com" />
+	<target host="smartlife.swisscom.com" />
+	<target host="www.smartlife.swisscom.com" />
+	<target host="wholesale.swisscom.com" />
+	<target host="services.snoopy.swisscom.com" />
+	<target host="*.hospitality.swisscom.com" />
+	<target host="*.ds01.swisscom.com" />
+	<target host="*.ds02.swisscom.com" />
+	
 	<target host="www.swissdigicert.ch"/>
 
 
-	<!--	Omniture cookies:
-					-->
-	<securecookie host="^\.swisscom\.ch$" name="^s_\w+$" />
-	<securecookie host="^www1?\.swisscom\.ch$" name=".+" />
-	<securecookie host="^(?:www\.)?swisscom\.com$" name=".+" />
+	<test url="http://bar.ds02.swisscom.com/" />
+	<test url="http://foo.ds02.swisscom.com/" />
+	<test url="http://ici.ds01.swisscom.com/" />
+	<test url="http://promo.ds01.swisscom.com/" />
+	<test url="http://www.ds02.swisscom.com/" />
 
+	<test url="http://awk.ds02.swisscom.com/" />	
+	<test url="http://belimo.ds02.swisscom.com/" />
+	<test url="http://ctera.ds02.swisscom.com/" />
+	<test url="http://finitia.ds02.swisscom.com/" />
+	<test url="http://fischerconnectors.ds02.swisscom.com/" />
+	<test url="http://lukb.ds02.swisscom.com/" />
+	<test url="http://securitonsi.ds02.swisscom.com/" />
 
-	<rule from="^http://(?:www\.)?swisscom\.ch/"
-		to="https://www.swisscom.ch/" />
+	<test url="http://cms.hospitality.swisscom.com/" />
+	<test url="http://conftool.hospitality.swisscom.com/" />
+	<test url="http://delegate.hospitality.swisscom.com/" />
+	<test url="http://extranet.hospitality.swisscom.com/" />
+	<test url="http://partnerportal.hospitality.swisscom.com/" />
+	<test url="http://portal.hospitality.swisscom.com/" />
+	<test url="http://scheduler.hospitality.swisscom.com/" />
 
-	<rule from="^http://de\.swisscom\.ch/(?:\?.*|privatkunden)?$"
-		to="https://www.swisscom.ch/de/privatkunden.html" />
 
-	<rule from="^http://de\.swisscom\.ch/its/(?:\?.*)?$"
-		to="https://www.swisscom.ch/it-services/" />
+	<!--	Omniture cookies:-->
+	<securecookie host="^\.swisscom\.ch$" name="^s_\w+$" />
+	<securecookie host="^www1?\.swisscom\.ch$" name=".+" />
+	<securecookie host="^(?:www\.)?swisscom\.com$" name=".+" />
+
 
 	<rule from="^http://o\.swisscom\.ch/"
 		to="https://swisscom-ch.122.2o7.net/" />
-
-	<rule from="^http://(so|ict|supportcommunity|vidia|io|extranet|openairbuddy)\.swisscom\.ch/"
-		to="https://$1.swisscom.ch/" />
-
-	<rule from="^http://(services\.snoopy\.|www\.)?swisscom\.com/"
-		to="https://$1swisscom.com/" />
 		
-	<rule from="^http://(?:www\.)?swissdigicert\.ch/"
-		to="https://www.swissdigicert.ch/"/>
+	<rule from="^http://itunes\.swisscom\.com/"
+		to="https://itunes.swisscom.ch/" />
+
+	<rule from="^http:"
+		to="https:" />
 </ruleset>

From 6a1521710d4de1c3093c04e28af14cb37d1484c6 Mon Sep 17 00:00:00 2001
From: J0WI <sjw@gmx.ch>
Date: Sat, 30 May 2015 21:02:14 +0200
Subject: [PATCH 3/4] Update Swisscom.ch.xml

---
 src/chrome/content/rules/Swisscom.ch.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/chrome/content/rules/Swisscom.ch.xml b/src/chrome/content/rules/Swisscom.ch.xml
index b6d5710685a0..e0f54e9d4ab0 100644
--- a/src/chrome/content/rules/Swisscom.ch.xml
+++ b/src/chrome/content/rules/Swisscom.ch.xml
@@ -40,6 +40,7 @@
 				- www.mafo
 	
 			Refused:
+				- brandcenter
 				- documents
 				- ictquiz
 				- quiz365d

From 6dac691f6e9a32849ae3a35ce04631553defc9c7 Mon Sep 17 00:00:00 2001
From: J0WI <sjw@gmx.ch>
Date: Sat, 30 May 2015 21:11:50 +0200
Subject: [PATCH 4/4] Update Swisscom.ch.xml

---
 src/chrome/content/rules/Swisscom.ch.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/chrome/content/rules/Swisscom.ch.xml b/src/chrome/content/rules/Swisscom.ch.xml
index e0f54e9d4ab0..2245f52a044b 100644
--- a/src/chrome/content/rules/Swisscom.ch.xml
+++ b/src/chrome/content/rules/Swisscom.ch.xml
@@ -71,6 +71,7 @@
 	<target host="developer.swisscom.com" />
 	<target host="docsafe.swisscom.com" />
 	<target host="itsalm1.swisscom.com" />
+	<target host="itunes.swisscom.com" />
 	<target host="jobsp.swisscom.com" />
 	<target host="remas.swisscom.com" />
 	<target host="smartlife.swisscom.com" />
@@ -84,11 +85,11 @@
 	<target host="www.swissdigicert.ch"/>
 
 
-	<test url="http://bar.ds02.swisscom.com/" />
-	<test url="http://foo.ds02.swisscom.com/" />
+	<test url="http://bar.ds01.swisscom.com/" />
+	<test url="http://foo.ds01.swisscom.com/" />
 	<test url="http://ici.ds01.swisscom.com/" />
 	<test url="http://promo.ds01.swisscom.com/" />
-	<test url="http://www.ds02.swisscom.com/" />
+	<test url="http://www.ds01.swisscom.com/" />
 
 	<test url="http://awk.ds02.swisscom.com/" />	
 	<test url="http://belimo.ds02.swisscom.com/" />