Bladeren bron

Including PuTTY and OpenSSL versions in /info

Source commit: b45828a5b6e3eb71c4d2ba7d9453919cff8a7d48
Martin Prikryl 1 jaar geleden
bovenliggende
commit
40d4c7fafc
3 gewijzigde bestanden met toevoegingen van 16 en 1 verwijderingen
  1. 6 1
      source/core/SessionInfo.cpp
  2. 1 0
      source/core/SessionInfo.h
  3. 9 0
      source/windows/ConsoleRunner.cpp

+ 6 - 1
source/core/SessionInfo.cpp

@@ -1479,9 +1479,14 @@ void __fastcall TSessionLog::DoAddStartupInfo(TSessionData * Data)
 #undef ADF
 #undef ADSTR
 //---------------------------------------------------------------------------
+UnicodeString TSessionLog::GetSeparator()
+{
+  return L"--------------------------------------------------------------------------";
+}
+//---------------------------------------------------------------------------
 void __fastcall TSessionLog::AddSeparator()
 {
-  Add(llMessage, L"--------------------------------------------------------------------------");
+  Add(llMessage, GetSeparator());
 }
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------

+ 1 - 0
source/core/SessionInfo.h

@@ -266,6 +266,7 @@ public:
   void __fastcall AddSystemInfo();
   void __fastcall AddStartupInfo();
   void __fastcall AddException(Exception * E);
+  static UnicodeString GetSeparator();
   void __fastcall AddSeparator();
 
   void __fastcall ReflectSettings();

+ 9 - 0
source/windows/ConsoleRunner.cpp

@@ -25,6 +25,8 @@
 #include "GUITools.h"
 #include "VCLCommon.h"
 #include "Setup.h"
+#include "FtpFileSystem.h"
+#include "SessionInfo.h"
 //---------------------------------------------------------------------------
 #define WM_INTERUPT_IDLE (WM_WINSCP_USER + 3)
 #define BATCH_INPUT_TIMEOUT 10000
@@ -2841,10 +2843,17 @@ int Info(TConsole * Console)
   int Result = RESULT_SUCCESS;
   try
   {
+    Console->PrintLine(FORMAT(L"SSH implementation: PuTTY %s", (GetPuTTYVersion())));
+    Console->PrintLine();
     PrintListAndFree(Console, L"SSH encryption ciphers:", SshCipherList());
     PrintListAndFree(Console, L"SSH key exchange algorithms:", SshKexList());
     PrintListAndFree(Console, L"SSH host key algorithms:", SshHostKeyList());
     PrintListAndFree(Console, L"SSH MAC algorithms:", SshMacList());
+
+    Console->PrintLine(TSessionLog::GetSeparator());
+
+    Console->PrintLine(FORMAT(L"TLS/SSL implementation: %s", (GetOpenSSLVersionText())));
+    Console->PrintLine();
     PrintListAndFree(Console, L"TLS/SSL cipher suites:", TlsCipherList());
   }
   catch (Exception & E)