fix IAgentExt.AddKeyFromFile when no cert file

This was getting a null reference error when no certificate public key file was present. Fixes dlech/KeeAgent#358
dlech · Sep 25, 2022 · f017165 · f017165
1 parent c96e6d0
commit f017165
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/SshAgentLib/IAgent.cs b/SshAgentLib/IAgent.cs
@@ -98,7 +98,12 @@ public static ISshKey AddKeyFromFile(
 
             try
             {
-                publicKey = SshPublicKey.Read(File.OpenRead($"{fileName}-cert.pub"));
+                var certificateKey = SshPublicKey.Read(File.OpenRead($"{fileName}-cert.pub"));
+
+                if (certificateKey != null)
+                {
+                    privateKey = privateKey.WithPublicKey(certificateKey);
+                }
             }
             catch
             {
@@ -109,9 +114,9 @@ public static ISshKey AddKeyFromFile(
                 privateKey.PublicKey.Parameter,
                 privateKey.Decrypt(getPassPhraseCallback, progress),
                 privateKey.PublicKey.Comment,
-                publicKey.Nonce,
-                publicKey.Certificate,
-                publicKey.Application
+                privateKey.PublicKey.Nonce,
+                privateKey.PublicKey.Certificate,
+                privateKey.PublicKey.Application
             );
 
             if (constraints != null)