update20190321

调整界面，变更ssh库。优化RDP检查，免注册dll，如果远程桌面配置为“只允许运行带网络级身份验证的远程桌面的计算机连接”，程序暂时无法检查。
shack2 · Mar 21, 2019 · b24616a · b24616a
1 parent 267d9d0
commit b24616a
Show file tree

Hide file tree

Showing 317 changed files with 202 additions and 54,024 deletions.
diff --git a/SNETCracker/Main.Designer.cs b/SNETCracker/Main.Designer.cs
diff --git a/SNETCracker/Main.cs b/SNETCracker/Main.cs
@@ -21,7 +21,6 @@ namespace SNETCracker
     public partial class Main : Form
     {
 
-
         private HashSet<string> list_username = new HashSet<string>();
         private HashSet<string> list_password = new HashSet<string>();
         private HashSet<string> list_target = new HashSet<string>();
@@ -798,6 +797,7 @@ private Server creackRDP(String ip, int port,String username, String password, i
             server.isEndMRE.WaitOne();
             Server newserver = new Server();
             newserver.isSuccess = server.isSuccess;
+
             this.rdp_panle.Invoke(new deleteClearRDP(ClearRDP), server.client);
             return newserver;
         }
@@ -817,6 +817,7 @@ private void initStatusCount()
             allCrackCount = 0;
         }
 
+        /*使用转换过的dll后，此方法废弃
         private void regDLL() {
             Process p = null;
             try
@@ -837,11 +838,11 @@ private void regDLL() {
                 }
             }
 
-        }
+        }*/
         private void Main_Shown(object sender, EventArgs e)
         {
             this.Text += " "+Main.version + "";
-            regDLL();
+
             this.cbox_reTry.SelectedIndex = 0;
             this.cbox_threadSize.SelectedIndex = 10;
             this.cbox_timeOut.SelectedIndex = 2;
@@ -1094,7 +1095,7 @@ public static String getSid()
             return sid;
         }
 
-        private static int version = 20181214;
+        private static int version = 20190321;
         public static string versionURL = "http://www.shack2.org/soft/getNewVersion?ENNAME=SNETCracker&NO="+ Uri.EscapeDataString(getSid())+ "&VERSION="+ version;
         private void tsmi_help_version_Click(object sender, EventArgs e)
         {
@@ -1177,5 +1178,7 @@ private void tsmi_reloadConfig_Click(object sender, EventArgs e)
             MessageBox.Show("ok");
 
         }
+
+
     }
 }
diff --git a/SNETCracker/Model/CrackSSH.cs b/SNETCracker/Model/CrackSSH.cs
@@ -12,6 +12,7 @@ public CrackSSH()
 
         }
 
+       /*
         public override Server creack(string ip, int port, string username, string password, int timeOut)
         {
             Rebex.Net.Ssh ssh = new Rebex.Net.Ssh();
@@ -46,10 +47,10 @@ public override Server creack(string ip, int port, string username, string passw
             }
             return server;
 
-        }
+        }*/
 
 
-        /*
+
        public override Server creack(string ip, int port, string username, string password, int timeOut)
        {
            Chilkat.Ssh ssh = new Chilkat.Ssh();
@@ -90,7 +91,7 @@ public override Server creack(string ip, int port, string username, string passw
            }
            return server;
 
-       }*/
+       }
 
     }
 }
diff --git a/SNETCracker/SNETCracker.csproj b/SNETCracker/SNETCracker.csproj
@@ -65,6 +65,10 @@
     <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="AxMSTSCLib, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>libs\rdp\AxMSTSCLib.dll</HintPath>
+    </Reference>
     <Reference Include="ChilkatDotNet4">
       <HintPath>libs\ChilkatDotNet4.dll</HintPath>
     </Reference>
@@ -84,16 +88,14 @@
       <HintPath>libs\LumiSoft.Net.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
-      <Private>True</Private>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>libs\redis\StackExchange.Redis-1.2.6\Microsoft.Threading.Tasks.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Threading.Tasks.Extensions, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.Threading.Tasks.Extensions">
+      <HintPath>libs\redis\StackExchange.Redis-1.2.6\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop, Version=1.0.168.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop">
+      <HintPath>libs\redis\StackExchange.Redis-1.2.6\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
     </Reference>
     <Reference Include="MongoDB.Bson, Version=2.4.4.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -107,6 +109,11 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>libs\postgresql\Mono.Security.dll</HintPath>
     </Reference>
+    <Reference Include="MSTSCLib, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <HintPath>libs\rdp\MSTSCLib.dll</HintPath>
+    </Reference>
     <Reference Include="MySql.Data, Version=6.2.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>libs\MySql.Data.dll</HintPath>
@@ -135,24 +142,21 @@
       <HintPath>libs\rebex\Rebex.Terminal.dll</HintPath>
     </Reference>
     <Reference Include="StackExchange.Redis, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\StackExchange.Redis.1.2.1\lib\net40\StackExchange.Redis.dll</HintPath>
-      <Private>True</Private>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>libs\redis\StackExchange.Redis-1.2.6\StackExchange.Redis.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.IO, Version=2.6.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.IO.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.IO">
+      <HintPath>libs\redis\StackExchange.Redis-1.2.6\System.IO.dll</HintPath>
     </Reference>
     <Reference Include="System.Management" />
     <Reference Include="System.Net" />
-    <Reference Include="System.Runtime, Version=2.6.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Runtime.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Runtime">
+      <HintPath>libs\redis\StackExchange.Redis-1.2.6\System.Runtime.dll</HintPath>
     </Reference>
-    <Reference Include="System.Threading.Tasks, Version=2.6.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Threading.Tasks.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Threading.Tasks">
+      <HintPath>libs\redis\StackExchange.Redis-1.2.6\System.Threading.Tasks.dll</HintPath>
     </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
@@ -309,25 +313,6 @@
   <ItemGroup>
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
-  <ItemGroup>
-    <COMReference Include="AxMSTSCLib">
-      <Guid>{8C11EFA1-92C3-11D1-BC1E-00C04FA31489}</Guid>
-      <VersionMajor>1</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>aximp</WrapperTool>
-      <Isolated>True</Isolated>
-    </COMReference>
-    <COMReference Include="MSTSCLib">
-      <Guid>{8C11EFA1-92C3-11D1-BC1E-00C04FA31489}</Guid>
-      <VersionMajor>1</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>tlbimp</WrapperTool>
-      <Isolated>True</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/SNETCracker/libs/rdp/AxInterop.MSTSCLib.dll b/SNETCracker/libs/rdp/AxInterop.MSTSCLib.dll
diff --git a/SNETCracker/libs/rdp/AxMSTSCLib.dll b/SNETCracker/libs/rdp/AxMSTSCLib.dll
diff --git a/SNETCracker/libs/rdp/Interop.MSTSCLib.dll b/SNETCracker/libs/rdp/Interop.MSTSCLib.dll
diff --git a/SNETCracker/libs/rdp/MSTSCLib.dll b/SNETCracker/libs/rdp/MSTSCLib.dll
diff --git a/SNETCracker/libs/rebex/Rebex.Common.dll b/SNETCracker/libs/rebex/Rebex.Common.dll
diff --git a/SNETCracker/libs/rebex/Rebex.FileServer.dll b/SNETCracker/libs/rebex/Rebex.FileServer.dll
diff --git a/SNETCracker/libs/rebex/Rebex.FileSystem.dll b/SNETCracker/libs/rebex/Rebex.FileSystem.dll
diff --git a/SNETCracker/libs/rebex/Rebex.Networking.dll b/SNETCracker/libs/rebex/Rebex.Networking.dll
diff --git a/SNETCracker/libs/rebex/Rebex.Sftp.dll b/SNETCracker/libs/rebex/Rebex.Sftp.dll
diff --git a/SNETCracker/libs/rebex/Rebex.SshShell.dll b/SNETCracker/libs/rebex/Rebex.SshShell.dll
diff --git a/SNETCracker/libs/rebex/Rebex.Telnet.dll b/SNETCracker/libs/rebex/Rebex.Telnet.dll
diff --git a/SNETCracker/libs/rebex/Rebex.Terminal.dll b/SNETCracker/libs/rebex/Rebex.Terminal.dll
diff --git a/SNETCracker/libs/redis/StackExchange.Redis-1.2.6/.gitignore b/SNETCracker/libs/redis/StackExchange.Redis-1.2.6/.gitignore
diff --git a/SNETCracker/libs/redis/StackExchange.Redis-1.2.6/.hgignore b/SNETCracker/libs/redis/StackExchange.Redis-1.2.6/.hgignore
diff --git a/SNETCracker/libs/redis/StackExchange.Redis-1.2.6/.nuget/packages.config b/SNETCracker/libs/redis/StackExchange.Redis-1.2.6/.nuget/packages.config
diff --git a/SNETCracker/libs/redis/StackExchange.Redis-1.2.6/.vscode/launch.json b/SNETCracker/libs/redis/StackExchange.Redis-1.2.6/.vscode/launch.json
diff --git a/SNETCracker/libs/redis/StackExchange.Redis-1.2.6/.vscode/tasks.json b/SNETCracker/libs/redis/StackExchange.Redis-1.2.6/.vscode/tasks.json
diff --git a/SNETCracker/libs/redis/StackExchange.Redis-1.2.6/BasicTest/BasicTest.csproj b/SNETCracker/libs/redis/StackExchange.Redis-1.2.6/BasicTest/BasicTest.csproj
diff --git a/SNETCracker/libs/redis/StackExchange.Redis-1.2.6/BasicTest/Program.cs b/SNETCracker/libs/redis/StackExchange.Redis-1.2.6/BasicTest/Program.cs
diff --git a/SNETCracker/libs/redis/StackExchange.Redis-1.2.6/ConnectionWatcher/App.config b/SNETCracker/libs/redis/StackExchange.Redis-1.2.6/ConnectionWatcher/App.config