浏览代码

Bug 1917: List encrypt-then-MAC algorithms in /info listing

https://winscp.net/tracker/1917

Source commit: 7bb5e5302198419fa78405d61e6b495ed92c4a0d
Martin Prikryl 5 年之前
父节点
当前提交
1cc7db77ed
共有 1 个文件被更改,包括 7 次插入1 次删除
  1. 7 1
      source/core/PuttyIntf.cpp

+ 7 - 1
source/core/PuttyIntf.cpp

@@ -1046,7 +1046,13 @@ TStrings * SshMacList()
   for (int Index = 0; Index < Count; Index++)
   for (int Index = 0; Index < Count; Index++)
   {
   {
     UnicodeString Name = UnicodeString(Macs[Index]->name);
     UnicodeString Name = UnicodeString(Macs[Index]->name);
-    Result->Add(Name);
+    UnicodeString S = Name;
+    UnicodeString ETMName = UnicodeString(Macs[Index]->etm_name);
+    if (!ETMName.IsEmpty())
+    {
+      S = FORMAT(L"%s (%s)", (S, ETMName));
+    }
+    Result->Add(S);
   }
   }
   return Result.release();
   return Result.release();
 }
 }