Certificate matching selected private key is automatically selected along

Source commit: b9296784b6144dd55fc89e3844593579f3a301cf

source/forms/SiteAdvanced.cpp

@@ -816,6 +816,20 @@ void __fastcall TSiteAdvancedDialog::UpdateNavigationTree()
   }
 }
 //---------------------------------------------------------------------
+bool TSiteAdvancedDialog::HasCertificate(const UnicodeString & FileName)
+{
+  bool Result = false;
+  try
+  {
+    UnicodeString UnusedComment;
+    GetPublicKeyLine(FileName, UnusedComment, Result);
+  }
+  catch (...)
+  {
+  }
+  return Result;
+}
+//---------------------------------------------------------------------
 void __fastcall TSiteAdvancedDialog::UpdateControls()
 {
   if (Visible)
@@ -863,18 +877,10 @@ void __fastcall TSiteAdvancedDialog::UpdateControls()
     if (PrivateKeyEdit3->Text != FLastPrivateKey)
     {
       FLastPrivateKey = PrivateKeyEdit3->Text;
-      FKeyHasCertificate = false;
-      if (PrivateKeyEdit3->Enabled && !FLastPrivateKey.IsEmpty())
-      {
-        try
-        {
-          UnicodeString UnusedComment;
-          GetPublicKeyLine(FLastPrivateKey, UnusedComment, FKeyHasCertificate);
-        }
-        catch (...)
-        {
-        }
-      }
+      FKeyHasCertificate =
+        PrivateKeyEdit3->Enabled &&
+        !FLastPrivateKey.IsEmpty() &&
+        HasCertificate(FLastPrivateKey);
     }
     EnableControl(PrivateKeyViewButton, PrivateKeyEdit3->Enabled && !PrivateKeyEdit3->Text.IsEmpty());
     EnableControl(DetachedCertificateEdit, PrivateKeyViewButton->Enabled && !FKeyHasCertificate);
@@ -1339,6 +1345,30 @@ void __fastcall TSiteAdvancedDialog::PrivateKeyEdit3AfterDialog(TObject * Sender
   if (Name != Edit->Text)
   {
     VerifyAndConvertKey(Name, true);
+
+    if (!Name.IsEmpty() && !HasCertificate(Name))
+    {
+      try
+      {
+        UnicodeString FileName = ExpandEnvironmentVariables(Name);
+        TKeyType Type = KeyType(FileName);
+        // This gonna fail for encrypted keys
+        TPrivateKey * PrivateKey = LoadKey(Type, FileName, EmptyStr);
+        try
+        {
+          UnicodeString CertificateFileName = AddMatchingKeyCertificate(PrivateKey, FileName);
+          DetachedCertificateEdit->Text = CertificateFileName;
+        }
+        __finally
+        {
+          FreeKey(PrivateKey);
+        }
+      }
+      catch (Exception & E)
+      {
+        // swallow
+      }
+    }
   }
 }
 //---------------------------------------------------------------------------

source/forms/SiteAdvanced.h

@@ -379,6 +379,7 @@ private:
   UnicodeString __fastcall GetPuttySiteKey();
   void __fastcall ClosePuttySettings();
   void SerializePuttyRegistry(const UnicodeString & Key, TStrings * Values);
+  bool HasCertificate(const UnicodeString & FileName);
 
   INTERFACE_HOOK;
 };

source/windows/Tools.cpp

@@ -1255,6 +1255,32 @@ UnicodeString GetConvertedKeyFileName(const UnicodeString & FileName)
   return ChangeFileExt(FileName, FORMAT(L".%s", (PuttyKeyExt)));
 }
 //---------------------------------------------------------------------------
+UnicodeString AddMatchingKeyCertificate(TPrivateKey * PrivateKey, const UnicodeString & FileName)
+{
+  UnicodeString CertificateFileName = FileName;
+  UnicodeString S = FORMAT(L".%s", (PuttyKeyExt));
+  if (EndsText(S, CertificateFileName))
+  {
+    CertificateFileName.SetLength(CertificateFileName.Length() - S.Length());
+  }
+  CertificateFileName += L"-cert.pub";
+
+  UnicodeString Result;
+  if (FileExists(CertificateFileName))
+  {
+    try
+    {
+      AddCertificateToKey(PrivateKey, CertificateFileName);
+      Result = CertificateFileName;
+    }
+    catch (Exception & E)
+    {
+      AppLogFmt(L"Cannot add certificate from auto-detected \"%s\": %s", (CertificateFileName, E.Message));
+    }
+  }
+  return Result;
+}
+//---------------------------------------------------------------------------
 static void __fastcall ConvertKey(UnicodeString & FileName, TKeyType Type)
 {
   UnicodeString Passphrase;
@@ -1278,19 +1304,11 @@ static void __fastcall ConvertKey(UnicodeString & FileName, TKeyType Type)
     AppLogFmt(L"Loaded key from \"%s\".", (FileName));
 
     UnicodeString CertificateMessage;
-    UnicodeString CertificateFileName = FileName + L"-cert.pub";
-    if (FileExists(CertificateFileName))
+    UnicodeString CertificateFileName = AddMatchingKeyCertificate(PrivateKey, FileName);
+    if (!CertificateFileName.IsEmpty())
     {
-      try
-      {
-        AddCertificateToKey(PrivateKey, CertificateFileName);
-        AppLogFmt(L"Added certificate from auto-detected \"%s\".", (CertificateFileName));
-        CertificateMessage = L"\n" + FMTLOAD(CERTIFICATE_ADDED, (CertificateFileName));
-      }
-      catch (Exception & E)
-      {
-        AppLogFmt(L"Cannot add certificate from auto-detected \"%s\": %s", (CertificateFileName, E.Message));
-      }
+      AppLogFmt(L"Added certificate from auto-detected \"%s\".", (CertificateFileName));
+      CertificateMessage = L"\n" + FMTLOAD(CERTIFICATE_ADDED, (CertificateFileName));
     }
 
     FileName = GetConvertedKeyFileName(FileName);

source/windows/Tools.h

@@ -72,6 +72,8 @@ void __fastcall ShutDownWindows();
 void __fastcall SuspendWindows();
 void __fastcall EditSelectBaseName(HWND Edit);
 UnicodeString GetConvertedKeyFileName(const UnicodeString & FileName);
+struct TPrivateKey;
+UnicodeString AddMatchingKeyCertificate(TPrivateKey * PrivateKey, const UnicodeString & FileName);
 void __fastcall VerifyAndConvertKey(UnicodeString & FileName, bool CanIgnore);
 void __fastcall VerifyKey(const UnicodeString & FileName);
 void __fastcall VerifyCertificate(const UnicodeString & FileName);