update20181114

shack2 · Nov 13, 2018 · 1c2371d · 1c2371d
1 parent b8c3686
commit 1c2371d
Show file tree

Hide file tree

Showing 7 changed files with 124 additions and 173 deletions.
diff --git a/SuperSQLInjection/Main.Designer.cs b/SuperSQLInjection/Main.Designer.cs
diff --git a/SuperSQLInjection/Main.cs b/SuperSQLInjection/Main.cs
@@ -17,6 +17,7 @@
 using Amib.Threading;
 using System.Management;
 using System.Runtime.InteropServices;
+using Microsoft.Win32;
 
 namespace SuperSQLInjection
 {
@@ -169,25 +170,34 @@ public void HttpDownloadFile(string url, string path)
 
         public static String getSid()
         {
-            //获得系统唯一号，系统安装id和mac组合
-            String sid = Environment.OSVersion + "_";
+
+            String sid = "";
             try
             {
+                //获得系统名称
+                RegistryKey rk = Registry.LocalMachine.OpenSubKey("Software\\Microsoft\\Windows NT\\CurrentVersion");
+                sid = rk.GetValue("ProductName").ToString();
+                rk.Close();
+                //获得系统唯一号，系统安装id和mac组合
+                sid += "_";
+
                 var officeSoftware = new ManagementObjectSearcher("SELECT ID, ApplicationId, PartialProductKey, LicenseIsAddon, Description, Name, OfflineInstallationId FROM SoftwareLicensingProduct where PartialProductKey <> null");
                 var result = officeSoftware.Get();
                 foreach (var item in result)
                 {
+                    String c = item.GetPropertyValue("name").ToString();
+
                     if (item.GetPropertyValue("name").ToString().StartsWith("Windows"))
                     {
 
-                        sid+=item.GetPropertyValue("OfflineInstallationId").ToString()+"__";
+                        sid+=item.GetPropertyValue("OfflineInstallationId").ToString()+"_";
                         break;
                     }
                 }
 
             }
             catch (Exception e) {
-                sid += "ex__";
+                sid += "ex_";
             }
             try
             {
@@ -205,12 +215,12 @@ public static String getSid()
             }
             catch
             {
-                sid += "ex__" + System.Guid.NewGuid();
+                sid += "ex_" + System.Guid.NewGuid();
             }
             return sid;
         }
 
-        public static int version = 20180923;
+        public static int version = 20181114;
         public static string versionURL = "http://www.shack2.org/soft/getNewVersion?ENNAME=SSuperSQLInjection&NO=" + URLEncode.UrlEncode(getSid()) + "&VERSION=" + version;
         //检查更新
         public void checkUpdate()
@@ -3422,10 +3432,19 @@ public void getDataValueByBoolByMySQL(Object opam)
                     {
                         String tmp_va_payload = MySQL5.ord_value.Replace("{data}", data_payload).Replace("{index}", i + "").Replace("{columns}", columnName);
                         String plen = MySQL5.ver_length.Replace("{data}", tmp_va_payload);
-
-                        //MySQL多字节ord
+                        int mu_payload_len = 0;
+                        //MySQL多字节ord，先判断ord后的长度，在取每一个的值
+                        if (config.keyType.Equals(KeyType.Time))
+                        {
+                            mu_payload_len = getValue(MySQL5.getBoolCountBySleep(MySQL5.char_len.Replace("{data}", tmp_va_payload), config.maxTime), 2, 8);
+                        }
+                        else
+                        {
+                            mu_payload_len = getValue(plen,2,8);
+                        }
+
                         //判断ord转换后的字符长度
-                        int mu_payload_len = getValue(plen, 2, 8);
+
                         int m_index = 1;
                         String[] ver_tmp = new String[mu_payload_len];
                         while (m_index <= mu_payload_len)