Changed the encryption key and password prompting.
Changed the encryption key and password prompting.

The encryption key and retrieval key generation now use their respective
functions and added prompting for a new password and the current password to
unlock.

romaimperator/trustauth-firefox,romaimperator/trustauth-firefox