Hotfix/23 major fix compatibilty issue (#26)

* #25 Major Fix * #25 major fix Co-authored-by: Maytham Fahmi <[email protected]>
itbackyard · May 21, 2022 · 9e2687f · 9e2687f
1 parent 35b98b0
commit 9e2687f
Show file tree

Hide file tree

Showing 9 changed files with 73 additions and 59 deletions.
diff --git a/CryptoNet.Cli/ExampleRsa.cs b/CryptoNet.Cli/ExampleRsa.cs
@@ -6,7 +6,9 @@
 // <summary>part of CryptoNet project</summary>
 
 using System.Diagnostics;
+using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
+using System.Text;
 using CryptoNet.Models;
 using CryptoNet.Utils;
 
@@ -28,7 +30,7 @@ public static void Test()
         Example_3_Encrypt_With_PublicKey_Decrypt_With_PrivateKey_Of_Content();
         Example_4_Using_X509_Certificate();
         Example_5_Export_Public_Key_For_X509_Certificate();
-        Example_7_Customize();
+        //Example_7_Customize();
     }
 
     public static void Example_1_Encrypt_Decrypt_Content_With_SelfGenerated_AsymmetricKey()
@@ -110,26 +112,70 @@ public static void Example_7_Customize()
     {
         X509Certificate2? cert = CryptoNetUtils.GetCertificateFromStore("CN=Maytham");
 
-        var pubKeyPem = CryptoNetUtils.ExportPemKey(cert!, false);
-        var priKeyPem = CryptoNetUtils.ExportPemKey(cert!);
-        
+        var pubKeyPem = ExportPemKey(cert!, false);
+        var priKeyPem = ExportPemKey(cert!);
+
         var password = "password";
-        var encryptedPriKeyBytes = CryptoNetUtils.ExportPemKeyWithPassword(cert!, password);
-        
-        ICryptoNet cryptoNet1 = CryptoNetUtils.ImportPemKeyWithPassword(encryptedPriKeyBytes, password);
+        var encryptedPriKeyBytes = ExportPemKeyWithPassword(cert!, password);
+
+        ICryptoNet cryptoNet1 = ImportPemKeyWithPassword(encryptedPriKeyBytes, password);
         var encrypt1 = cryptoNet1.EncryptFromString(ConfidentialDummyData);
 
-        ICryptoNet cryptoNet2 = CryptoNetUtils.ImportPemKey(pubKeyPem);
+        ICryptoNet cryptoNet2 = ImportPemKey(pubKeyPem);
         var encrypt2 = cryptoNet2.EncryptFromString(ConfidentialDummyData);
 
-        ICryptoNet cryptoNet3 = CryptoNetUtils.ImportPemKey(priKeyPem);
+        ICryptoNet cryptoNet3 = ImportPemKey(priKeyPem);
         var decrypt2 = cryptoNet3.DecryptToString(encrypt2);
-        
+
         Debug.Assert(ConfidentialDummyData == decrypt2);
 
         var decrypt1 = cryptoNet3.DecryptToString(encrypt1);
-        
+
         Debug.Assert(ConfidentialDummyData == decrypt1);
     }
 
+    public static char[] ExportPemCertificate(X509Certificate2 cert)
+    {
+        byte[] certBytes = cert!.RawData;
+        char[] certPem = PemEncoding.Write("CERTIFICATE", certBytes);
+        return certPem;
+    }
+
+    public static char[] ExportPemKey(X509Certificate2 cert, bool privateKey = true)
+    {
+        AsymmetricAlgorithm rsa = cert.GetRSAPrivateKey()!;
+
+        if (privateKey)
+        {
+            byte[] priKeyBytes = rsa.ExportPkcs8PrivateKey();
+            return PemEncoding.Write("PRIVATE KEY", priKeyBytes);
+        }
+
+        byte[] pubKeyBytes = rsa.ExportSubjectPublicKeyInfo();
+        return PemEncoding.Write("PUBLIC KEY", pubKeyBytes);
+    }
+
+    public static ICryptoNet ImportPemKey(char[] key)
+    {
+        ICryptoNet cryptoNet = new CryptoNetRsa();
+        cryptoNet.Info.RsaDetail!.Rsa?.ImportFromPem(key);
+        return cryptoNet;
+    }
+
+    public static byte[] ExportPemKeyWithPassword(X509Certificate2 cert, string password)
+    {
+        AsymmetricAlgorithm rsa = cert.GetRSAPrivateKey()!;
+        byte[] pass = Encoding.UTF8.GetBytes(password);
+        byte[] encryptedPrivateKey = rsa.ExportEncryptedPkcs8PrivateKey(pass,
+            new PbeParameters(PbeEncryptionAlgorithm.Aes256Cbc, HashAlgorithmName.SHA256, iterationCount: 100_000));
+        return encryptedPrivateKey;
+    }
+
+    public static ICryptoNet ImportPemKeyWithPassword(byte[] encryptedPrivateKey, string password)
+    {
+        ICryptoNet cryptoNet = new CryptoNetRsa();
+        cryptoNet.Info.RsaDetail?.Rsa?.ImportEncryptedPkcs8PrivateKey(password, encryptedPrivateKey, out _);
+        return cryptoNet;
+    }
+
 }
diff --git a/CryptoNet/CryptoNet.csproj b/CryptoNet/CryptoNet.csproj
@@ -15,7 +15,7 @@
         <Company>NextBix</Company>
         <Authors>Maytham Fahmi</Authors>
         <MinClientVersion>1.0.0</MinClientVersion>
-        <Version>1.5.0</Version>
+        <Version>2.0.0</Version>
         <Title>CryptoNet</Title>
         <Product>CryptoNet</Product>
         <RootNamespace>CryptoNet</RootNamespace>
@@ -39,15 +39,19 @@
     </Target>
 
     <ItemGroup>
-        <Content Include="CryptoNetLogo-icon.ico" />
+        <Content Include="CryptoNetLogo-icon.ico">
+          <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+        </Content>
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
         <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0" PrivateAssets="All" />
     </ItemGroup>
 
     <ItemGroup>
         <None Include="..\LICENSE" Pack="true" PackagePath="\" />
         <None Include="..\README.md" Pack="true" PackagePath="\" />
-        <None Include="..\img\CryptoNetLogo-icon.png" Pack="true" PackagePath="\" />
+        <None Include="..\img\CryptoNetLogo-icon.png" Pack="true" PackagePath="\">
+          <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+        </None>
     </ItemGroup>
 
 </Project>
diff --git a/CryptoNet/CryptoNetAes.cs b/CryptoNet/CryptoNetAes.cs
@@ -5,6 +5,8 @@
 // <date>17-12-2021 12:18:44</date>
 // <summary>part of CryptoNet project</summary>
 
+using System;
+using System.IO;
 using System.Security.Cryptography;
 using CryptoNet.Models;
 using CryptoNet.Utils;

diff --git a/CryptoNet/CryptoNetLogo-icon.ico b/CryptoNet/CryptoNetLogo-icon.ico
diff --git a/CryptoNet/CryptoNetRsa.cs b/CryptoNet/CryptoNetRsa.cs
@@ -5,6 +5,8 @@
 // <date>17-12-2021 12:18:44</date>
 // <summary>part of CryptoNet project</summary>
 
+using System;
+using System.IO;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 using CryptoNet.Models;

diff --git a/CryptoNet/ICryptoNet.cs b/CryptoNet/ICryptoNet.cs
@@ -5,6 +5,7 @@
 // <date>17-12-2021 12:18:44</date>
 // <summary>part of CryptoNet project</summary>
 
+using System.IO;
 using CryptoNet.Models;
 
 namespace CryptoNet

diff --git a/CryptoNet/Models/CryptoNetInfo.cs b/CryptoNet/Models/CryptoNetInfo.cs
@@ -5,6 +5,7 @@
 // <date>17-12-2021 12:18:44</date>
 // <summary>part of CryptoNet project</summary>
 
+using System;
 using System.ComponentModel;
 using System.Security.Cryptography;
 

diff --git a/CryptoNet/Utils/CryptoNetUtils.cs b/CryptoNet/Utils/CryptoNetUtils.cs
@@ -5,7 +5,9 @@
 // <date>17-12-2021 12:18:44</date>
 // <summary>part of CryptoNet project</summary>
 
+using System;
 using System.ComponentModel;
+using System.IO;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
@@ -63,50 +65,6 @@ public static RSAParameters GetParameters(X509Certificate2? certificate, KeyType
             }
         }
 
-        public static char[] ExportPemCertificate(X509Certificate2 cert)
-        {
-            byte[] certBytes = cert!.RawData;
-            char[] certPem = PemEncoding.Write("CERTIFICATE", certBytes);
-            return certPem;
-        }
-
-        public static char[] ExportPemKey(X509Certificate2 cert, bool privateKey = true)
-        {
-            AsymmetricAlgorithm rsa = cert.GetRSAPrivateKey()!;
-
-            if (privateKey)
-            {
-                byte[] priKeyBytes = rsa.ExportPkcs8PrivateKey();
-                return PemEncoding.Write("PRIVATE KEY", priKeyBytes);
-            }
-
-            byte[] pubKeyBytes = rsa.ExportSubjectPublicKeyInfo();
-            return PemEncoding.Write("PUBLIC KEY", pubKeyBytes);
-        }
-
-        public static ICryptoNet ImportPemKey(char[] key)
-        {
-            ICryptoNet cryptoNet = new CryptoNetRsa();
-            cryptoNet.Info.RsaDetail!.Rsa?.ImportFromPem(key);
-            return cryptoNet;
-        }
-
-        public static byte[] ExportPemKeyWithPassword(X509Certificate2 cert, string password)
-        {
-            AsymmetricAlgorithm rsa = cert.GetRSAPrivateKey()!;
-            byte[] pass = Encoding.UTF8.GetBytes(password);
-            byte[] encryptedPrivateKey = rsa.ExportEncryptedPkcs8PrivateKey(pass,
-                new PbeParameters(PbeEncryptionAlgorithm.Aes256Cbc, HashAlgorithmName.SHA256, iterationCount: 100_000));
-            return encryptedPrivateKey;
-        }
-
-        public static ICryptoNet ImportPemKeyWithPassword(byte[] encryptedPrivateKey, string password)
-        {
-            ICryptoNet cryptoNet = new CryptoNetRsa();
-            cryptoNet.Info.RsaDetail?.Rsa?.ImportEncryptedPkcs8PrivateKey(password, encryptedPrivateKey, out _);
-            return cryptoNet;
-        }
-
         public static string BytesToString(byte[] bytes)
         {
             return Encoding.ASCII.GetString(bytes);

diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ https://maythamfahmi.github.io/CryptoNet
 
 [![Nuget](https://img.shields.io/nuget/v/cryptonet?style=social)](https://www.nuget.org/packages/CryptoNet/) is latest version and are maintained. 
 
-#### [![Nuget](https://img.shields.io/badge/nuget-v2.0.0-blue?style=social)](https://www.nuget.org/packages/CryptoNet/2.0.0) [![Release%20Code](https://img.shields.io/badge/release%20code-v2.0.0-blue?style=social)](https://github.com/maythamfahmi/CryptoNet/releases/tag/v2.0.0)
+#### [![Nuget](https://img.shields.io/badge/nuget-v2.1.0-blue?style=social)](https://www.nuget.org/packages/CryptoNet/2.1.0) [![Release%20Code](https://img.shields.io/badge/release%20code-v2.1.0-blue?style=social)](https://github.com/maythamfahmi/CryptoNet/releases/tag/v2.1.0)
 - !!!Breaking change!!!
 - Refactoring RSA asymmetric encryption.
 - Introducing AES symmetric encryption.