Merge pull request #16 from SendSafely/v4.0.1

v4.0.1

Author: SendSafely-GitHub

SampleConsoleApplication/SendSafelyConsoleApplication.csproj

@@ -43,7 +43,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="SendsafelyAPI, Version=4.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="SendsafelyAPI, Version=4.0.1, 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.0</AssemblyVersion>
-    <FileVersion>4.0.0</FileVersion>
+    <AssemblyVersion>4.0.1</AssemblyVersion>
+    <FileVersion>4.0.1</FileVersion>
     <Platforms>AnyCPU</Platforms>
   </PropertyGroup>
   <PropertyGroup>
@@ -22,7 +22,7 @@
 	<FileAlignment>512</FileAlignment>
 	<TargetFrameworkProfile />
 	<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
-	<Version>4.0.0</Version>
+	<Version>4.0.1</Version>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
 	<DebugSymbols>true</DebugSymbols>
@@ -63,4 +63,4 @@
     <PackageReference Include="BouncyCastle.Cryptography" Version="2.5.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
-</Project>
+</Project>

SendsafelyAPI/Utilities/CryptUtility.cs

@@ -206,14 +206,26 @@ public String EncryptKeycode(String publicKeyStr, String unencryptedKeycode)
             {
                 foreach(PgpPublicKey publicKey in pgpPub.GetPublicKeys())
                 {
-                    if (publicKey.IsEncryptionKey)
+                    if (publicKey.IsEncryptionKey && CanEncrypt(publicKey.GetSignatures()))
                     {
                         key = publicKey;
                         break;
                     }
                 }
             }
-
+            if (key == null) {
+                foreach (PgpPublicKeyRing pgpPub in pubRings.GetKeyRings())
+                {
+                    foreach(PgpPublicKey publicKey in pgpPub.GetPublicKeys())
+                    {
+                        if (publicKey.IsEncryptionKey)
+                        {
+                            key = publicKey;
+                            break;
+                        }
+                    }
+                }
+            }
             if (key == null)
             {
                 throw new SendSafely.Exceptions.InvalidKeyException("Can't find encryption key in key ring.");

SendsafelyAPI/Utilities/StartupUtility.cs

@@ -1,63 +1,63 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Configuration;
-using SendSafely.Exceptions;
-using System.Net;
-using SendSafely.Objects;
-
-namespace SendSafely.Utilities
-{
-    internal class StartupUtility
-    {
-        private Connection connection;
-
-        public StartupUtility(String host, String privateKey, String apiKey)
-        {
-            this.connection = new Connection(host, privateKey, apiKey);
-        }
-
-        public StartupUtility(Connection connection)
-        {
-            this.connection = connection;
-        }
-
-        public StartupUtility(String host, String privateKey, String apiKey, WebProxy proxy)
-        {
-            if (privateKey == null || privateKey.Length == 0)
-            {
-                throw new InvalidCredentialsException("The private key can't be null or empty");
-            }
-            else if (apiKey == null || apiKey.Length == 0)
-            {
-                throw new InvalidCredentialsException("The API key can't be null or empty");
-            }
-
-            this.connection = new Connection(host, privateKey, apiKey, proxy);
-        }
-
-        public Objects.Version VerifyVersion()
-        {
-            Endpoint p = ConnectionStrings.Endpoints["version"].Clone();
-            String version = "0.3";
-            p.Path = p.Path.Replace("{version}", version);
-
-            VersionResponse response = connection.Send<VersionResponse>(p);
-            return response.Version;
-        }
-
-        public String VerifyCredentials()
-        {
-            Endpoint p = ConnectionStrings.Endpoints["verifyCredentials"].Clone();
-
-            StandardResponse response = connection.Send<StandardResponse>(p);
-
-            if (response.Response != APIResponse.SUCCESS)
-            {
-                throw new InvalidCredentialsException("Failed to verify the credentials.");
-            }
-
-            return response.Message;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Configuration;
+using SendSafely.Exceptions;
+using System.Net;
+using SendSafely.Objects;
+
+namespace SendSafely.Utilities
+{
+    internal class StartupUtility
+    {
+        private Connection connection;
+
+        public StartupUtility(String host, String privateKey, String apiKey)
+        {
+            this.connection = new Connection(host, privateKey, apiKey);
+        }
+
+        public StartupUtility(Connection connection)
+        {
+            this.connection = connection;
+        }
+
+        public StartupUtility(String host, String privateKey, String apiKey, WebProxy proxy)
+        {
+            if (privateKey == null || privateKey.Length == 0)
+            {
+                throw new InvalidCredentialsException("The private key can't be null or empty");
+            }
+            else if (apiKey == null || apiKey.Length == 0)
+            {
+                throw new InvalidCredentialsException("The API key can't be null or empty");
+            }
+
+            this.connection = new Connection(host, privateKey, apiKey, proxy);
+        }
+
+        public Objects.Version VerifyVersion()
+        {
+            Endpoint p = ConnectionStrings.Endpoints["version"].Clone();
+            String version = "0.3";
+            p.Path = p.Path.Replace("{version}", version);
+
+            VersionResponse response = connection.Send<VersionResponse>(p);
+            return response.Version;
+        }
+
+        public String VerifyCredentials()
+        {
+            Endpoint p = ConnectionStrings.Endpoints["verifyCredentials"].Clone();
+
+            StandardResponse response = connection.Send<StandardResponse>(p);
+
+            if (response.Response != APIResponse.SUCCESS)
+            {
+                throw new InvalidCredentialsException("Failed to verify the credentials.");
+            }
+
+            return response.Message;
         }
 
         public User GetUserInformation()
@@ -72,24 +72,24 @@ public User GetUserInformation()
             }
 
             return Convert(response);
-        }
-
-        public Connection GetConnectionObject()
-        {
-            return this.connection;
-        }
-
-        private User Convert(UserInformationResponse response)
-        {
+        }
+
+        public Connection GetConnectionObject()
+        {
+            return this.connection;
+        }
+
+        private User Convert(UserInformationResponse response)
+        {
             User user = new User();
             user.AllowPublicKey = response.AllowPublicKey;
             user.ClientKey = response.ClientKey;
             user.Email = response.Email;
             user.FirstName = response.FirstName;
             user.Id = response.Id;
             user.LastName = response.LastName;
-            user.PackageLife = response.PackageLife;
-            return user;
-        }
-    }
-}
+            user.PackageLife = response.PackageLife;
+            return user;
+        }
+    }
+}