From 7c0cbc1f35b5286ae1fe95c41431c7d089ede684 Mon Sep 17 00:00:00 2001
From: Pavel Valach <paulos@sin.cvut.cz>
Date: Mon, 7 Oct 2024 22:47:04 +0200
Subject: [PATCH] Add Sincoolka FT again, change filenames, modify WLAN profile
 XML files to conform to EAP-TTLS specs

---
 Wi-Fi-Sincoolka 5G.xml | 71 ------------------------------------------
 Wi-Fi-Sincoolka.xml    | 69 ++++++++++++++++++----------------------
 Wi-Fi-Sincoolka5G.xml  | 62 ++++++++++++++++++++++++++++++++++++
 Wi-Fi-SincoolkaFT.xml  | 62 ++++++++++++++++++++++++++++++++++++
 sin-setup.bat          |  4 +--
 5 files changed, 156 insertions(+), 112 deletions(-)
 delete mode 100644 Wi-Fi-Sincoolka 5G.xml
 create mode 100644 Wi-Fi-Sincoolka5G.xml
 create mode 100644 Wi-Fi-SincoolkaFT.xml

diff --git a/Wi-Fi-Sincoolka 5G.xml b/Wi-Fi-Sincoolka 5G.xml
deleted file mode 100644
index 7ddcb7e..0000000
--- a/Wi-Fi-Sincoolka 5G.xml	
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0"?>
-<WLANProfile xmlns="http://www.microsoft.com/networking/WLAN/profile/v1">
-	<name>Sincoolka 5G</name>
-	<SSIDConfig>
-		<SSID>
-			<hex>53696E636F6F6C6B61203547</hex>
-			<name>Sincoolka 5G</name>
-		</SSID>
-	</SSIDConfig>
-	<connectionType>ESS</connectionType>
-	<connectionMode>auto</connectionMode>
-	<MSM>
-		<security>
-			<authEncryption>
-				<authentication>WPA2</authentication>
-				<encryption>AES</encryption>
-				<useOneX>true</useOneX>
-			</authEncryption>
-			<PMKCacheMode>enabled</PMKCacheMode>
-			<PMKCacheTTL>720</PMKCacheTTL>
-			<PMKCacheSize>128</PMKCacheSize>
-			<preAuthMode>disabled</preAuthMode>
-			<OneX xmlns="http://www.microsoft.com/networking/OneX/v1">
-				<authMode>user</authMode>
-				<EAPConfig>
-          <EapHostConfig xmlns="http://www.microsoft.com/provisioning/EapHostConfig">
-            <EapMethod>
-              <Type xmlns="http://www.microsoft.com/provisioning/EapCommon">25</Type>
-              <VendorId xmlns="http://www.microsoft.com/provisioning/EapCommon">0</VendorId>
-              <VendorType xmlns="http://www.microsoft.com/provisioning/EapCommon">0</VendorType>
-              <AuthorId xmlns="http://www.microsoft.com/provisioning/EapCommon">0</AuthorId>
-            </EapMethod>
-            <Config xmlns="http://www.microsoft.com/provisioning/EapHostConfig">
-              <Eap xmlns="http://www.microsoft.com/provisioning/BaseEapConnectionPropertiesV1">
-                <Type>25</Type>
-                <EapType xmlns="http://www.microsoft.com/provisioning/MsPeapConnectionPropertiesV1">
-                  <ServerValidation>
-                    <DisableUserPromptForServerValidation>false</DisableUserPromptForServerValidation>
-                    <ServerNames>radius.sin.cvut.cz</ServerNames>
-                    <TrustedRootCA>2b 8f 1b 57 33 0d bb a2 d0 7a 6c 51 f7 0e e9 0d da b9 ad 8e </TrustedRootCA>
-                  </ServerValidation>
-                  <FastReconnect>true</FastReconnect>
-                  <InnerEapOptional>false</InnerEapOptional>
-                  <Eap xmlns="http://www.microsoft.com/provisioning/BaseEapConnectionPropertiesV1">
-                    <Type>26</Type>
-                    <EapType xmlns="http://www.microsoft.com/provisioning/MsChapV2ConnectionPropertiesV1">
-                      <UseWinLogonCredentials>false</UseWinLogonCredentials>
-                    </EapType>
-                  </Eap>
-                  <EnableQuarantineChecks>false</EnableQuarantineChecks>
-                  <RequireCryptoBinding>false</RequireCryptoBinding>
-                  <PeapExtensions>
-                    <PerformServerValidation xmlns="http://www.microsoft.com/provisioning/MsPeapConnectionPropertiesV2">true</PerformServerValidation>
-                    <AcceptServerName xmlns="http://www.microsoft.com/provisioning/MsPeapConnectionPropertiesV2">true</AcceptServerName>
-                    <PeapExtensionsV2 xmlns="http://www.microsoft.com/provisioning/MsPeapConnectionPropertiesV2">
-                      <AllowPromptingWhenServerCANotFound xmlns="http://www.microsoft.com/provisioning/MsPeapConnectionPropertiesV3">true</AllowPromptingWhenServerCANotFound>
-                    </PeapExtensionsV2>
-                  </PeapExtensions>
-                </EapType>
-              </Eap>
-            </Config>
-          </EapHostConfig>
-        </EAPConfig>
-			</OneX>
-		</security>
-	</MSM>
-	<MacRandomization xmlns="http://www.microsoft.com/networking/WLAN/profile/v3">
-		<enableRandomization>false</enableRandomization>
-		<randomizationSeed>1813427014</randomizationSeed>
-	</MacRandomization>
-</WLANProfile>
diff --git a/Wi-Fi-Sincoolka.xml b/Wi-Fi-Sincoolka.xml
index 0656bf4..4415f18 100644
--- a/Wi-Fi-Sincoolka.xml
+++ b/Wi-Fi-Sincoolka.xml
@@ -6,9 +6,11 @@
 			<hex>53696E636F6F6C6B61</hex>
 			<name>Sincoolka</name>
 		</SSID>
+		<nonBroadcast>false</nonBroadcast>
 	</SSIDConfig>
 	<connectionType>ESS</connectionType>
 	<connectionMode>auto</connectionMode>
+	<autoSwitch>false</autoSwitch>
 	<MSM>
 		<security>
 			<authEncryption>
@@ -21,46 +23,35 @@
 			<PMKCacheSize>128</PMKCacheSize>
 			<preAuthMode>disabled</preAuthMode>
 			<OneX xmlns="http://www.microsoft.com/networking/OneX/v1">
+				<cacheUserData>true</cacheUserData>
 				<authMode>user</authMode>
 				<EAPConfig>
-          <EapHostConfig xmlns="http://www.microsoft.com/provisioning/EapHostConfig">
-            <EapMethod>
-              <Type xmlns="http://www.microsoft.com/provisioning/EapCommon">25</Type>
-              <VendorId xmlns="http://www.microsoft.com/provisioning/EapCommon">0</VendorId>
-              <VendorType xmlns="http://www.microsoft.com/provisioning/EapCommon">0</VendorType>
-              <AuthorId xmlns="http://www.microsoft.com/provisioning/EapCommon">0</AuthorId>
-            </EapMethod>
-            <Config xmlns="http://www.microsoft.com/provisioning/EapHostConfig">
-              <Eap xmlns="http://www.microsoft.com/provisioning/BaseEapConnectionPropertiesV1">
-                <Type>25</Type>
-                <EapType xmlns="http://www.microsoft.com/provisioning/MsPeapConnectionPropertiesV1">
-                  <ServerValidation>
-                    <DisableUserPromptForServerValidation>false</DisableUserPromptForServerValidation>
-                    <ServerNames>radius.sin.cvut.cz</ServerNames>
-                    <TrustedRootCA>2b 8f 1b 57 33 0d bb a2 d0 7a 6c 51 f7 0e e9 0d da b9 ad 8e </TrustedRootCA>
-                  </ServerValidation>
-                  <FastReconnect>true</FastReconnect>
-                  <InnerEapOptional>false</InnerEapOptional>
-                  <Eap xmlns="http://www.microsoft.com/provisioning/BaseEapConnectionPropertiesV1">
-                    <Type>26</Type>
-                    <EapType xmlns="http://www.microsoft.com/provisioning/MsChapV2ConnectionPropertiesV1">
-                      <UseWinLogonCredentials>false</UseWinLogonCredentials>
-                    </EapType>
-                  </Eap>
-                  <EnableQuarantineChecks>false</EnableQuarantineChecks>
-                  <RequireCryptoBinding>false</RequireCryptoBinding>
-                  <PeapExtensions>
-                    <PerformServerValidation xmlns="http://www.microsoft.com/provisioning/MsPeapConnectionPropertiesV2">true</PerformServerValidation>
-                    <AcceptServerName xmlns="http://www.microsoft.com/provisioning/MsPeapConnectionPropertiesV2">true</AcceptServerName>
-                    <PeapExtensionsV2 xmlns="http://www.microsoft.com/provisioning/MsPeapConnectionPropertiesV2">
-                      <AllowPromptingWhenServerCANotFound xmlns="http://www.microsoft.com/provisioning/MsPeapConnectionPropertiesV3">true</AllowPromptingWhenServerCANotFound>
-                    </PeapExtensionsV2>
-                  </PeapExtensions>
-                </EapType>
-              </Eap>
-            </Config>
-          </EapHostConfig>
-        </EAPConfig>
+					<EapHostConfig xmlns="http://www.microsoft.com/provisioning/EapHostConfig">
+						<EapMethod>
+							<Type xmlns="http://www.microsoft.com/provisioning/EapCommon">21</Type>
+							<VendorId xmlns="http://www.microsoft.com/provisioning/EapCommon">0</VendorId>
+							<VendorType xmlns="http://www.microsoft.com/provisioning/EapCommon">0</VendorType>
+							<AuthorId xmlns="http://www.microsoft.com/provisioning/EapCommon">311</AuthorId>
+						</EapMethod>
+						<Config xmlns="http://www.microsoft.com/provisioning/EapHostConfig">
+							<EapTtls
+								xmlns="http://www.microsoft.com/provisioning/EapTtlsConnectionPropertiesV1">
+								<ServerValidation>
+									<ServerNames>radius.sin.cvut.cz</ServerNames>
+									<TrustedRootCAHash>2b 8f 1b 57 33 d bb a2 d0 7a 6c 51 f7 e e9 d da b9 ad 8e </TrustedRootCAHash>
+									<DisablePrompt>true</DisablePrompt>
+								</ServerValidation>
+								<Phase2Authentication>
+									<PAPAuthentication />
+								</Phase2Authentication>
+								<Phase1Identity>
+									<IdentityPrivacy>true</IdentityPrivacy>
+									<AnonymousIdentity>anonymous@sin.cvut.cz</AnonymousIdentity>
+								</Phase1Identity>
+							</EapTtls>
+						</Config>
+					</EapHostConfig>
+				</EAPConfig>
 			</OneX>
 		</security>
 	</MSM>
@@ -68,4 +59,4 @@
 		<enableRandomization>false</enableRandomization>
 		<randomizationSeed>1813427014</randomizationSeed>
 	</MacRandomization>
-</WLANProfile>
+</WLANProfile>
\ No newline at end of file
diff --git a/Wi-Fi-Sincoolka5G.xml b/Wi-Fi-Sincoolka5G.xml
new file mode 100644
index 0000000..8033972
--- /dev/null
+++ b/Wi-Fi-Sincoolka5G.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<WLANProfile xmlns="http://www.microsoft.com/networking/WLAN/profile/v1">
+	<name>Sincoolka 5G</name>
+	<SSIDConfig>
+		<SSID>
+			<hex>53696E636F6F6C6B61203547</hex>
+			<name>Sincoolka 5G</name>
+		</SSID>
+		<nonBroadcast>false</nonBroadcast>
+	</SSIDConfig>
+	<connectionType>ESS</connectionType>
+	<connectionMode>auto</connectionMode>
+	<autoSwitch>false</autoSwitch>
+	<MSM>
+		<security>
+			<authEncryption>
+				<authentication>WPA2</authentication>
+				<encryption>AES</encryption>
+				<useOneX>true</useOneX>
+			</authEncryption>
+			<PMKCacheMode>enabled</PMKCacheMode>
+			<PMKCacheTTL>10</PMKCacheTTL>
+			<PMKCacheSize>128</PMKCacheSize>
+			<preAuthMode>disabled</preAuthMode>
+			<OneX xmlns="http://www.microsoft.com/networking/OneX/v1">
+				<cacheUserData>true</cacheUserData>
+				<authMode>user</authMode>
+				<EAPConfig>
+					<EapHostConfig xmlns="http://www.microsoft.com/provisioning/EapHostConfig">
+						<EapMethod>
+							<Type xmlns="http://www.microsoft.com/provisioning/EapCommon">21</Type>
+							<VendorId xmlns="http://www.microsoft.com/provisioning/EapCommon">0</VendorId>
+							<VendorType xmlns="http://www.microsoft.com/provisioning/EapCommon">0</VendorType>
+							<AuthorId xmlns="http://www.microsoft.com/provisioning/EapCommon">311</AuthorId>
+						</EapMethod>
+						<Config xmlns="http://www.microsoft.com/provisioning/EapHostConfig">
+							<EapTtls
+								xmlns="http://www.microsoft.com/provisioning/EapTtlsConnectionPropertiesV1">
+								<ServerValidation>
+									<ServerNames>radius.sin.cvut.cz</ServerNames>
+									<TrustedRootCAHash>2b 8f 1b 57 33 d bb a2 d0 7a 6c 51 f7 e e9 d da b9 ad 8e </TrustedRootCAHash>
+									<DisablePrompt>true</DisablePrompt>
+								</ServerValidation>
+								<Phase2Authentication>
+									<PAPAuthentication />
+								</Phase2Authentication>
+								<Phase1Identity>
+									<IdentityPrivacy>true</IdentityPrivacy>
+									<AnonymousIdentity>anonymous@sin.cvut.cz</AnonymousIdentity>
+								</Phase1Identity>
+							</EapTtls>
+						</Config>
+					</EapHostConfig>
+				</EAPConfig>
+			</OneX>
+		</security>
+	</MSM>
+	<MacRandomization xmlns="http://www.microsoft.com/networking/WLAN/profile/v3">
+		<enableRandomization>false</enableRandomization>
+		<randomizationSeed>1813427014</randomizationSeed>
+	</MacRandomization>
+</WLANProfile>
\ No newline at end of file
diff --git a/Wi-Fi-SincoolkaFT.xml b/Wi-Fi-SincoolkaFT.xml
new file mode 100644
index 0000000..c51926c
--- /dev/null
+++ b/Wi-Fi-SincoolkaFT.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<WLANProfile xmlns="http://www.microsoft.com/networking/WLAN/profile/v1">
+	<name>Sincoolka FT</name>
+	<SSIDConfig>
+		<SSID>
+			<hex>53696E636F6F6C6B61204654</hex>
+			<name>Sincoolka FT</name>
+		</SSID>
+		<nonBroadcast>false</nonBroadcast>
+	</SSIDConfig>
+	<connectionType>ESS</connectionType>
+	<connectionMode>auto</connectionMode>
+	<autoSwitch>false</autoSwitch>
+	<MSM>
+		<security>
+			<authEncryption>
+				<authentication>WPA2</authentication>
+				<encryption>AES</encryption>
+				<useOneX>true</useOneX>
+			</authEncryption>
+			<PMKCacheMode>enabled</PMKCacheMode>
+			<PMKCacheTTL>10</PMKCacheTTL>
+			<PMKCacheSize>128</PMKCacheSize>
+			<preAuthMode>disabled</preAuthMode>
+			<OneX xmlns="http://www.microsoft.com/networking/OneX/v1">
+				<cacheUserData>true</cacheUserData>
+				<authMode>user</authMode>
+				<EAPConfig>
+					<EapHostConfig xmlns="http://www.microsoft.com/provisioning/EapHostConfig">
+						<EapMethod>
+							<Type xmlns="http://www.microsoft.com/provisioning/EapCommon">21</Type>
+							<VendorId xmlns="http://www.microsoft.com/provisioning/EapCommon">0</VendorId>
+							<VendorType xmlns="http://www.microsoft.com/provisioning/EapCommon">0</VendorType>
+							<AuthorId xmlns="http://www.microsoft.com/provisioning/EapCommon">311</AuthorId>
+						</EapMethod>
+						<Config xmlns="http://www.microsoft.com/provisioning/EapHostConfig">
+							<EapTtls
+								xmlns="http://www.microsoft.com/provisioning/EapTtlsConnectionPropertiesV1">
+								<ServerValidation>
+									<ServerNames>radius.sin.cvut.cz</ServerNames>
+									<TrustedRootCAHash>2b 8f 1b 57 33 d bb a2 d0 7a 6c 51 f7 e e9 d da b9 ad 8e </TrustedRootCAHash>
+									<DisablePrompt>true</DisablePrompt>
+								</ServerValidation>
+								<Phase2Authentication>
+									<PAPAuthentication />
+								</Phase2Authentication>
+								<Phase1Identity>
+									<IdentityPrivacy>true</IdentityPrivacy>
+									<AnonymousIdentity>anonymous@sin.cvut.cz</AnonymousIdentity>
+								</Phase1Identity>
+							</EapTtls>
+						</Config>
+					</EapHostConfig>
+				</EAPConfig>
+			</OneX>
+		</security>
+	</MSM>
+	<MacRandomization xmlns="http://www.microsoft.com/networking/WLAN/profile/v3">
+		<enableRandomization>false</enableRandomization>
+		<randomizationSeed>1813427014</randomizationSeed>
+	</MacRandomization>
+</WLANProfile>
\ No newline at end of file
diff --git a/sin-setup.bat b/sin-setup.bat
index 1d7f8b8..c955679 100644
--- a/sin-setup.bat
+++ b/sin-setup.bat
@@ -47,7 +47,7 @@ goto main
 
 
 
-:: Import Sincoolka and Sincoolka 5G Wi-Fi profile
+:: Import Sincoolka and Sincoolka FT Wi-Fi profile
 
 :setup_wifi
 cls
@@ -56,7 +56,7 @@ IF %rights_admin% EQU 1 (
    set cmd_user=all
 )
 netsh wlan add profile "filename=%mypath%Wi-Fi-Sincoolka.xml" user=%cmd_user%
-netsh wlan add profile "filename=%mypath%Wi-Fi-Sincoolka 5G.xml" user=%cmd_user%
+netsh wlan add profile "filename=%mypath%Wi-Fi-SincoolkaFT.xml" user=%cmd_user%
 
 echo.