fix code mix up.

c_micasad/cache/SecretStore.cs

@@ -210,41 +210,29 @@ namespace sscs.cache
 
                 }
                 baPasscode = CASACrypto.GetMasterPasscodeUsingDesktopPasswd(desktopPasswd, GetPasscodeByDesktopFilePath(), false);
-                //if(baPasscode != null)
+                if(CASACrypto.ValidatePasscode(baPasscode,GetValidationFilePath()))
-                if (true)
                 {
-                    if(CASACrypto.ValidatePasscode(baPasscode,GetValidationFilePath()))
+                    lss = new LocalStorage(this,baPasscode);
+                    bIsStorePersistent = true;
+                    return true;
+                }
+                else
+                {
+                    // try old encryption method
+                    baPasscode = CASACrypto.GetMasterPasscodeUsingDesktopPasswd(desktopPasswd, GetPasscodeByDesktopFilePath(), true);
+                    if (CASACrypto.ValidatePasscode(baPasscode, GetValidationFilePath()))
                     {
-                        lss = new LocalStorage(this,baPasscode);
+            	        // rewrite file using new encryption
+                        CASACrypto.EncryptAndStoreMasterPasscodeUsingString(baPasscode, desktopPasswd, GetPasscodeByDesktopFilePath());
+                        lss = new LocalStorage(this, baPasscode);
                         bIsStorePersistent = true;
                         return true;
                     }
                     else
                     {
-                        // try old encryption method
+                        lss = null;
-                        baPasscode = CASACrypto.GetMasterPasscodeUsingDesktopPasswd(desktopPasswd, GetPasscodeByDesktopFilePath(), true);
+                        bIsStorePersistent = false; //till masterPasswd is verified
-                        if (CASACrypto.ValidatePasscode(baPasscode, GetValidationFilePath()))
+                     }
-                        {
-                            // rewrite file using new encryption
-                            CASACrypto.EncryptAndStoreMasterPasscodeUsingString(baPasscode, desktopPasswd, GetPasscodeByDesktopFilePath());
-                            lss = new LocalStorage(this, baPasscode);
-                            bIsStorePersistent = true;
-                            return true;
-                        }
-                        else
-                        {
-                            lss = null;
-                            bIsStorePersistent = false; //till masterPasswd is verified
-                        }
-                    }
-                    return true;
-                }
-                else
-                {
-                    CSSSLogger.DbgLog(CSSSLogger.GetExecutionPath(this) + " May be desktop passwd has changed");
-                    lss = null;
-                    bIsStorePersistent = false;
-                    return false;
                 }
             }
             catch(Exception e)

c_micasad/lss/FastRandom.cs

@@ -20,7 +20,6 @@
  * 
  ***********************************************************************/
 using System;
-using System.Collections.Generic;
 using System.Text;
 
 namespace sscs.lss