Merge pull request #17 from SendSafely/v4.0.2

v4.0.2

Author: SendSafely-GitHub

SampleConsoleApplication/SendSafelyConsoleApplication.csproj

@@ -43,7 +43,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="SendsafelyAPI, Version=4.0.1, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="SendsafelyAPI, Version=4.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\SendsafelyAPI\packages\SendsafelyAPI.dll</HintPath>
     </Reference>

SendsafelyAPI/SendsafelyAPI.csproj

@@ -4,8 +4,8 @@
     <AssemblyTitle>SendSafely Windows Client API</AssemblyTitle>
     <Product>SendSafely Windows Client API</Product>
     <Copyright>Copyright ©  2024</Copyright>
-    <AssemblyVersion>4.0.1</AssemblyVersion>
-    <FileVersion>4.0.1</FileVersion>
+    <AssemblyVersion>4.0.2</AssemblyVersion>
+    <FileVersion>4.0.2</FileVersion>
     <Platforms>AnyCPU</Platforms>
   </PropertyGroup>
   <PropertyGroup>
@@ -22,7 +22,7 @@
 	<FileAlignment>512</FileAlignment>
 	<TargetFrameworkProfile />
 	<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
-	<Version>4.0.1</Version>
+	<Version>4.0.2</Version>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
 	<DebugSymbols>true</DebugSymbols>

SendsafelyAPI/Utilities/CryptUtility.cs

@@ -15,6 +15,12 @@
 
 namespace SendSafely.Utilities
 {
+    public enum KeySize
+    {
+        SIZE_2048 = 2048,
+        SIZE_4096 = 4096
+    }
+
     public class CryptUtility
     {
         public String GenerateToken()
@@ -323,21 +329,30 @@ public String DecryptKeycode(String privateKeyStr, String encryptedKeycode)
 
         public Keypair GenerateKeyPair(String email)
         {
-            AsymmetricCipherKeyPair keyPair = generateAsymmetricCipherKeyPair();
-            Keypair pair = Armor(keyPair, email);
+            AsymmetricCipherKeyPair keyPair = generateAsymmetricCipherKeyPair(2048);
+            Keypair pair = Armor(keyPair, email, 2048);
+
+            return pair;
+        }
+        
+        public Keypair GenerateKeyPair(String email, KeySize keySize)
+        {
+            int keySizeVal = (int)keySize;
+            AsymmetricCipherKeyPair keyPair = generateAsymmetricCipherKeyPair(keySizeVal);
+            Keypair pair = Armor(keyPair, email, keySizeVal);
 
             return pair;
         }
 
-        private Keypair Armor(AsymmetricCipherKeyPair keyPair, String email)
+        private Keypair Armor(AsymmetricCipherKeyPair keyPair, String email, int keySize)
         {
             AsymmetricKeyParameter privateKey = keyPair.Private;
             AsymmetricKeyParameter publicKey = keyPair.Public;
 
             MemoryStream memOut = new MemoryStream();
             ArmoredOutputStream secretOut = new ArmoredOutputStream(memOut);
 
-            AsymmetricCipherKeyPair subKeyPair = generateAsymmetricCipherKeyPair();
+            AsymmetricCipherKeyPair subKeyPair = generateAsymmetricCipherKeyPair(keySize);
             PgpSignatureSubpacketGenerator subPackets = new PgpSignatureSubpacketGenerator();
             subPackets.SetKeyFlags(false,KeyFlags.CertifyOther | KeyFlags.SignData);
             subPackets.SetKeyExpirationTime(false, 0);
@@ -384,10 +399,10 @@ private Keypair Armor(AsymmetricCipherKeyPair keyPair, String email)
             return pair;
         }
 
-        private AsymmetricCipherKeyPair generateAsymmetricCipherKeyPair()
+        private AsymmetricCipherKeyPair generateAsymmetricCipherKeyPair(int keySize)
         {
             RsaKeyPairGenerator kpgen = new RsaKeyPairGenerator();
-            kpgen.Init(new KeyGenerationParameters(new SecureRandom(new CryptoApiRandomGenerator()), 2048));
+            kpgen.Init(new KeyGenerationParameters(new SecureRandom(new CryptoApiRandomGenerator()), keySize));
             AsymmetricCipherKeyPair keyPair = kpgen.GenerateKeyPair();
             return keyPair;
         }