Use BCrypt/NCrypt on Windows platforms

EnlistmentInfo.props → src/EnlistmentInfo.props

@@ -5,7 +5,7 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<ProjectRoot>$([MSBuild]::MakeRelative($(MSBuildProjectDirectory), '$(MSBuildThisFileDirectory)'))</ProjectRoot>
+		<ProjectRoot>$([MSBuild]::MakeRelative($(MSBuildProjectDirectory), '$(MSBuildThisFileDirectory)..\'))</ProjectRoot>
 		<SolutionDir>$(ProjectRoot)src\</SolutionDir>
 		<RestorePackages>true</RestorePackages>
 
@@ -18,11 +18,12 @@
 
     <ErrorReport>prompt</ErrorReport>
 		<WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 
-		<SignAssembly>true</SignAssembly>
+    <SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>$(SolutionDir)opensource.snk</AssemblyOriginatorKeyFile>
 
-    <CodeAnalysisRuleSet Condition=" $(MSBuildProjectName.Contains('Tests')) ">$(MSBuildThisFileDirectory)src\PCLCrypto.Tests.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet Condition=" $(MSBuildProjectName.Contains('Tests')) ">$(SolutionDir)PCLCrypto.Tests.ruleset</CodeAnalysisRuleSet>
 
   </PropertyGroup>
 

NuGet.config → src/NuGet.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <config>
-    <add key="repositorypath" value="packages" />
+    <add key="repositorypath" value="..\packages" />
   </config>
   <packageSources>
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />

src/PCLCrypto.Android/PCLCrypto.Android.csproj

@@ -28,10 +28,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Mono.Android" />
-    <Reference Include="Mono.Security" />
     <Reference Include="mscorlib" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Numerics" />
     <Reference Include="System.Runtime" />
     <Reference Include="System.Threading.Tasks" />
     <Reference Include="System.Xml.Linq" />

src/PCLCrypto.Android/RsaAsymmetricKeyAlgorithmProvider.cs

@@ -69,6 +69,9 @@ public ICryptographicKey CreateKeyPair(int keySize)
                 D = privateKeyParameters.PrivateExponent.ToByteArray(),
             };
 
+            // Normalize RSAParameters (remove leading zeros, etc.)
+            parameters = KeyFormatter.Pkcs1.Read(KeyFormatter.Pkcs1.Write(parameters));
+
             return new RsaCryptographicKey(key.Public, key.Private, parameters, this.algorithm);
         }
 
@@ -77,7 +80,10 @@ public ICryptographicKey ImportKeyPair(byte[] keyBlob, CryptographicPrivateKeyBl
         {
             Requires.NotNull(keyBlob, "keyBlob");
 
-            RSAParameters parameters = KeyFormatter.GetFormatter(blobType).Read(keyBlob);
+            RSAParameters parameters = KeyFormatter.GetFormatter(blobType)
+                .Read(keyBlob)
+                .ComputeFullPrivateKeyData();
+
             IPrivateKey privateKey;
             IPublicKey publicKey;
 

src/PCLCrypto.Android/RsaCryptographicKey.cs

@@ -102,27 +102,6 @@ public byte[] ExportPublicKey(CryptographicPublicKeyBlobType blobType)
             return KeyFormatter.GetFormatter(blobType).Write(this.parameters, includePrivateKey: false);
         }
 
-        /// <summary>
-        /// Disposes of managed resources associated with this object.
-        /// </summary>
-        public void Dispose()
-        {
-            this.publicKey.Dispose();
-            this.privateKey.Dispose();
-        }
-
-        /// <inheritdoc />
-        protected internal override byte[] Sign(byte[] data)
-        {
-            using (Signature instance = Signature.GetInstance(GetSignatureName(this.Algorithm)))
-            {
-                instance.InitSign(this.privateKey);
-                instance.Update(data);
-                byte[] signature = instance.Sign();
-                return signature;
-            }
-        }
-
         /// <inheritdoc />
         protected internal override bool VerifySignature(byte[] data, byte[] signature)
         {
@@ -186,6 +165,30 @@ protected internal override byte[] Decrypt(byte[] data, byte[] iv)
             }
         }
 
+        /// <inheritdoc />
+        protected internal override byte[] Sign(byte[] data)
+        {
+            using (Signature instance = Signature.GetInstance(GetSignatureName(this.Algorithm)))
+            {
+                instance.InitSign(this.privateKey);
+                instance.Update(data);
+                byte[] signature = instance.Sign();
+                return signature;
+            }
+        }
+
+        /// <inheritdoc />
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                this.publicKey?.Dispose();
+                this.privateKey?.Dispose();
+            }
+
+            base.Dispose(disposing);
+        }
+
         /// <summary>
         /// Gets the string to pass to <see cref="Cipher.GetInstance(string)"/>
         /// for the given algorithm.

src/PCLCrypto.Android/SymmetricCryptographicKey.cs

@@ -80,14 +80,6 @@ public byte[] ExportPublicKey(CryptographicPublicKeyBlobType blobType = Cryptogr
             throw new NotSupportedException();
         }
 
-        /// <inheritdoc />
-        public void Dispose()
-        {
-            this.key.Dispose();
-            this.encryptingCipher.DisposeIfNotNull();
-            this.decryptingCipher.DisposeIfNotNull();
-        }
-
         /// <inheritdoc />
         protected internal override byte[] Encrypt(byte[] data, byte[] iv)
         {
@@ -144,6 +136,19 @@ protected internal override ICryptoTransform CreateDecryptor(byte[] iv)
             return new CryptoTransformAdaptor(this.Name, this.Mode, this.Padding, this.decryptingCipher);
         }
 
+        /// <inheritdoc />
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                this.key.Dispose();
+                this.encryptingCipher.DisposeIfNotNull();
+                this.decryptingCipher.DisposeIfNotNull();
+            }
+
+            base.Dispose(disposing);
+        }
+
         /// <summary>
         /// Gets the padding substring to include in the string
         /// passed to <see cref="Cipher.GetInstance(string)"/>

src/PCLCrypto.Android/SymmetricKeyAlgorithmProvider.cs

@@ -112,13 +112,6 @@ public ICryptographicKey CreateSymmetricKey(byte[] keyMaterial)
             return new SymmetricCryptographicKey(this, this.Name, this.Mode, this.Padding, keyMaterial);
         }
 
-        /// <summary>
-        /// Disposes resources associated with this instance.
-        /// </summary>
-        public void Dispose()
-        {
-        }
-
         /// <summary>
         /// Gets the block size (in bytes) for the specified algorithm.
         /// </summary>

src/PCLCrypto.Android/project.json

@@ -4,6 +4,8 @@
       "version": "1.3.8",
       "suppressParent": "none"
     },
+    "PInvoke.BCrypt": "0.1.433-rc-gfce000155c",
+    "PInvoke.NCrypt": "0.1.433-rc-gfce000155c",
     "StyleCop.Analyzers": "1.0.0-beta015",
     "Validation": "2.2.8"
   },

src/PCLCrypto.Desktop/CngCryptographicKey.cs

@@ -79,18 +79,6 @@ public byte[] ExportPublicKey(CryptographicPublicKeyBlobType blobType)
             return this.key.Export(CngAsymmetricKeyAlgorithmProvider.GetPlatformKeyBlobType(blobType));
         }
 
-        /// <summary>
-        /// Disposes of managed resources associated with this object.
-        /// </summary>
-        public void Dispose()
-        {
-            // Delete the key since we may have created it with a name,
-            // so that we can export it, but we do not wish for it to be
-            // permanently recorded in the device's key store.
-            this.key.Delete();
-            this.key.Dispose();
-        }
-
         /// <inheritdoc />
         protected internal override byte[] Sign(byte[] data)
         {
@@ -126,5 +114,20 @@ protected internal override bool VerifyHash(byte[] data, byte[] signature)
                 return cng.VerifyHash(data, signature);
             }
         }
+
+        /// <inheritdoc />
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                // Delete the key since we may have created it with a name,
+                // so that we can export it, but we do not wish for it to be
+                // permanently recorded in the device's key store.
+                this.key.Delete();
+                this.key.Dispose();
+            }
+
+            base.Dispose(disposing);
+        }
     }
 }

src/PCLCrypto.Desktop/PCLCrypto.Desktop.csproj

@@ -30,6 +30,7 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Numerics" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />

src/PCLCrypto.Desktop/project.json

@@ -5,6 +5,8 @@
       "version": "1.3.8",
       "suppressParent": "none"
     },
+    "PInvoke.BCrypt": "0.1.433-rc-gfce000155c",
+    "PInvoke.NCrypt": "0.1.433-rc-gfce000155c",
     "StyleCop.Analyzers": "1.0.0-beta015",
     "Validation": "2.2.8"
   },