Support for the SHA256-RSA-MGF1 signature method.

Signature description classes DigestAlgorithm changed.

Author: Revsgaard

src/ITfoxtec.Identity.Saml2/Cryptography/SignatureAlgorithm.cs

@@ -27,7 +27,7 @@ public static void ValidateAlgorithm(string signatureAlgorithm)
             {
                 return;
             }
-            throw new NotSupportedException($"Only SHA1 ({Saml2SecurityAlgorithms.RsaSha1Signature}), SHA256 ({Saml2SecurityAlgorithms.RsaSha256Signature}), SHA384 ({Saml2SecurityAlgorithms.RsaSha384Signature}), SHA512 ({Saml2SecurityAlgorithms.RsaSha512Signature}) and Sha256 Rsa MGF1 ({Saml2SecurityAlgorithms.RsaPssSha256Signature}) is supported.");
+            throw new NotSupportedException($"Only SHA1 ({Saml2SecurityAlgorithms.RsaSha1Signature}), SHA256 ({Saml2SecurityAlgorithms.RsaSha256Signature}), SHA384 ({Saml2SecurityAlgorithms.RsaSha384Signature}), SHA512 ({Saml2SecurityAlgorithms.RsaSha512Signature}) and SHA256 RSA MGF1 ({Saml2SecurityAlgorithms.RsaPssSha256Signature}) is supported.");
 
         }
 

src/ITfoxtec.Identity.Saml2/Cryptography/SignatureDescriptions/RSAPKCS1SHA1SignatureDescription.cs

@@ -9,7 +9,7 @@ public sealed class RSAPKCS1SHA1SignatureDescription : SignatureDescription
         public RSAPKCS1SHA1SignatureDescription()
         {
             KeyAlgorithm = typeof(RSACryptoServiceProvider).AssemblyQualifiedName;
-            DigestAlgorithm = typeof(SHA1Managed).AssemblyQualifiedName;
+            DigestAlgorithm = "SHA1";
             FormatterAlgorithm = typeof(RSAPKCS1SignatureFormatter).AssemblyQualifiedName;
             DeformatterAlgorithm = typeof(RSAPKCS1SignatureDeformatter).AssemblyQualifiedName;
         }
@@ -22,7 +22,7 @@ public override AsymmetricSignatureDeformatter CreateDeformatter(AsymmetricAlgor
             }
 
             RSAPKCS1SignatureDeformatter deformatter = new RSAPKCS1SignatureDeformatter(key);
-            deformatter.SetHashAlgorithm("SHA1");
+            deformatter.SetHashAlgorithm(DigestAlgorithm);
             return deformatter;
         }
 
@@ -34,7 +34,7 @@ public override AsymmetricSignatureFormatter CreateFormatter(AsymmetricAlgorithm
             }
 
             RSAPKCS1SignatureFormatter formatter = new RSAPKCS1SignatureFormatter(key);
-            formatter.SetHashAlgorithm("SHA1");
+            formatter.SetHashAlgorithm(DigestAlgorithm);
             return formatter;
         }
     }

src/ITfoxtec.Identity.Saml2/Cryptography/SignatureDescriptions/RSAPKCS1SHA256SignatureDescription.cs

@@ -9,7 +9,7 @@ public sealed class RSAPKCS1SHA256SignatureDescription : SignatureDescription
         public RSAPKCS1SHA256SignatureDescription()
         {
             KeyAlgorithm = typeof(RSACryptoServiceProvider).AssemblyQualifiedName;
-            DigestAlgorithm = typeof(SHA256Managed).AssemblyQualifiedName;
+            DigestAlgorithm = "SHA256";
             FormatterAlgorithm = typeof(RSAPKCS1SignatureFormatter).AssemblyQualifiedName;
             DeformatterAlgorithm = typeof(RSAPKCS1SignatureDeformatter).AssemblyQualifiedName;
         }
@@ -22,7 +22,7 @@ public override AsymmetricSignatureDeformatter CreateDeformatter(AsymmetricAlgor
             }
 
             RSAPKCS1SignatureDeformatter deformatter = new RSAPKCS1SignatureDeformatter(key);
-            deformatter.SetHashAlgorithm("SHA256");
+            deformatter.SetHashAlgorithm(DigestAlgorithm);
             return deformatter;
         }
 
@@ -34,7 +34,7 @@ public override AsymmetricSignatureFormatter CreateFormatter(AsymmetricAlgorithm
             }
 
             RSAPKCS1SignatureFormatter formatter = new RSAPKCS1SignatureFormatter(key);
-            formatter.SetHashAlgorithm("SHA256");
+            formatter.SetHashAlgorithm(DigestAlgorithm);
             return formatter;
         }
     }

src/ITfoxtec.Identity.Saml2/Cryptography/SignatureDescriptions/RSAPKCS1SHA384SignatureDescription.cs

@@ -9,7 +9,7 @@ public sealed class RSAPKCS1SHA384SignatureDescription : SignatureDescription
         public RSAPKCS1SHA384SignatureDescription()
         {
             KeyAlgorithm = typeof(RSACryptoServiceProvider).AssemblyQualifiedName;
-            DigestAlgorithm = typeof(SHA384Managed).AssemblyQualifiedName;
+            DigestAlgorithm = "SHA384";
             FormatterAlgorithm = typeof(RSAPKCS1SignatureFormatter).AssemblyQualifiedName;
             DeformatterAlgorithm = typeof(RSAPKCS1SignatureDeformatter).AssemblyQualifiedName;
         }
@@ -22,7 +22,7 @@ public override AsymmetricSignatureDeformatter CreateDeformatter(AsymmetricAlgor
             }
 
             RSAPKCS1SignatureDeformatter deformatter = new RSAPKCS1SignatureDeformatter(key);
-            deformatter.SetHashAlgorithm("SHA384");
+            deformatter.SetHashAlgorithm(DigestAlgorithm);
             return deformatter;
         }
 
@@ -34,7 +34,7 @@ public override AsymmetricSignatureFormatter CreateFormatter(AsymmetricAlgorithm
             }
 
             RSAPKCS1SignatureFormatter formatter = new RSAPKCS1SignatureFormatter(key);
-            formatter.SetHashAlgorithm("SHA384");
+            formatter.SetHashAlgorithm(DigestAlgorithm);
             return formatter;
         }
     }

src/ITfoxtec.Identity.Saml2/Cryptography/SignatureDescriptions/RSAPKCS1SHA512SignatureDescription.cs

@@ -9,7 +9,7 @@ public sealed class RSAPKCS1SHA512SignatureDescription : SignatureDescription
         public RSAPKCS1SHA512SignatureDescription()
         {
             KeyAlgorithm = typeof(RSACryptoServiceProvider).AssemblyQualifiedName;
-            DigestAlgorithm = typeof(SHA512Managed).AssemblyQualifiedName;
+            DigestAlgorithm = "SHA512";
             FormatterAlgorithm = typeof(RSAPKCS1SignatureFormatter).AssemblyQualifiedName;
             DeformatterAlgorithm = typeof(RSAPKCS1SignatureDeformatter).AssemblyQualifiedName;
         }
@@ -22,7 +22,7 @@ public override AsymmetricSignatureDeformatter CreateDeformatter(AsymmetricAlgor
             }
 
             RSAPKCS1SignatureDeformatter deformatter = new RSAPKCS1SignatureDeformatter(key);
-            deformatter.SetHashAlgorithm("SHA512");
+            deformatter.SetHashAlgorithm(DigestAlgorithm);
             return deformatter;
         }
 
@@ -34,7 +34,7 @@ public override AsymmetricSignatureFormatter CreateFormatter(AsymmetricAlgorithm
             }
 
             RSAPKCS1SignatureFormatter formatter = new RSAPKCS1SignatureFormatter(key);
-            formatter.SetHashAlgorithm("SHA512");
+            formatter.SetHashAlgorithm(DigestAlgorithm);
             return formatter;
         }
     }

src/ITfoxtec.Identity.Saml2/Cryptography/SignatureDescriptions/RSAPSSSHA256SignatureDescription.cs

@@ -1,34 +1,41 @@
-using System.Security.Cryptography;
+using System;
+using System.Security.Cryptography;
 
 namespace ITfoxtec.Identity.Saml2.Cryptography
 {
     public class RSAPSSSHA256SignatureDescription : SignatureDescription
     {
         public RSAPSSSHA256SignatureDescription()
         {
-            using (var rsa = RSA.Create())
-            {
-                this.KeyAlgorithm = rsa.GetType().AssemblyQualifiedName; // Does not like a simple algorithm name, but wants a type name (AssembyQualifiedName in Core)
-            }
-           
-            this.DigestAlgorithm = "SHA256"; // Somehow wants a simple algorithm name
-            this.FormatterAlgorithm = typeof(RsaPssSignatureFormatter).FullName;
-            this.DeformatterAlgorithm = typeof(RsaPssSignatureDeformatter).FullName;
+            KeyAlgorithm = typeof(RSACryptoServiceProvider).AssemblyQualifiedName;
+            DigestAlgorithm = "SHA256"; 
+            FormatterAlgorithm = typeof(RsaPssSignatureFormatter).FullName;
+            DeformatterAlgorithm = typeof(RsaPssSignatureDeformatter).FullName;
         }
 
         public override AsymmetricSignatureFormatter CreateFormatter(AsymmetricAlgorithm key)
         {
+            if (key == null)
+            {
+                throw new ArgumentNullException("key");
+            }
+
             var signatureFormatter = new RsaPssSignatureFormatter();
             signatureFormatter.SetKey(key);
-            signatureFormatter.SetHashAlgorithm(this.DigestAlgorithm);
+            signatureFormatter.SetHashAlgorithm(DigestAlgorithm);
             return signatureFormatter;
         }
 
         public override AsymmetricSignatureDeformatter CreateDeformatter(AsymmetricAlgorithm key)
         {
+            if (key == null)
+            {
+                throw new ArgumentNullException("key");
+            }
+
             var signatureDeformatter = new RsaPssSignatureDeformatter();
             signatureDeformatter.SetKey(key);
-            signatureDeformatter.SetHashAlgorithm(this.DigestAlgorithm);
+            signatureDeformatter.SetHashAlgorithm(DigestAlgorithm);
             return signatureDeformatter;
         }
 
@@ -39,20 +46,20 @@ public class RsaPssSignatureFormatter : AsymmetricSignatureFormatter
 
             public override void SetKey(AsymmetricAlgorithm key)
             {
-                this.Key = (RSA)key;
+                Key = (RSA)key;
             }
 
             public override void SetHashAlgorithm(string strName)
             {
                 // Verify the name
                 Oid.FromFriendlyName(strName, OidGroup.HashAlgorithm);
 
-                this.HashAlgorithmName = strName;
+                HashAlgorithmName = strName;
             }
 
             public override byte[] CreateSignature(byte[] rgbHash)
             {
-                return this.Key.SignHash(rgbHash, new HashAlgorithmName(this.HashAlgorithmName), RSASignaturePadding.Pss);
+                return Key.SignHash(rgbHash, new HashAlgorithmName(HashAlgorithmName), RSASignaturePadding.Pss);
             }
         }
 
@@ -63,20 +70,20 @@ public class RsaPssSignatureDeformatter : AsymmetricSignatureDeformatter
 
             public override void SetKey(AsymmetricAlgorithm key)
             {
-                this.Key = (RSA)key;
+                Key = (RSA)key;
             }
 
             public override void SetHashAlgorithm(string strName)
             {
                 // Verify the name
                 Oid.FromFriendlyName(strName, OidGroup.HashAlgorithm);
 
-                this.HashAlgorithmName = strName;
+                HashAlgorithmName = strName;
             }
 
             public override bool VerifySignature(byte[] rgbHash, byte[] rgbSignature)
             {
-                return this.Key.VerifyHash(rgbHash, rgbSignature, new HashAlgorithmName(this.HashAlgorithmName), RSASignaturePadding.Pss);
+                return Key.VerifyHash(rgbHash, rgbSignature, new HashAlgorithmName(HashAlgorithmName), RSASignaturePadding.Pss);
             }
         }
     }

src/ITfoxtec.Identity.Saml2/Schemas/Saml2SecurityAlgorithms.cs

@@ -38,7 +38,7 @@ public static class Saml2SecurityAlgorithms
         /// </summary>
         public const string RsaSha512Signature = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha512";
         /// <summary>
-        /// URI for the sha256-rsa-mgf1 signature method for signing XML.
+        /// URI for the SHA256-RSA-MGF1 signature method for signing XML.
         /// </summary>
         public const string RsaPssSha256Signature = "http://www.w3.org/2007/05/xmldsig-more#sha256-rsa-MGF1";
     }