Version 1.0.6. Switched to NET462, cleaned up some code, verified NET…

…462 support for CNG cert store.
romanpolunin · Dec 5, 2016 · 3b757c8 · 3b757c8
1 parent c131795
commit 3b757c8
Show file tree

Hide file tree

Showing 16 changed files with 176 additions and 186 deletions.
diff --git a/Build/Fedlet.1.0.nuspec b/Build/Fedlet.1.0.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>RomanPolunin.SamlFedlet</id>
-    <version>1.0.5</version>
+    <version>1.0.6</version>
     <authors>Roman Polunin</authors>
     <owners>Roman Polunin</owners>
     <title>Fedlet, a SAML SSO Toolkit</title>
@@ -25,9 +25,9 @@ Forked that to make functionality and stability improvements.
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <tags>SAML SSO</tags>
 	<copyright>Portions copyright (c) Roman Polunin 2015-2016. Copyright (c) Sun Microsystems 2019-2010</copyright>
-	<releaseNotes>Fedlet 1.0.5.0 - July 2016
-Fixed wrong attribute name for AssertionConsumerServiceIndex in the outgoing SAMLRequest.
-Added default value for NameIDPolicyFormat ("unspecified") if not supplied by client code.</releaseNotes>
+	<releaseNotes>Fedlet 1.0.6.0 - Dec 2016
+Switched targeting to .NET 462. 
+Expects .Net framework to be able to work with CNG certs without additional hacks.</releaseNotes>
   </metadata>
   <files>
     <file src="**\*" target="" exclude="*.ps1" /> 

diff --git a/Build/buildnuget.ps1 b/Build/buildnuget.ps1
@@ -4,14 +4,14 @@ Remove-Item -Path .\LICENSE.txt -Force
 Remove-Item -Path .\CHANGES.txt -Force
 Remove-Item -Path .\README -Force
 
-md lib\Net45
-Copy-Item ..\Fedlet\bin\Release\Fedlet.dll .\lib\Net45
-Copy-Item ..\Fedlet\bin\Release\Fedlet.xml .\lib\Net45
-Copy-Item ..\Fedlet\bin\Release\Fedlet.pdb .\lib\Net45
+md lib\Net462
+Copy-Item ..\Fedlet\bin\Release\Fedlet.dll .\lib\Net462
+Copy-Item ..\Fedlet\bin\Release\Fedlet.xml .\lib\Net462
+Copy-Item ..\Fedlet\bin\Release\Fedlet.pdb .\lib\Net462
 
 Copy-Item ..\NOTICES.txt .\
 Copy-Item ..\LICENSE.txt .\
 Copy-Item ..\CHANGES.txt .\
 Copy-Item ..\README .\
 
-..\..\..\Nuget\nuget.exe pack Fedlet.1.0.nuspec
+..\..\Nuget\nuget.exe pack Fedlet.1.0.nuspec
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,4 +1,11 @@
-Fedlet 1.0.5.0 - July 2016
+Fedlet 1.0.6.0 - Dec 2016
+
+Switched targeting to .NET 462. 
+Expects .Net framework to be able to work with CNG certs and SHA256 without additional hacks.
+Some code cleanup.
+
+
+Fedlet 1.0.5.0 - July 2016
 
 Fixed wrong attribute name for AssertionConsumerServiceIndex in the outgoing SAMLRequest.
 Added default value for NameIDPolicyFormat ("unspecified") if not supplied by client code.

diff --git a/Fedlet.UnitTests/Fedlet.UnitTests.csproj b/Fedlet.UnitTests/Fedlet.UnitTests.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Fedlet.UnitTests</RootNamespace>
     <AssemblyName>Fedlet.UnitTests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>

diff --git a/Fedlet.UnitTests/Properties/AssemblyInfo.cs b/Fedlet.UnitTests/Properties/AssemblyInfo.cs
@@ -17,5 +17,5 @@
 
 [assembly: Guid("75b42c20-1ed1-41fd-b5cd-e587a72c2a92")]
 
-[assembly: AssemblyVersion("1.0.2.0")]
-[assembly: AssemblyFileVersion("1.0.2.0")]
+[assembly: AssemblyVersion("1.0.6.0")]
+[assembly: AssemblyFileVersion("1.0.6.0")]
diff --git a/Fedlet/Fedlet.csproj b/Fedlet/Fedlet.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sun.Identity</RootNamespace>
     <AssemblyName>Fedlet</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile>

diff --git a/Fedlet/Properties/AssemblyInfo.cs b/Fedlet/Properties/AssemblyInfo.cs
@@ -41,5 +41,5 @@
 
 [assembly: Guid("2155869F-784E-4882-976E-61AB0F9642F3")]
 
-[assembly: AssemblyVersion("1.0.5.0")]
-[assembly: AssemblyFileVersion("1.0.5.0")]
+[assembly: AssemblyVersion("1.0.6.0")]
+[assembly: AssemblyFileVersion("1.0.6.0")]
diff --git a/Fedlet/Saml2/ArtifactResponse.cs b/Fedlet/Saml2/ArtifactResponse.cs
@@ -26,6 +26,7 @@
  */
 
 using System;
+using System.Security.Cryptography.Xml;
 using System.Xml;
 using System.Xml.XPath;
 using Sun.Identity.Properties;
@@ -68,7 +69,7 @@ public ArtifactResponse(string artifactResponse)
 			    _xml = new XmlDocument {PreserveWhitespace = true};
 			    _xml.LoadXml(artifactResponse);
 				_nsMgr = new XmlNamespaceManager(_xml.NameTable);
-				_nsMgr.AddNamespace("ds", "http://www.w3.org/2000/09/xmldsig#");
+				_nsMgr.AddNamespace("ds", SignedXml.XmlDsigNamespaceUrl);
 				_nsMgr.AddNamespace("saml", "urn:oasis:names:tc:SAML:2.0:assertion");
 				_nsMgr.AddNamespace("samlp", "urn:oasis:names:tc:SAML:2.0:protocol");
 

diff --git a/Fedlet/Saml2/AuthnResponse.cs b/Fedlet/Saml2/AuthnResponse.cs
@@ -28,6 +28,7 @@
 using System;
 using System.Collections;
 using System.Globalization;
+using System.Security.Cryptography.Xml;
 using System.Xml;
 using System.Xml.XPath;
 using Sun.Identity.Properties;
@@ -54,7 +55,7 @@ public AuthnResponse(string samlResponse)
                 _xml = new XmlDocument {PreserveWhitespace = true};
                 _xml.LoadXml(samlResponse);
                 _nsMgr = new XmlNamespaceManager(_xml.NameTable);
-                _nsMgr.AddNamespace("ds", "http://www.w3.org/2000/09/xmldsig#");
+                _nsMgr.AddNamespace("ds", SignedXml.XmlDsigNamespaceUrl);
                 _nsMgr.AddNamespace("saml", "urn:oasis:names:tc:SAML:2.0:assertion");
                 _nsMgr.AddNamespace("samlp", "urn:oasis:names:tc:SAML:2.0:protocol");
             }

diff --git a/Fedlet/Saml2/IdentityProvider.cs b/Fedlet/Saml2/IdentityProvider.cs
@@ -26,6 +26,7 @@
  */
 
 using System.Security.Cryptography.X509Certificates;
+using System.Security.Cryptography.Xml;
 using System.Text;
 using System.Xml;
 using Sun.Identity.Properties;
@@ -78,7 +79,7 @@ public IdentityProvider(XmlDocument metadata, XmlDocument extendedMetadata, Saml
 				_metadata = metadata;
 				_metadataNsMgr = new XmlNamespaceManager(_metadata.NameTable);
 				_metadataNsMgr.AddNamespace("md", "urn:oasis:names:tc:SAML:2.0:metadata");
-				_metadataNsMgr.AddNamespace("ds", "http://www.w3.org/2000/09/xmldsig#");
+				_metadataNsMgr.AddNamespace("ds", SignedXml.XmlDsigNamespaceUrl);
 
 				_extendedMetadata = extendedMetadata;
 				_extendedMetadataNsMgr = new XmlNamespaceManager(_extendedMetadata.NameTable);

diff --git a/Fedlet/Saml2/LogoutRequest.cs b/Fedlet/Saml2/LogoutRequest.cs
@@ -28,6 +28,7 @@
 using System;
 using System.Collections.Specialized;
 using System.Globalization;
+using System.Security.Cryptography.Xml;
 using System.Text;
 using System.Xml;
 using System.Xml.XPath;
@@ -70,7 +71,7 @@ public LogoutRequest(string samlRequest)
 			    _xml = new XmlDocument {PreserveWhitespace = true};
 
 			    _nsMgr = new XmlNamespaceManager(_xml.NameTable);
-				_nsMgr.AddNamespace("ds", "http://www.w3.org/2000/09/xmldsig#");
+				_nsMgr.AddNamespace("ds", SignedXml.XmlDsigNamespaceUrl);
 				_nsMgr.AddNamespace("saml", "urn:oasis:names:tc:SAML:2.0:assertion");
 				_nsMgr.AddNamespace("samlp", "urn:oasis:names:tc:SAML:2.0:protocol");
 
@@ -111,7 +112,7 @@ public LogoutRequest(
 			    _xml = new XmlDocument {PreserveWhitespace = true};
 
 			    _nsMgr = new XmlNamespaceManager(_xml.NameTable);
-				_nsMgr.AddNamespace("ds", "http://www.w3.org/2000/09/xmldsig#");
+				_nsMgr.AddNamespace("ds", SignedXml.XmlDsigNamespaceUrl);
 				_nsMgr.AddNamespace("saml", "urn:oasis:names:tc:SAML:2.0:assertion");
 				_nsMgr.AddNamespace("samlp", "urn:oasis:names:tc:SAML:2.0:protocol");
 

diff --git a/Fedlet/Saml2/LogoutResponse.cs b/Fedlet/Saml2/LogoutResponse.cs
@@ -27,6 +27,7 @@
 
 using System;
 using System.Collections.Specialized;
+using System.Security.Cryptography.Xml;
 using System.Text;
 using System.Xml;
 using System.Xml.XPath;
@@ -68,7 +69,7 @@ public LogoutResponse(string samlResponse)
                 _xml = new XmlDocument {PreserveWhitespace = true};
 
                 _nsMgr = new XmlNamespaceManager(_xml.NameTable);
-                _nsMgr.AddNamespace("ds", "http://www.w3.org/2000/09/xmldsig#");
+                _nsMgr.AddNamespace("ds", SignedXml.XmlDsigNamespaceUrl);
                 _nsMgr.AddNamespace("saml", "urn:oasis:names:tc:SAML:2.0:assertion");
                 _nsMgr.AddNamespace("samlp", "urn:oasis:names:tc:SAML:2.0:protocol");
 

diff --git a/Fedlet/Saml2/Saml2Constants.cs b/Fedlet/Saml2/Saml2Constants.cs
@@ -200,21 +200,6 @@ public static class Saml2Constants
 		/// </summary>
 		public const string SignatureAlgorithm = "SigAlg";
 
-		/// <summary>
-		/// Constant for the DSA type of signature algorithm. 
-		/// </summary>
-		public const string SignatureAlgorithmDsa = "http://www.w3.org/2000/09/xmldsig#dsa-sha1";
-
-		/// <summary>
-		/// Constant for the RSA type of signature algorithm, SHA1. 
-		/// </summary>
-		public const string SignatureAlgorithmRsaSha1 = "http://www.w3.org/2000/09/xmldsig#rsa-sha1";
-
-		/// <summary>
-		/// Constant for the RSA type of signature algorithm, SHA256. 
-		/// </summary>
-		public const string SignatureAlgorithmRsaSha256 = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256";
-
 		/// <summary>
 		/// Constant for the Signature parameter.
 		/// </summary>