ソースを参照

Unused code

Source commit: c1fbc8af76d8e2116aaf6d2026dba2ea3e5e1c8f
Martin Prikryl 2 年 前
コミット
f03d94d6c4

+ 1 - 1
source/core/PuttyIntf.cpp

@@ -323,7 +323,7 @@ const SeatDialogPromptDescriptions * prompt_descriptions(Seat *)
 //---------------------------------------------------------------------------
 void old_keyfile_warning(void)
 {
-  // no reference to TSecureShell instance available
+  // no reference to TSecureShell instance available - and we already warn on Login dialog
 }
 //---------------------------------------------------------------------------
 size_t banner(Seat * seat, const void * data, size_t len)

+ 0 - 6
source/core/SecureShell.cpp

@@ -2770,12 +2770,6 @@ void __fastcall TSecureShell::DisplayBanner(const UnicodeString & Banner)
   }
 }
 //---------------------------------------------------------------------------
-void __fastcall TSecureShell::OldKeyfileWarning()
-{
-  // actually never called, see Net.cpp
-  FUI->QueryUser(LoadStr(OLD_KEY), NULL, qaOK, NULL, qtWarning);
-}
-//---------------------------------------------------------------------------
 bool __fastcall TSecureShell::GetStoredCredentialsTried()
 {
   return FStoredPasswordTried || FStoredPasswordTriedForKI || FStoredPassphraseTried;

+ 0 - 1
source/core/SecureShell.h

@@ -176,7 +176,6 @@ public:
   bool __fastcall HaveHostKey(UnicodeString Host, int Port, const UnicodeString KeyType);
   void __fastcall AskAlg(UnicodeString AlgType, UnicodeString AlgName);
   void __fastcall DisplayBanner(const UnicodeString & Banner);
-  void __fastcall OldKeyfileWarning();
   void __fastcall PuttyLogEvent(const char * Str);
   UnicodeString __fastcall ConvertFromPutty(const char * Str, int Length);
   struct callback_set * GetCallbackSet();

+ 0 - 1
source/resource/TextsCore.h

@@ -3,7 +3,6 @@
 
 #define UNKNOWN_KEY4    1
 #define DIFFERENT_KEY5  2
-#define OLD_KEY         3
 
 #define SCRIPT_HELP_HELP        4
 #define SCRIPT_EXIT_HELP        5

+ 0 - 8
source/resource/TextsCore2.rc

@@ -39,14 +39,6 @@ BEGIN
     "If you want to abandon the connection completely, press "
     "Cancel. Pressing Cancel is the ONLY guaranteed safe "
     "choice."
-  OLD_KEY,
-    "You are loading a private key which has an "
-    "old version of the file format. This means your key "
-    "file is not fully tamperproof. We recommend you convert "
-    "your key to the new format.\n"
-    "\n"
-    "You can perform this conversion by loading the key "
-    "into PuTTYgen and then saving it again."
   SCRIPT_HELP_HELP,
     "help [ <command> [ <command2> ... ] ]\n"
     "  Displays list of commands when no parameters are specified.\n"