2018.4.1.0

Author: seayxu

GodSharp.Encryption.sln

@@ -7,16 +7,24 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{365F3D50-DBA
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{D94E875E-7D01-432C-B44A-95BC632D3880}"
 	ProjectSection(SolutionItems) = preProject
+		appveyor.yml = appveyor.yml
 		build\common.props = build\common.props
 		build\version.props = build\version.props
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GodSharp.Encryption", "src\GodSharp.Encryption\GodSharp.Encryption.csproj", "{EA23E6BF-07FA-4BA1-902D-B507A83458BC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GodSharp.Encryption", "src\GodSharp.Encryption\GodSharp.Encryption.csproj", "{EA23E6BF-07FA-4BA1-902D-B507A83458BC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GodSharp.Encryption.Test", "test\GodSharp.Encryption.Test\GodSharp.Encryption.Test.csproj", "{A552D3A1-2CCD-4B4A-8EE1-E3E721CB0FF9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GodSharp.Encryption.Test", "test\GodSharp.Encryption.Test\GodSharp.Encryption.Test.csproj", "{A552D3A1-2CCD-4B4A-8EE1-E3E721CB0FF9}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{FF20D902-2537-4F14-88BE-7DDAC879E7F8}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{D642BE82-3960-4D0E-BCAB-3D18F4C6181B}"
+	ProjectSection(SolutionItems) = preProject
+		.gitignore = .gitignore
+		LICENSE = LICENSE
+		README.md = README.md
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

README.md

@@ -45,6 +45,14 @@ Common encryption method for .NET.
 
 - Decrypt()
 
+generate openssl key
+
+``` bash
+openssl
+genrsa -out openssl_rsa_pri_2048.pem 2048
+rsa -in openssl_rsa_pri_2048.pem -pubout -out openssl_rsa_pub_2048.pem
+```
+
 # Base64
 
 ## Method

appveyor.yml

@@ -1,4 +1,4 @@
-version: 1.0.1.{build}
+version: 2018.4.1.{build}
 branches:
   only:
     - master

build/version.props

@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup Condition="'$(AssemblyName)'=='GodSharp.Encryption'">
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>1.0.1</Version>
-    <FileVersion>1.0.1</FileVersion>
+    <Version>2018.4.1.0</Version>
+    <FileVersion>2018.4.1</FileVersion>
     <DocumentationFile>$(SolutionDir)\output\$(AssemblyName)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
   </PropertyGroup>
 </Project>

src/GodSharp.Encryption/Asymmetric/RSA.cs

@@ -9,39 +9,30 @@ namespace GodSharp.Encryption
     /// <summary>
     /// Asymmetric/RSA encryption.
     /// </summary>
-    public class RSA
+    public static class RSA
     {
         /// <summary>
-        /// The string format of public key.
+        /// Gets or sets the open SSL.
         /// </summary>
-        private static string publicKeyFormat = @"<RSAKeyValue><Modulus>{0}</Modulus><Exponent>{1}</Exponent></RSAKeyValue>";
-
-        /// <summary>
-        /// The string format of private key.
-        /// </summary>
-        private static string privateKeyFormat = @"<RSAKeyValue><Modulus>{0}</Modulus><Exponent>{1}</Exponent><P>{2}</P><Q>{3}</Q><DP>{4}</DP><DQ>{5}</DQ><InverseQ>{6}</InverseQ><D>{7}</D></RSAKeyValue>";
+        /// <value>
+        /// The open SSL.
+        /// </value>
+        public static RSAOpenSsl OpenSsl => RSAOpenSslSingletonContainer.Instance;
 
         #region Get public and private key of xml format.
         /// <summary>
         /// Get public and private key of xml format.
         /// </summary>
         /// <param name="xmlPrivateKey">The private key of xml format.</param>
         /// <param name="xmlPublicKey">The public key of xml format.</param>
-        /// <param name="dwKeySize">The size of the key to use in bits</param>
-        public static void CreateKey(out string xmlPrivateKey, out string xmlPublicKey, int dwKeySize = 1024)
+        /// <param name="size">The size of the key to use in bits</param>
+        public static void CreateXmlKey(out string xmlPrivateKey, out string xmlPublicKey, RSASizeTypes size = RSASizeTypes.L2048)
         {
-            try
+            using (RSACryptoServiceProvider rsa = new RSACryptoServiceProvider((int)size))
             {
-                xmlPrivateKey = null;
-                xmlPublicKey = null;
-                RSACryptoServiceProvider rsa = new RSACryptoServiceProvider(dwKeySize);
                 xmlPrivateKey = rsa.ToXmlString(true);
                 xmlPublicKey = rsa.ToXmlString(false);
             }
-            catch ( Exception ex)
-            {
-                throw ex;
-            }
         }
         #endregion
 
@@ -54,14 +45,9 @@ public static void CreateKey(out string xmlPrivateKey, out string xmlPublicKey,
         /// <returns>String private key of xml format.</returns>
         public static string GetPrivateKey(string certFile, string password)
         {
-            if (!File.Exists(certFile))
-            {
-                throw new FileNotFoundException(nameof(certFile));
-            }
+            X509Certificate2 cert = GetX509Certificate2(certFile);
 
-            X509Certificate2 cert = new X509Certificate2(certFile, password, X509KeyStorageFlags.Exportable);
-            string privateKey = cert.PrivateKey.ToXmlString(true);
-            return privateKey;
+            return cert.PrivateKey.ToXmlString(true);
         }
 
         /// <summary>
@@ -71,14 +57,22 @@ public static string GetPrivateKey(string certFile, string password)
         /// <returns>String public key of xml format.</returns>
         public static string GetPublicKey(string certFile)
         {
-            if (!File.Exists(certFile))
-            {
-                throw new FileNotFoundException(nameof(certFile));
-            }
+            X509Certificate2 cert = GetX509Certificate2(certFile);
 
-            X509Certificate2 cert = new X509Certificate2(certFile);
-            string publicKey = cert.PublicKey.Key.ToXmlString(false);
-            return publicKey;
+            return cert.PublicKey.Key.ToXmlString(false);
+        }
+
+        /// <summary>
+        /// Gets the X509 certificate2.
+        /// </summary>
+        /// <param name="certFile">The cert file.</param>
+        /// <returns></returns>
+        /// <exception cref="FileNotFoundException">certFile</exception>
+        private static X509Certificate2 GetX509Certificate2(string certFile)
+        {
+            if (!File.Exists(certFile)) throw new FileNotFoundException(nameof(certFile));
+
+            return new X509Certificate2(certFile);
         }
         #endregion
 
@@ -92,12 +86,9 @@ public static string GetPublicKey(string certFile)
         /// <returns>The encrypted data.</returns>
         public static string Encrypt(string data, string xmlPublicKey, Encoding encoding = null)
         {
-            using (RSACryptoServiceProvider rsa = new RSACryptoServiceProvider())
-            {
-                rsa.FromXmlString(xmlPublicKey);
-                byte[] bytes = rsa.Encrypt(encoding.GetBytes(data), false);
-                return Convert.ToBase64String(bytes);
-            }
+            if (encoding == null) encoding = Encoding.UTF8;
+
+            return Encrypt(encoding.GetBytes(data), xmlPublicKey);
         }
 
         /// <summary>
@@ -125,13 +116,7 @@ public static string Encrypt(byte[] dataBytes, string xmlPublicKey)
         /// <returns>The decrypted data.</returns>
         public static string Decrypt(string data, string xmlPrivateKey, Encoding encoding = null)
         {
-            using (RSACryptoServiceProvider rsa = new RSACryptoServiceProvider())
-            {
-                byte[] dataBytes = Convert.FromBase64String(data);
-                rsa.FromXmlString(xmlPrivateKey);
-                byte[] bytes = rsa.Decrypt(dataBytes, false);
-                return encoding.GetString(bytes);
-            }
+            return Decrypt(Convert.FromBase64String(data), xmlPrivateKey, encoding);
         }
 
         /// <summary>
@@ -143,6 +128,8 @@ public static string Decrypt(string data, string xmlPrivateKey, Encoding encodin
         /// <returns>The decrypted data.</returns>
         public static string Decrypt(byte[] dataBytes, string xmlPrivateKey, Encoding encoding = null)
         {
+            if (encoding == null) encoding = Encoding.UTF8;
+
             using (RSACryptoServiceProvider rsa = new RSACryptoServiceProvider())
             {
                 rsa.FromXmlString(xmlPrivateKey);
@@ -151,102 +138,5 @@ public static string Decrypt(byte[] dataBytes, string xmlPrivateKey, Encoding en
             }
         }
         #endregion
-
-        #region Get hash sign
-        /// <summary>
-        /// Get hash sign.
-        /// </summary>
-        /// <param name="data"></param>
-        /// <param name="hash"></param>
-        /// <param name="encoding">The <see cref="T:System.Text.Encoding"/>,default is Encoding.UTF8.</param>
-        /// <returns></returns>
-        public bool GetHash(string data, ref byte[] hash,Encoding encoding=null)
-        {
-            try
-            {
-                if (encoding==null)
-                {
-                    encoding = Encoding.UTF8;
-                }
-                HashAlgorithm MD5 = HashAlgorithm.Create("MD5");
-                hash = MD5.ComputeHash(encoding.GetBytes(data));
-                return true;
-            }
-            catch (Exception ex)
-            {
-                throw ex;
-            }
-        }
-
-        /// <summary>
-        /// Get hash sign.
-        /// </summary>
-        /// <param name="data"></param>
-        /// <param name="hash"></param>
-        /// <param name="encoding">The <see cref="T:System.Text.Encoding"/>,default is Encoding.UTF8.</param>
-        /// <returns></returns>
-        public bool GetHash(string data, ref string hash, Encoding encoding = null)
-        {
-            try
-            {
-                if (encoding == null)
-                {
-                    encoding = Encoding.UTF8;
-                }
-
-                HashAlgorithm MD5 = HashAlgorithm.Create("MD5");
-                byte[] buffer = MD5.ComputeHash(encoding.GetBytes(data));
-                hash = Convert.ToBase64String(buffer);
-                return true;
-            }
-            catch (Exception ex)
-            {
-                throw ex;
-            }
-        }
-
-        /// <summary>
-        /// Get hash sign.
-        /// </summary>
-        /// <param name="fs"></param>
-        /// <param name="hash"></param>
-        /// <returns></returns>
-        public bool GetHash(FileStream fs, ref byte[] hash)
-        {
-            try
-            {
-                HashAlgorithm MD5 = HashAlgorithm.Create("MD5");
-                hash = MD5.ComputeHash(fs);
-                fs.Close();
-                return true;
-            }
-            catch (Exception ex)
-            {
-                throw ex;
-            }
-        }
-
-        /// <summary>
-        /// Get hash sign.
-        /// </summary>
-        /// <param name="fs"></param>
-        /// <param name="hash"></param>
-        /// <returns></returns>
-        public bool GetHash(FileStream fs, ref string hash)
-        {
-            try
-            {
-                HashAlgorithm MD5 = HashAlgorithm.Create("MD5");
-                byte[] buffer = MD5.ComputeHash(fs);
-                fs.Close();
-                hash = Convert.ToBase64String(buffer);
-                return true;
-            }
-            catch (Exception ex)
-            {
-                throw ex;
-            }
-        }
-        #endregion
     }
 }