geos_one/CASA
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix unlock code.

Browse Source
This commit is contained in:
Jim Norman 2005-10-13 18:22:04 +00:00
parent 143e833a8d
commit 53158787b0
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
c_micasad/cache/SecretStore.cs vendored
View File

@ -97,20 +97,22 @@ namespace sscs.cache
if (sDesktopPassword != null) if (sDesktopPassword != null)
{ {
// verify Desktop password // verify Desktop password
state = STATE_OK; //state = STATE_OK;
return true; //return true;
} }
if (sMasterPassword != null) if (sMasterPassword != null)
{ {
// verify MasterPassword // verify MasterPassword
state = STATE_OK; if (SetMasterPassword(sMasterPassword))
return true; {
state = STATE_OK;
return true;
}
} }
return false; return false;
} }
internal bool StartPersistenceByDesktopPasswd(string desktopPasswd) internal bool StartPersistenceByDesktopPasswd(string desktopPasswd)

5
c_micasad/verbs/ObjectSerialization.cs
View File

@ -161,7 +161,7 @@ namespace sscs.verbs
case MiCasaRequestReply.VERB_REMOVE_ALL_SECRETS: case MiCasaRequestReply.VERB_REMOVE_ALL_SECRETS:
{ {
// stop persistence // stop persistence
ssStore.StopPersistence(); //ssStore.StopPersistence();
// remove secrets // remove secrets
return DoRemoveAllSecrets(ssStore, wo); return DoRemoveAllSecrets(ssStore, wo);
@ -220,7 +220,8 @@ namespace sscs.verbs
{ {
try try
{ {
ssStore.UnlockStore("Desktop", "Master"); string sMasterPassword = (string)wo.GetObject();
ssStore.UnlockStore(null, sMasterPassword);
} }
catch (Exception e) catch (Exception e)
{ {