The ciphers support only .NET v4.6

vmelamed · Dec 10, 2015 · 6a0959b · 6a0959b
1 parent e66b2f9
commit 6a0959b
Show file tree

Hide file tree

Showing 63 changed files with 218 additions and 714 deletions.
diff --git a/Aspects/Linq/Expressions/Serialization/Properties/AssemblyInfo.cs b/Aspects/Linq/Expressions/Serialization/Properties/AssemblyInfo.cs
@@ -4,9 +4,9 @@
 [assembly: AssemblyTitle("vm.Aspects.Linq.Expressions.Serialization")]
 [assembly: AssemblyDescription("Serializes and deserializes LINQ expression trees to and from XML documents.")]
 
-[assembly: AssemblyVersion("1.0.5")]
-[assembly: AssemblyFileVersion("1.0.5")]
-[assembly: AssemblyInformationalVersion("1.0.5")]
+[assembly: AssemblyVersion("1.0.6")]
+[assembly: AssemblyFileVersion("1.0.6")]
+[assembly: AssemblyInformationalVersion("1.0.6")]
 
 [assembly: InternalsVisibleTo(
     "vm.Aspects.Linq.Expressions.Serialization.Test, " +

diff --git a/Aspects/Model/EncryptedParts.cs b/Aspects/Model/EncryptedParts.cs
@@ -97,10 +97,10 @@ void Verify()
                                   .All(mi =>
                                   {
                                       var pi = mi as PropertyInfo;
+                                      var pType = pi != null ? pi.PropertyType : ((FieldInfo)mi).FieldType;
 
-                                      return ICipherExtensions.DecryptTypedData.ContainsKey(pi != null
-                                                                                                ? pi.PropertyType
-                                                                                                : ((FieldInfo)mi).FieldType);
+                                      return pType.IsSerializable  &&
+                                             ICipherExtensions.DecryptTypedData.ContainsKey(pType);
                                   }))
                 throw new InvalidOperationException("The properties marked with DecryptedAttribute must be encryptable: must be of any of the following types: "+
                                                     "bool, char, byte, sbyte, short, ushort, int, uint, long, ulong, decimal, float, double, DateTime, Guid, "+

diff --git a/Aspects/Model/Properties/AssemblyInfo.cs b/Aspects/Model/Properties/AssemblyInfo.cs
@@ -3,9 +3,9 @@
 [assembly: AssemblyTitle("vm.Aspect.Model")]
 [assembly: AssemblyDescription("Defines the IRepository and related base classes and utilities - a framework of building domain object model.")]
 
-[assembly: AssemblyVersion("1.0.5")]
-[assembly: AssemblyFileVersion("1.0.5")]
-[assembly: AssemblyInformationalVersion("1.0.5")]
+[assembly: AssemblyVersion("1.0.6")]
+[assembly: AssemblyFileVersion("1.0.6")]
+[assembly: AssemblyInformationalVersion("1.0.6")]
 
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo(
     "vm.Aspects.Model.Tests, " +

diff --git a/Aspects/NuGet/vm.Aspects.nuspec b/Aspects/NuGet/vm.Aspects.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>vm.Aspects</id>
-        <version>1.0.5-beta</version>
+        <version>1.0.6-beta</version>
         <authors>Val Melamed</authors>
         <owners>Val Melamed</owners>
         <summary>

diff --git a/Aspects/Parsers/Properties/AssemblyInfo.cs b/Aspects/Parsers/Properties/AssemblyInfo.cs
@@ -6,9 +6,9 @@
 [assembly: AssemblyTitle("vm.Aspects.Parser")]
 [assembly: AssemblyDescription("Text parsing readers, e.g. CSV/TSV reader.")]
 
-[assembly: AssemblyVersion("1.0.5")]
-[assembly: AssemblyFileVersion("1.0.5")]
-[assembly: AssemblyInformationalVersion("1.0.5")]
+[assembly: AssemblyVersion("1.0.6")]
+[assembly: AssemblyFileVersion("1.0.6")]
+[assembly: AssemblyInformationalVersion("1.0.6")]
 
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo(
     "vm.Aspects.Parsers.Tests, " +

diff --git a/Aspects/Properties/AssemblyInfo.cs b/Aspects/Properties/AssemblyInfo.cs
@@ -2,9 +2,9 @@
 
 [assembly: AssemblyTitle("vm.Aspects")]
 [assembly: AssemblyDescription("A set of classes addressing various common cross-cutting concerns.")]
-[assembly: AssemblyVersion("1.0.5")]
-[assembly: AssemblyFileVersion("1.0.5")]
-[assembly: AssemblyInformationalVersion("1.0.5")]
+[assembly: AssemblyVersion("1.0.6")]
+[assembly: AssemblyFileVersion("1.0.6")]
+[assembly: AssemblyInformationalVersion("1.0.6")]
 
 
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo(

diff --git a/Aspects/Security/Cryptography/Ciphers/DpapiCipher.cs b/Aspects/Security/Cryptography/Ciphers/DpapiCipher.cs
@@ -2,9 +2,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Security.Cryptography;
-#if NET45
 using System.Threading.Tasks;
-#endif
 
 namespace vm.Aspects.Security.Cryptography.Ciphers
 {
@@ -18,7 +16,7 @@ namespace vm.Aspects.Security.Cryptography.Ciphers
     /// <item><description>The bytes of the encrypted text.</description></item>
     /// </list>
     /// </remarks>
-    [SuppressMessage("Microsoft.Design", "CA1063:ImplementIDisposableCorrectly", Justification="Nothing to dispose")]
+    [SuppressMessage("Microsoft.Design", "CA1063:ImplementIDisposableCorrectly", Justification = "Nothing to dispose")]
     public sealed class DpapiCipher : ICipherAsync
     {
         const int BlockLength = 4096;
@@ -49,7 +47,7 @@ public DpapiCipher(
         /// <summary>
         /// Gets or sets the entropy which makes the encryption stronger.
         /// </summary>
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays", Justification="It is an opaque value.")]
+        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays", Justification = "It is an opaque value.")]
         public byte[] Entropy { get; set; }
 
         /// <summary>
@@ -88,9 +86,9 @@ public DpapiCipher(
         /// <exception cref="T:System.IO.IOException">
         /// An I/O error occurred.
         /// </exception>
-        [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Justification="The CryptoStream will do it.")]
-        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId="1")]
-        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId="0")]
+        [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Justification = "The CryptoStream will do it.")]
+        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "1")]
+        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0")]
         public void Encrypt(
             Stream dataStream,
             Stream encryptedStream)
@@ -156,9 +154,9 @@ public void Encrypt(
         /// <exception cref="T:System.IO.IOException">
         /// An I/O error occurred.
         /// </exception>
-        [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Justification="The CryptoStream will do it.")]
-        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId="1")]
-        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId="0")]
+        [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Justification = "The CryptoStream will do it.")]
+        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "1")]
+        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0")]
         public void Decrypt(
             Stream encryptedStream,
             Stream dataStream)
@@ -193,7 +191,7 @@ public void Decrypt(
                         buffer = new byte[bufferLen];
                     else
                         if (buffer.Length != bufferLen)
-                            Array.Resize(ref buffer, bufferLen);
+                        Array.Resize(ref buffer, bufferLen);
 
                     read = inputStream.Read(buffer, 0, bufferLen);
 
@@ -261,7 +259,6 @@ public byte[] Decrypt(
         }
         #endregion
 
-#if NET45
         #region ICipherAsync Members
         /// <summary>
         /// Asynchronously reads the clear text from the <paramref name="dataStream"/>, encrypts it and writes the result into the 
@@ -290,8 +287,8 @@ public byte[] Decrypt(
         /// <exception cref="T:System.IO.IOException">
         /// An I/O error occurred.
         /// </exception>
-        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId="1")]
-        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId="0")]
+        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "1")]
+        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0")]
         public async Task EncryptAsync(
             Stream dataStream,
             Stream encryptedStream)
@@ -308,7 +305,7 @@ public async Task EncryptAsync(
                     first = false;
                 else
                     if (read == 0)
-                        return;
+                    return;
 
                 if (read < buffer.Length)
                     Array.Resize(ref buffer, read);
@@ -348,8 +345,8 @@ public async Task EncryptAsync(
         /// <exception cref="T:System.IO.IOException">
         /// An I/O error occurred.
         /// </exception>
-        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId="1")]
-        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId="0")]
+        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "1")]
+        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0")]
         public async Task DecryptAsync(
             Stream encryptedStream,
             Stream dataStream)
@@ -369,7 +366,7 @@ public async Task DecryptAsync(
                     first = false;
                 else
                     if (read == 0)
-                        return;
+                    return;
 
                 if (read != bufferLenBytes.Length)
                     throw new ArgumentException("The input stream does not seem to be produced with compatible cipher.", "encryptedStream");
@@ -380,7 +377,7 @@ public async Task DecryptAsync(
                     buffer = new byte[bufferLen];
                 else
                     if (buffer.Length != bufferLen)
-                        Array.Resize(ref buffer, bufferLen);
+                    Array.Resize(ref buffer, bufferLen);
 
                 read = await encryptedStream.ReadAsync(buffer, 0, bufferLen);
 
@@ -393,14 +390,13 @@ public async Task DecryptAsync(
             while (decrypted.Length == BlockLength);
         }
         #endregion
-#endif
 
         #region IDisposable Members
         /// <summary>
         /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources, here it does nothing.
         /// </summary>
-        [SuppressMessage("Microsoft.Usage", "CA1816:CallGCSuppressFinalizeCorrectly", Justification="Nothing to dispose")]
-        [SuppressMessage("Microsoft.Design", "CA1063:ImplementIDisposableCorrectly", Justification="Nothing to dispose")]
+        [SuppressMessage("Microsoft.Usage", "CA1816:CallGCSuppressFinalizeCorrectly", Justification = "Nothing to dispose")]
+        [SuppressMessage("Microsoft.Design", "CA1063:ImplementIDisposableCorrectly", Justification = "Nothing to dispose")]
         public void Dispose()
         {
             GC.SuppressFinalize(this);

diff --git a/Aspects/Security/Cryptography/Ciphers/EncryptedNewKeyCipher.cs b/Aspects/Security/Cryptography/Ciphers/EncryptedNewKeyCipher.cs
@@ -2,9 +2,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Security.Cryptography.X509Certificates;
-#if NET45
 using System.Threading.Tasks;
-#endif
 
 namespace vm.Aspects.Security.Cryptography.Ciphers
 {
@@ -91,7 +89,7 @@ public override string KeyLocation
         /// </summary>
         /// <param name="key">The key.</param>
         /// <exception cref="NotImplementedException">Always thrown.</exception>
-        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId="0")]
+        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0")]
         public override void ImportSymmetricKey(
             byte[] key)
         {
@@ -107,13 +105,12 @@ public override byte[] ExportSymmetricKey()
             throw new NotImplementedException();
         }
 
-#if NET45
         /// <summary>
         /// Asynchronously imports the symmetric key as a clear text.
         /// </summary>
         /// <param name="key">The key.</param>
         /// <exception cref="NotImplementedException">Always thrown.</exception>
-        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId="0")]
+        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0")]
         public override Task ImportSymmetricKeyAsync(
             byte[] key)
         {
@@ -128,7 +125,6 @@ public override Task<byte[]> ExportSymmetricKeyAsync()
         {
             throw new NotImplementedException();
         }
-#endif
         #endregion
 
         #region Initialization of the symmetric key overrides
@@ -154,7 +150,7 @@ protected override void InitializeSymmetricKey()
         /// <exception cref="System.ArgumentNullException">Thrown when <paramref name="encryptedStream" /> is <see langword="null" />.</exception>
         /// <exception cref="System.ArgumentException">Thrown when <paramref name="encryptedStream" /> cannot be written to.</exception>
         /// <remarks>The method is called by the GoF template-methods.</remarks>
-        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId="0")]
+        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0")]
         protected override void BeforeWriteEncrypted(
             Stream encryptedStream)
         {
@@ -181,7 +177,7 @@ protected override void BeforeWriteEncrypted(
         /// </list>
         /// </exception>
         /// <remarks>The method is called by the GoF template-methods.</remarks>
-        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId="0")]
+        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0")]
         protected override void BeforeReadDecrypted(Stream encryptedStream)
         {
             // read the length of the key and allocate an array for it
@@ -204,7 +200,6 @@ protected override void BeforeReadDecrypted(Stream encryptedStream)
         }
         #endregion
 
-#if NET45
         /// <summary>
         /// Initializes asynchronously the symmetric key by either reading it from the storage with the specified key location name or by
         /// generating a new key and saving it in it.
@@ -229,7 +224,7 @@ protected override Task InitializeSymmetricKeyAsync()
         /// <exception cref="System.ArgumentNullException">Thrown when <paramref name="encryptedStream" /> is <see langword="null" />.</exception>
         /// <exception cref="System.ArgumentException">Thrown when <paramref name="encryptedStream" /> cannot be written to.</exception>
         /// <remarks>The method is called by the GoF template-methods.</remarks>
-        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId="0")]
+        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0")]
         protected override async Task BeforeWriteEncryptedAsync(
             Stream encryptedStream)
         {
@@ -256,7 +251,7 @@ protected override async Task BeforeWriteEncryptedAsync(
         /// </list>
         /// </exception>
         /// <remarks>The method is called by the GoF template-methods.</remarks>
-        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId="0")]
+        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0")]
         protected override async Task BeforeReadDecryptedAsync(
             Stream encryptedStream)
         {
@@ -279,6 +274,5 @@ protected override async Task BeforeReadDecryptedAsync(
             await base.BeforeReadDecryptedAsync(encryptedStream);
         }
         #endregion
-#endif
     }
 }
diff --git a/Aspects/Security/Cryptography/Ciphers/EncryptedNewKeyHashedCipher.cs b/Aspects/Security/Cryptography/Ciphers/EncryptedNewKeyHashedCipher.cs
@@ -5,9 +5,7 @@
 using System.Linq;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
-#if NET45
 using System.Threading.Tasks;
-#endif
 
 namespace vm.Aspects.Security.Cryptography.Ciphers
 {
@@ -491,7 +489,6 @@ protected byte[] FinalizeHashAfterRead(
         }
         #endregion
 
-#if NET45
         /// <summary>
         /// Asynchronously reads the clear text from the <paramref name="dataStream" />, encrypts it and writes the result into the
         /// <paramref name="encryptedStream" /> stream. This is the reverse method of <see cref="M:DecryptAsync(System.Stream, System.Stream)" />.
@@ -610,7 +607,6 @@ protected virtual async Task LoadHashToValidateAsync(
                             : storedHash;
         }
         #endregion
-#endif
 
         #region IDisposable Members