Merge pull request #7 from xcicode/dev

Dev

Author: XAS-712

MifareOneTool/ClassMifareS50.cs

@@ -18,6 +18,16 @@ public static string Hex2Str(byte[] bytes)
             }
             return ret.ToString();
         }
+        public static string Hex2StrS(byte[] bytes)
+        {
+            StringBuilder ret = new StringBuilder();
+            foreach (byte b in bytes)
+            {
+                ret.AppendFormat("{0:x2}", b);
+                ret.Append(" ");
+            }
+            return ret.ToString();
+        }
         public static byte[] ReadAC(byte[] ac)
         {
             byte[] acbits = new byte[4];
@@ -227,6 +237,21 @@ public string Info(int sec)
             }
             return info;
         }
+        public byte[] KeyA
+        {
+            get { return this._sector[3].Skip(0).Take(6).ToArray(); }
+            set { for (int i = 0; i < 6; i++) { this._sector[3][i] = value[i]; } }
+        }
+        public byte[] KeyB
+        {
+            get { return this._sector[3].Skip(10).Take(6).ToArray(); }
+            set { for (int i = 10; i < 16; i++) { this._sector[3][i] = value[i]; } }
+        }
+        public byte[] ACBits
+        {
+            get { return this._sector[3].Skip(6).Take(4).ToArray(); }
+            set { for (int i = 6; i < 10; i++) { this._sector[3][i] = value[i]; } }
+        }
     }
     class S50
     {
@@ -337,5 +362,27 @@ public void ExportToMctTxt(string file)
             }
             File.WriteAllText(file, sb.ToString());
         }
+        public List<byte[]> KeyList()
+        {
+            List<byte[]> keys = new List<byte[]>();
+            foreach (Sector s in this._sectors)
+            {
+                keys.Add(s.KeyA);
+                keys.Add(s.KeyB);
+            }
+            keys = keys.Distinct().ToList();
+            return keys;
+        }
+        public List<string> KeyListStr()
+        {
+            List<string> keys = new List<string>();
+            foreach (Sector s in this._sectors)
+            {
+                keys.Add(Utils.Hex2Str(s.KeyA));
+                keys.Add(Utils.Hex2Str(s.KeyB));
+            }
+            keys = keys.Distinct().ToList();
+            return keys;
+        }
     }
 }

MifareOneTool/Form1.Designer.cs

@@ -126,6 +126,22 @@
   <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>157, 17</value>
   </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="toolStripCheckUpdate.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
+        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
+        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
+        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
+        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
+        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
+        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
+        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
+        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
+</value>
+  </data>
   <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>297, 17</value>
   </metadata>

MifareOneTool/Form1.cs

@@ -0,0 +1,130 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using System.IO;
+
+namespace MifareOneTool
+{
+    public partial class FormDiff : Form
+    {
+        public FormDiff()
+        {
+            InitializeComponent();
+        }
+
+        private S50 sa = new S50();
+        private S50 sb = new S50();
+        private string fa = "";
+        private string fb = "";
+
+        private void button1_Click(object sender, EventArgs e)
+        {
+            OpenFileDialog ofd = new OpenFileDialog();
+            ofd.CheckFileExists = true;
+            ofd.Filter = "MFD文件|*.mfd;*.dump";
+            ofd.Title = "请选择需要打开的MFD文件(比较A)";
+            ofd.Multiselect = false;
+            if (ofd.ShowDialog() == DialogResult.OK)
+            {
+                fa = ofd.FileName;
+            }
+            else
+            {
+                return;
+            }
+            sa = new S50();
+            try
+            {
+                sa.LoadFromMfd(fa);
+                button1.Text = "A=" + ofd.SafeFileName;
+            }
+            catch (IOException ioe)
+            {
+                MessageBox.Show(ioe.Message, "打开出错", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                sa = new S50();
+                return;
+            }
+        }
+
+        private void FormDiff_Load(object sender, EventArgs e)
+        {
+        }
+        private void logAppend(string msg)
+        {
+            richTextBox1.AppendText(msg + "\n");
+            richTextBox1.ScrollToCaret();
+        }
+
+        private void button2_Click(object sender, EventArgs e)
+        {
+            OpenFileDialog ofd = new OpenFileDialog();
+            ofd.CheckFileExists = true;
+            ofd.Filter = "MFD文件|*.mfd;*.dump";
+            ofd.Title = "请选择需要打开的MFD文件(比较B)";
+            ofd.Multiselect = false;
+            if (ofd.ShowDialog() == DialogResult.OK)
+            {
+                fb = ofd.FileName;
+            }
+            else
+            {
+                return;
+            }
+            sb = new S50();
+            try
+            {
+                sb.LoadFromMfd(fb);
+                button2.Text = "B=" + ofd.SafeFileName;
+            }
+            catch (IOException ioe)
+            {
+                MessageBox.Show(ioe.Message, "打开出错", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                sb = new S50();
+                return;
+            }
+        }
+
+        private void button3_Click(object sender, EventArgs e)
+        {
+            if (File.Exists(fa) && File.Exists(fb))
+            {
+                richTextBox1.Clear();
+                richTextBox1.Text=Compare();
+            }
+            else
+            {
+                logAppend("AB文件中一个或两个无效。");
+            }
+        }
+        private string Compare()
+        {
+            StringBuilder stb = new StringBuilder();
+            for (int i = 0; i < 16; i++)
+            {
+                stb.AppendLine("%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%");
+                stb.AppendLine("扇区 " + i.ToString());
+                for (int a = 0; a < 4; a++)
+                {
+                    string res="";
+                    for(int b=0;b<16;b++){
+                        if(sa.Sectors[i].Block[a][b]==sb.Sectors[i].Block[a][b]){
+                            res+="-- ";
+                        }else{
+                            res+="## ";
+                        }
+                    }
+                    stb.AppendLine("A: " + Utils.Hex2StrS(sa.Sectors[i].Block[a]));
+                     stb.AppendLine("B: " + Utils.Hex2StrS(sb.Sectors[i].Block[a]));
+                     stb.AppendLine("   " + res);
+                }
+
+            }
+            return stb.ToString();
+        }
+    }
+}