Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

keybox: handle user canceling in the vkeyboard in a nicer way, fix a comment so that it makes sense

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20608 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nils Wallménius 2009-04-02 21:27:26 +00:00
parent 0eea6ceac4
commit dd36c57915
1 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
apps/plugins/keybox.c
View file

@ -22,15 +22,14 @@
#include "lib/md5.h" #include "lib/md5.h"
PLUGIN_HEADER PLUGIN_HEADER
#define KEYBOX_FILE PLUGIN_DIR "/apps/keybox.dat" #define KEYBOX_FILE PLUGIN_DIR "/apps/keybox.dat"
#define BLOCK_SIZE 8 #define BLOCK_SIZE 8
#define MAX_ENTRIES 12*BLOCK_SIZE /* keep this a multiple of BLOCK_SIZE */ #define MAX_ENTRIES 12*BLOCK_SIZE /* keep this a multiple of BLOCK_SIZE */
#define FIELD_LEN 32 /* should be enough for anyone ;) */ #define FIELD_LEN 32 /* should be enough for anyone ;) */
/* salt 4 bytes (needed for decryption) not encrypted padded with 4 bytes of zeroes /* The header begins with the unencrypted salt (4 bytes) padded with 4 bytes of
pwhash 16 bytes (to check for the right password) encrypted zeroes. After that comes the encrypted hash of the master password (16 bytes) */
encrypted data. */
#define HEADER_LEN 24 #define HEADER_LEN 24
@ -203,13 +202,25 @@ static void add_entry(int selected_item)
rb->splash(HZ, "Enter title"); rb->splash(HZ, "Enter title");
pw_list.entries[i].title[0] = '\0'; pw_list.entries[i].title[0] = '\0';
rb->kbd_input(pw_list.entries[i].title, FIELD_LEN); if (rb->kbd_input(pw_list.entries[i].title, FIELD_LEN))
return;
rb->splash(HZ, "Enter name"); rb->splash(HZ, "Enter name");
pw_list.entries[i].name[0] = '\0'; pw_list.entries[i].name[0] = '\0';
rb->kbd_input(pw_list.entries[i].name, FIELD_LEN); if (rb->kbd_input(pw_list.entries[i].name, FIELD_LEN))
{
pw_list.entries[i].title[0] = '\0';
return;
}
rb->splash(HZ, "Enter password"); rb->splash(HZ, "Enter password");
pw_list.entries[i].password[0] = '\0'; pw_list.entries[i].password[0] = '\0';
rb->kbd_input(pw_list.entries[i].password, FIELD_LEN); if (rb->kbd_input(pw_list.entries[i].password, FIELD_LEN))
{
pw_list.entries[i].title[0] = '\0';
pw_list.entries[i].name[0] = '\0';
return;
}
for (j = 0; j < selected_item; j++) for (j = 0; j < selected_item; j++)
{ {
@ -506,9 +517,12 @@ static int enter_pw(char *pw_buf, size_t buflen, bool new_pw)
if (new_pw) if (new_pw)
{ {
rb->splash(HZ, "Enter new master password"); rb->splash(HZ, "Enter new master password");
rb->kbd_input(buf[0], sizeof(buf[0])); if (rb->kbd_input(buf[0], sizeof(buf[0])))
return -1;
rb->splash(HZ, "Confirm master password"); rb->splash(HZ, "Confirm master password");
rb->kbd_input(buf[1], sizeof(buf[1])); if (rb->kbd_input(buf[1], sizeof(buf[1])))
return -1;
if (rb->strcmp(buf[0], buf[1])) if (rb->strcmp(buf[0], buf[1]))
{ {