Update CreateRsaKey method, now support rsa size,default size is 2048. Add RSAFromString method

Author: myloveCc

NETCore.Encrypt.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26730.3
+VisualStudioVersion = 15.0.26730.8
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2520DA96-86CD-4BD6-8807-95F27381BE1C}"
 EndProject

src/NETCore.Encrypt/EncryptProvider.cs

@@ -258,7 +258,7 @@ public static string RSAEncrypt(string publicKey, string srcString)
             Check.Argument.IsNotEmpty(publicKey, nameof(publicKey));
             Check.Argument.IsNotEmpty(srcString, nameof(srcString));
 
-            using (RSA rsa = RSA.Create(2048))
+            using (RSA rsa = RSA.Create())
             {
                 rsa.FromJsonString(publicKey);
                 byte[] encryptBytes = rsa.Encrypt(Encoding.UTF8.GetBytes(srcString), RSAEncryptionPadding.OaepSHA512);
@@ -276,7 +276,7 @@ public static string RSADecrypt(string privateKey, string srcString)
             Check.Argument.IsNotEmpty(privateKey, nameof(privateKey));
             Check.Argument.IsNotEmpty(srcString, nameof(srcString));
 
-            using (RSA rsa = RSA.Create(2048))
+            using (RSA rsa = RSA.Create())
             {
                 rsa.FromJsonString(privateKey);
                 byte[] srcBytes = srcString.ToBytes();
@@ -286,11 +286,11 @@ public static string RSADecrypt(string privateKey, string srcString)
         }
 
         /// <summary>
-        /// RSA Instance
+        /// RSA from json string
         /// </summary>
-        /// <param name="rsaKey"></param>
+        /// <param name="rsaKey">rsa json string</param>
         /// <returns></returns>
-        public static RSA RSAInstance(string rsaKey)
+        public static RSA RSAFromString(string rsaKey)
         {
             Check.Argument.IsNotEmpty(rsaKey, nameof(rsaKey));
             RSA rsa = RSA.Create();
@@ -302,12 +302,12 @@ public static RSA RSAInstance(string rsaKey)
         /// <summary>
         /// Create an RSA key 
         /// </summary>
+        /// <param name="keySizeInBits">the default size is 2048</param>
         /// <returns></returns>
-        public static RSAKey CreateRsaKey()
+        public static RSAKey CreateRsaKey(RsaSize rsaSize = RsaSize.R2048)
         {
-            using (RSA rsa = RSA.Create(2048))
+            using (RSA rsa = RSA.Create((int) rsaSize))
             {
-
                 string publicKey = rsa.ToJsonString(false);
                 string privateKey = rsa.ToJsonString(true);
 

src/NETCore.Encrypt/Extensions/Internal/RsaKeyExtensions.cs

@@ -74,7 +74,7 @@ internal static string ToJsonString(this RSA rsa, bool includePrivateParameters)
         /// </summary>
         /// <param name="rsa">RSA实例<see cref="RSA"/></param>
         /// <param name="jsonString">RSA的Key序列化XML字符串</param>
-        public static void FromXmlString(this RSA rsa, string xmlString)
+        public static void FromLvccXmlString(this RSA rsa, string xmlString)
         {
             RSAParameters parameters = new RSAParameters();
 
@@ -112,7 +112,7 @@ public static void FromXmlString(this RSA rsa, string xmlString)
         /// <param name="rsa">RSA实例<see cref="RSA"/></param>
         /// <param name="includePrivateParameters">是否包含私钥</param>
         /// <returns></returns>
-        public static string ToXmlString(this RSA rsa, bool includePrivateParameters)
+        public static string ToLvccXmlString(this RSA rsa, bool includePrivateParameters)
         {
             RSAParameters parameters = rsa.ExportParameters(includePrivateParameters);
 

src/NETCore.Encrypt/Internal/RsaSizeType.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace NETCore.Encrypt
+{
+    public enum RsaSize
+    {
+        R1024=1024,
+        R2048=2048,
+        R3072=3072,
+        R4096=4096
+    }
+}

src/NETCore.Encrypt/NETCore.Encrypt.csproj

@@ -6,15 +6,16 @@
     <Company>Lvcc</Company>
     <Product>Lvcc</Product>
     <Authors>Lvcc</Authors>
-    <Description>NETCore encrypt and decrpty tool，Include AES，RSA，MD5，SAH1，SAH256，SHA384，SHA512，</Description>
+    <Description>NETCore encrypt and decrpty tool，Include AES，RSA，MD5，SAH1，SAH256，SHA384，SHA512</Description>
     <Copyright>Copyright 2017 (c) Lvcc. All rights reserved</Copyright>
     <PackageLicenseUrl>https://github.com/myloveCc/NETCore.Encrypt/blob/master/License</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/myloveCc/NETCore.Encrypt</PackageProjectUrl>
     <RepositoryUrl>https://github.com/myloveCc/NETCore.Encrypt</RepositoryUrl>
     <RepositoryType>Github</RepositoryType>
-    <AssemblyVersion>1.0.1.0</AssemblyVersion>
-    <FileVersion>1.0.1.0</FileVersion>
-    <Version>1.0.1</Version>
+    <AssemblyVersion>2.0.1.0</AssemblyVersion>
+    <FileVersion>2.0.1.0</FileVersion>
+    <Version>2.0.1</Version>
+    <PackageReleaseNotes>Update CreateRsaKey, Add RSAFromString</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>

test/NETCore.Encrypt.Tests/RSA_Tests.cs

@@ -92,18 +92,17 @@ public void Rsa_Decrypt_EmptyData_Test()
             Assert.Throws<ArgumentException>(() => EncryptProvider.RSAEncrypt(rsaKey.PublicKey, srcString));
         }
 
-        [Fact(DisplayName = "Rsa instance test")]
-        public void Rsa_Instance_Test()
+        [Fact(DisplayName = "Rsa from json string test")]
+        public void Rsa_From_JsonString_Test()
         {
             var rsaKey = EncryptProvider.CreateRsaKey();
 
             var publicKey = rsaKey.PublicKey;
             var privateKey = rsaKey.PrivateKey;
 
-            var rsa = EncryptProvider.RSAInstance(publicKey);
+            var rsa = EncryptProvider.RSAFromString(publicKey);
 
             Assert.NotNull(rsa);
-            Assert.Equal(2048, rsa.KeySize);
 
         }
     }