
* Replace {Set|Remove}MasterKey() by generic {Set|Remove}UnlockKey() that works on a keyring. * Implement {Set|Remove}MasterUnlockKey() on top of that. * Rename the commands and constants accrodingly. * Implement setting and removing keyring unlock keys.