From 403caa2d36ca180eaa9dd849c46ddefb6305bed1 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Wed, 26 Feb 2020 15:38:48 +0100
Subject: [PATCH] Update samples

The EAP-TTLS sample was broken and was replaced by a working one.

Reported-by: Tomasz Wolniewicz <twoln@umk.pl>
Signed-off-by: Simon Rozman <simon@rozman.si>
---
 Examples/EAP-TTLS Userdata.xml                |  21 ------------------
 ...ata.xml => Microsoft EAP-TLS Userdata.xml} | Bin
 ...soft EAP-TTLS Userdata (inner non-EAP).xml |  15 +++++++++++++
 WLANSetEAPUserData/WLANSetEAPUserData.vcxproj |   4 ++--
 .../WLANSetEAPUserData.vcxproj.filters        |   4 ++--
 5 files changed, 19 insertions(+), 25 deletions(-)
 delete mode 100644 Examples/EAP-TTLS Userdata.xml
 rename Examples/{EAP-TLS Userdata.xml => Microsoft EAP-TLS Userdata.xml} (100%)
 create mode 100644 Examples/Microsoft EAP-TTLS Userdata (inner non-EAP).xml

diff --git a/Examples/EAP-TTLS Userdata.xml b/Examples/EAP-TTLS Userdata.xml
deleted file mode 100644
index 4293454..0000000
--- a/Examples/EAP-TTLS Userdata.xml	
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" ?>
-<EapHostUserCredentials xmlns="http://www.microsoft.com/provisioning/EapHostUserCredentials" 
-		xmlns:eapCommon="http://www.microsoft.com/provisioning/EapCommon" 
-		xmlns:baseEap="http://www.microsoft.com/provisioning/BaseEapMethodUserCredentials">
-	<EapMethod>
-		<eapCommon:Type>21</eapCommon:Type>
-		<eapCommon:AuthorId>311</eapCommon:AuthorId>
-	</EapMethod>
-	<Credentials xmlns:eapUser="http://www.microsoft.com/provisioning/EapUserPropertiesV1"
-			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-			xmlns:baseEap="http://www.microsoft.com/provisioning/BaseEapUserPropertiesV1" 
-			xmlns:EapTtls="http://www.microsoft.com/provisioning/EapTtlsUserPropertiesV1">
-		<baseEap:Eap>
-			<baseEap:Type>21</baseEap:Type>
-			<EapTtls:eapTtls>
-				<EapTtls:Username>user03</EapTtls:Username>
-				<EapTtls:Password>user_0303</EapTtls:Password>
-			</EapTtls:eapTtls>
-		</baseEap:Eap>
-	</Credentials>
-</EapHostUserCredentials>
diff --git a/Examples/EAP-TLS Userdata.xml b/Examples/Microsoft EAP-TLS Userdata.xml
similarity index 100%
rename from Examples/EAP-TLS Userdata.xml
rename to Examples/Microsoft EAP-TLS Userdata.xml
diff --git a/Examples/Microsoft EAP-TTLS Userdata (inner non-EAP).xml b/Examples/Microsoft EAP-TTLS Userdata (inner non-EAP).xml
new file mode 100644
index 0000000..8dc4d68
--- /dev/null
+++ b/Examples/Microsoft EAP-TTLS Userdata (inner non-EAP).xml	
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<EapHostUserCredentials xmlns="http://www.microsoft.com/provisioning/EapHostUserCredentials" 
+		xmlns:eapCommon="http://www.microsoft.com/provisioning/EapCommon" 
+		xmlns:baseEap="http://www.microsoft.com/provisioning/BaseEapMethodUserCredentials">
+	<EapMethod>
+		<eapCommon:Type>21</eapCommon:Type>
+		<eapCommon:AuthorId>311</eapCommon:AuthorId>
+	</EapMethod>
+	<Credentials xmlns="http://www.microsoft.com/provisioning/EapHostUserCredentials">
+		<EapTtls xmlns="http://www.microsoft.com/provisioning/EapTtlsUserPropertiesV1">
+			<Username>user03</Username>
+			<Password>user_0303</Password>
+		</EapTtls>
+	</Credentials>
+</EapHostUserCredentials>
\ No newline at end of file
diff --git a/WLANSetEAPUserData/WLANSetEAPUserData.vcxproj b/WLANSetEAPUserData/WLANSetEAPUserData.vcxproj
index 80ca7eb..27926c2 100644
--- a/WLANSetEAPUserData/WLANSetEAPUserData.vcxproj
+++ b/WLANSetEAPUserData/WLANSetEAPUserData.vcxproj
@@ -151,8 +151,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Xml Include="..\Examples\EAP-TLS Userdata.xml" />
-    <Xml Include="..\Examples\EAP-TTLS Userdata.xml" />
+    <Xml Include="..\Examples\Microsoft EAP-TLS Userdata.xml" />
+    <Xml Include="..\Examples\Microsoft EAP-TTLS Userdata %28inner non-EAP%29.xml" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/WLANSetEAPUserData/WLANSetEAPUserData.vcxproj.filters b/WLANSetEAPUserData/WLANSetEAPUserData.vcxproj.filters
index ad18f63..7365028 100644
--- a/WLANSetEAPUserData/WLANSetEAPUserData.vcxproj.filters
+++ b/WLANSetEAPUserData/WLANSetEAPUserData.vcxproj.filters
@@ -33,10 +33,10 @@
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <Xml Include="..\Examples\EAP-TLS Userdata.xml">
+    <Xml Include="..\Examples\Microsoft EAP-TLS Userdata.xml">
       <Filter>Examples</Filter>
     </Xml>
-    <Xml Include="..\Examples\EAP-TTLS Userdata.xml">
+    <Xml Include="..\Examples\Microsoft EAP-TTLS Userdata %28inner non-EAP%29.xml">
       <Filter>Examples</Filter>
     </Xml>
   </ItemGroup>