Make encryption of Wi-Fi passwords optional

Author: t1m0thyj

src/MainForm.Designer.cs

@@ -61,7 +61,50 @@ private void UpdateGuiState()
                 || passwordTextBox.Text.Length == 0
                 || passwordTextBox2.Text.Length == 0);
 
-            startButton.Enabled = !isEmpty;
+            applyButton.Enabled = !isEmpty;
+        }
+
+        private bool ValidateSettings(string bootDrive)
+        {
+            if (!Directory.Exists(bootDrive))
+            {
+                MessageBox.Show("The drive you have selected is no longer accessible.", "Error",
+                    MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                return false;
+            }
+
+            if (!File.Exists(Path.Combine(bootDrive, "kernel.img")))
+            {
+                MessageBox.Show("The drive you have selected is not a Raspbian SD card.", "Error",
+                    MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                return false;
+            }
+
+            if (passwordTextBox.Text != passwordTextBox2.Text)
+            {
+                MessageBox.Show("The passwords you have entered do not match.", "Error",
+                    MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                return false;
+            }
+
+            if (typeComboBox.SelectedIndex == 0 && (passwordTextBox.Text.Length < 8
+                || passwordTextBox.Text.Length > 63))
+            {
+                MessageBox.Show("Password must be between 8 and 63 characters long for WPA " +
+                    "Personal network.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                return false;
+            }
+
+            if (typeComboBox.SelectedIndex == 1 && passwordTextBox.Text.Length > 14
+                && encryptCheckBox.Checked)
+            {
+                MessageBox.Show("Password cannot exceed 14 characters in length for WPA " +
+                    "Enterprise network when encryption is enabled.", "Error",
+                    MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                return false;
+            }
+
+            return true;
         }
 
         private void ConfigureImage(string bootDrive, string networkConfig, bool enableSsh)
@@ -73,7 +116,7 @@ private void ConfigureImage(string bootDrive, string networkConfig, bool enableS
             {
                 DialogResult result = MessageBox.Show("The file /boot/wpa_supplicant.conf " +
                     "already exists on the SD card. Are you sure you want to overwrite it?",
-                    "Question", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
+                    "Question", MessageBoxButtons.YesNo, MessageBoxIcon.Warning);
                 writeConfig = (result == DialogResult.Yes);
             }
 
@@ -102,62 +145,33 @@ private void refreshButton_Click(object sender, EventArgs e)
             UpdateDriveList();
         }
 
-        private void startButton_Click(object sender, EventArgs e)
+        private void applyButton_Click(object sender, EventArgs e)
         {
             string bootDrive = driveComboBox.GetItemText(
                 driveComboBox.SelectedItem).Split(' ')[0].TrimEnd('\\');
-
-            if (!Directory.Exists(bootDrive))
-            {
-                MessageBox.Show("The drive you have selected is no longer accessible.", "Error",
-                    MessageBoxButtons.OK, MessageBoxIcon.Warning);
-                return;
-            }
-
-            if (!File.Exists(Path.Combine(bootDrive, "kernel.img")))
-            {
-                MessageBox.Show("The drive you have selected is not a Raspbian SD card.", "Error",
-                    MessageBoxButtons.OK, MessageBoxIcon.Warning);
-                return;
-            }
-
-            if (passwordTextBox.Text != passwordTextBox2.Text)
+        
+            if (!ValidateSettings(bootDrive))
             {
-                MessageBox.Show("The passwords you have entered do not match.", "Error",
-                    MessageBoxButtons.OK, MessageBoxIcon.Warning);
-                return;
-            }
-
-            if (typeComboBox.SelectedIndex == 0 && (passwordTextBox.Text.Length < 8
-                || passwordTextBox.Text.Length > 63))
-            {
-                MessageBox.Show("Password must be between 8 and 63 characters long.", "Error",
-                    MessageBoxButtons.OK, MessageBoxIcon.Warning);
-                return;
-            }
-            else if (typeComboBox.SelectedIndex == 1 && passwordTextBox.Text.Length > 14)
-            {
-                MessageBox.Show("Password cannot exceed 14 characters in length.", "Error",
-                    MessageBoxButtons.OK, MessageBoxIcon.Warning);
                 return;
             }
 
             string networkName = nameTextBox.Text;
             string username = userTextBox.Text;
             string password = passwordTextBox.Text;
+            bool shouldEncrypt = encryptCheckBox.Checked;
             string networkConfig;
 
             if (typeComboBox.SelectedIndex == 0)
             {
-                networkConfig = WpaPersonal.GetConfig(networkName, password);
+                networkConfig = WpaPersonal.GetConfig(networkName, password, shouldEncrypt);
             }
             else
             {
-                networkConfig = WpaEnterprise.GetConfig(networkName, username, password);
+                networkConfig = WpaEnterprise.GetConfig(networkName, username, password,
+                    shouldEncrypt);
             }
 
             ConfigureImage(bootDrive, networkConfig, sshCheckBox.Checked);
-
             MessageBox.Show("SD card image has been configured successfully.", "Info");
         }
 

src/MainForm.cs

@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("PiBootstrapper")]
-[assembly: AssemblyCopyright("Copyright © 2018 Timothy Johnson")]
+[assembly: AssemblyCopyright("Copyright © 2019 Timothy Johnson")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2018.1.1")]
+[assembly: AssemblyVersion("2019.1")]
 //[assembly: AssemblyFileVersion("1.0.0.0")]

src/Properties/AssemblyInfo.cs

@@ -50,23 +50,29 @@ private static string ComputeHash(string password)
             return BitConverter.ToString(outBytes).Replace("-", "").ToLower();
         }
 
-        public static string GetConfig(string networkName, string username, string password)
+        public static string GetConfig(string networkName, string username, string password,
+            bool shouldEncrypt)
         {
-            List<string> config = new List<string>()
+            if (shouldEncrypt)
+            {
+                password = "hash:" + ComputeHash(password);
+            }
+
+            string[] config = new string[]
             {
                 "network={",
                 "\tssid=\"" + networkName + "\"",
                 "\tscan_ssid=1",
                 "\tkey_mgmt=WPA-EAP",
                 "\teap=PEAP",
                 "\tidentity=\"" + username + "\"",
-                "\tpassword=hash:" + ComputeHash(password),
+                "\tpassword=" + password,
                 "\tphase1=\"peaplabel=0\"",
                 "\tphase2=\"auth=MSCHAPV2\"",
                 "}"
             };
 
-            return String.Join("\n", config);
+            return string.Join("\n", config);
         }
     }
 }

src/WpaEnterprise.cs

@@ -35,19 +35,24 @@ private static string ComputeHash(string password, string networkName)
             return BitConverter.ToString(outBytes).Replace("-", "").ToLower();
         }
 
-        public static string GetConfig(string networkName, string password)
+        public static string GetConfig(string networkName, string password, bool shouldEncrypt)
         {
-            List<string> config = new List<string>()
+            if (shouldEncrypt)
+            {
+                password = ComputeHash(password, networkName);
+            }
+
+            string[] config = new string[]
             {
                 "network={",
                 "\tssid=\"" + networkName + "\"",
                 "\tscan_ssid=1",
                 "\tkey_mgmt=WPA-PSK",
-                "\tpsk=" + ComputeHash(password, networkName),
+                "\tpsk=" + password,
                 "}"
             };
 
-            return String.Join("\n", config);
+            return string.Join("\n", config);
         }
     }
 }