Move password generation code into its own function

sbeh · Oct 23, 2014 · 1926e44 · 1926e44
1 parent e72ab03
commit 1926e44
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/Windows/RDP OTP Server/Program.cs b/Windows/RDP OTP Server/Program.cs
@@ -21,15 +21,11 @@ static void SetPass(string oldpass, string newpass)
             File.WriteAllText(@"oldPass.txt", newpass);
         }
 
-        static int Main(string[] args)
+        static string NewPass(string oldpass)
         {
-            AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
-
             var newpass = @"";
 
             {
-                oldpass = File.ReadAllText(@"oldPass.txt");
-
                 {
                     var passchars = @"abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ123456789";
                     var rand = new Random();
@@ -38,9 +34,18 @@ static int Main(string[] args)
                 }
 
                 SetPass(oldpass, newpass);
-                Program.newpass = newpass;
             }
 
+            return newpass;
+        }
+
+        static int Main(string[] args)
+        {
+            AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
+
+            oldpass = File.ReadAllText(@"oldPass.txt");
+            newpass = NewPass(oldpass);
+
             WebRequest request;
 
             {