Merge branch 'master' into dev

Source commit: 6d03627b7e1a7a0834b8c20740aa7f626b4715b4

source/core/Common.cpp

@@ -3269,6 +3269,7 @@ void __fastcall ParseCertificate(const UnicodeString & Path,
 {
   Certificate = NULL;
   PrivateKey = NULL;
+  WrongPassphrase = false;
   bool HasPassphrase = !Passphrase.IsEmpty();
 
   FILE * File;

source/core/Terminal.cpp

@@ -7830,7 +7830,7 @@ bool __fastcall TTerminal::LoadTlsCertificate(X509 *& Certificate, EVP_PKEY *& P
     {
       Retry = false;
 
-      bool WrongPassphrase = false;
+      bool WrongPassphrase;
       ParseCertificate(SessionData->TlsCertificateFile, Passphrase, Certificate, PrivateKey, WrongPassphrase);
       if (WrongPassphrase)
       {