Encryption for pairing

Rap-ID · Jun 13, 2015 · 23345bd · 23345bd
1 parent 0a89409
commit 23345bd
Show file tree

Hide file tree

Showing 15 changed files with 360 additions and 22 deletions.
diff --git a/Auth/Properties/AssemblyInfo.cs b/Auth/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.9")]
-[assembly: AssemblyFileVersion("1.1.0.9")]
+[assembly: AssemblyVersion("1.1.0.12")]
+[assembly: AssemblyFileVersion("1.1.0.12")]
diff --git a/Configure/Properties/AssemblyInfo.cs b/Configure/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.5")]
-[assembly: AssemblyFileVersion("1.0.0.5")]
+[assembly: AssemblyVersion("1.1.0.5")]
+[assembly: AssemblyFileVersion("1.1.0.5")]
diff --git a/Configure/Setter.cs b/Configure/Setter.cs
@@ -36,15 +36,17 @@ private async void okButton_Click(object sender, EventArgs e)
                 tcpClient.Connect(this.pi.IP, NetworkPorts.Pair);
                 using (var tcpStreamWriter = new StreamWriter(tcpClient.GetStream(), Encodes.UTF8NoBOM))
                 {
-                    await tcpStreamWriter.WriteLineAsync(Crypt.Encrypt("PAIR" + this.passBox.Text));
+                    await tcpStreamWriter.WriteLineAsync(Encrypt("PAIR" + this.passBox.Text));
                     await tcpStreamWriter.FlushAsync();
                     using (var tcpStreamReader = new StreamReader(tcpClient.GetStream(), Encodes.UTF8NoBOM))
                     {
                         // handle result
-                        string result = Crypt.Decrypt(await tcpStreamReader.ReadLineAsync());
+                        string result = Decrypt(await tcpStreamReader.ReadLineAsync());
                         if (result == "PAIROK" + this.passBox.Text)
                         {
                             this.statusLabel.Text = "配对成功，正在等待密钥交换！";
+                            // handle key
+                            this.key = Decrypt(await tcpStreamReader.ReadLineAsync());
                             WriteConfig();
                         }
                         else if (result == "PAIRFAIL" + this.passBox.Text)
@@ -63,9 +65,20 @@ private void WriteConfig()
             var sWriter = new System.IO.StreamWriter(AppDomain.CurrentDomain.BaseDirectory + "/pair");
             sWriter.WriteLine(Crypt.Encrypt(this.pi.StorgeString));
             sWriter.WriteLine(Crypt.Encrypt(this.passBox.Text));
+            sWriter.WriteLine(Crypt.Encrypt(this.key));
             sWriter.Close();
             sWriter.Dispose();
             Application.ExitThread();
         }
+
+        private string Encrypt(string message)
+        {
+            return Crypt.Encrypt(message, Crypt.GeneratePairKey());
+        }
+
+        private string Decrypt(string cipherText)
+        {
+            return Crypt.Decrypt(cipherText, Crypt.GeneratePairKey());
+        }
     }
 }
diff --git a/CryptionDebugger/CryptionDebugger.csproj b/CryptionDebugger/CryptionDebugger.csproj
@@ -53,6 +53,12 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="RollingKey.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="RollingKey.Designer.cs">
+      <DependentUpon>RollingKey.cs</DependentUpon>
+    </Compile>
     <EmbeddedResource Include="Main.resx">
       <DependentUpon>Main.cs</DependentUpon>
     </EmbeddedResource>
@@ -66,6 +72,9 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
+    <EmbeddedResource Include="RollingKey.resx">
+      <DependentUpon>RollingKey.cs</DependentUpon>
+    </EmbeddedResource>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>

diff --git a/CryptionDebugger/Main.Designer.cs b/CryptionDebugger/Main.Designer.cs
diff --git a/CryptionDebugger/Main.cs b/CryptionDebugger/Main.cs
@@ -9,7 +9,7 @@
 using System.Windows.Forms;
 using RapID.ClassLibrary;
 
-namespace RapID.Debug.Cryption
+namespace RapID.CryptionDebugger
 {
     public partial class Main : Form
     {
@@ -27,5 +27,11 @@ private void decryptButton_Click(object sender, EventArgs e)
         {
             sourceTextBox.Text = Crypt.Decrypt(cipherTextBox.Text);
         }
+
+        private void showRollingKeyFormButton_Click(object sender, EventArgs e)
+        {
+            var frm = new RollingKey();
+            frm.ShowDialog();
+        }
     }
 }
diff --git a/CryptionDebugger/Program.cs b/CryptionDebugger/Program.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace RapID.Debug.Cryption
+namespace RapID.CryptionDebugger
 {
     static class Program
     {

diff --git a/CryptionDebugger/Properties/AssemblyInfo.cs b/CryptionDebugger/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: 
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.3")]
-[assembly: AssemblyFileVersion("1.0.0.3")]
+[assembly: AssemblyVersion("1.1.0.8")]
+[assembly: AssemblyFileVersion("1.1.0.8")]
diff --git a/CryptionDebugger/RollingKey.Designer.cs b/CryptionDebugger/RollingKey.Designer.cs
diff --git a/CryptionDebugger/RollingKey.cs b/CryptionDebugger/RollingKey.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using RapID.ClassLibrary;
+
+namespace RapID.CryptionDebugger
+{
+    public partial class RollingKey : Form
+    {
+        public RollingKey()
+        {
+            InitializeComponent();
+        }
+
+        private void encryptButton_Click(object sender, EventArgs e)
+        {
+            this.cipherTextBox.Text = Crypt.Encrypt(this.sourceTextBox.Text, Crypt.GenerateKey(this.originalKeyBox.Text));
+        }
+
+        private void decryptButton_Click(object sender, EventArgs e)
+        {
+            this.sourceTextBox.Text = Crypt.Encrypt(this.cipherTextBox.Text, Crypt.GenerateKey(this.originalKeyBox.Text));
+        }
+    }
+}