Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 25a13907: Merge change 26105 into eclair

Browse Source 
Merge commit '25a13907aa8e4478e29237641f8a47b862ff7e92' into eclair-plus-aosp

* commit '25a13907aa8e4478e29237641f8a47b862ff7e92':
  keystore: enable delete(), scan(), exist() when keystore is locked.
This commit is contained in:
Chia-chi Yeh
2009-09-21 01:30:54 -07:00
committed by Android Git Automerger
parent b2b4b8a7ef 25a13907aa
commit 965056f63c
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cmds/keystore/keystore.c
View File

@@ -125,6 +125,12 @@ static int recv_message(uint8_t *message, int length)
return length; return length;
} }
static int recv_end_of_file()
{
uint8_t byte;
return recv(the_socket, &byte, 1, 0) == 0;
}
static void send_code(int8_t code) static void send_code(int8_t code)
{ {
send(the_socket, &code, 1, 0); send(the_socket, &code, 1, 0);
@@ -358,7 +364,8 @@ static int8_t password()
} }
if (n != NO_ERROR || blob.length != MASTER_KEY_SIZE) { if (n != NO_ERROR || blob.length != MASTER_KEY_SIZE) {
if (retry <= 0) { if (retry <= 0) {
return reset(); reset();
return UNINITIALIZED;
} }
return WRONG_PASSWORD + --retry; return WRONG_PASSWORD + --retry;
} }
@@ -421,9 +428,9 @@ static struct action {
{test, 't', 0, TEST, {0}}, {test, 't', 0, TEST, {0}},
{get, 'g', NO_ERROR, GET, {KEY_SIZE}}, {get, 'g', NO_ERROR, GET, {KEY_SIZE}},
{insert, 'i', NO_ERROR, INSERT, {KEY_SIZE, VALUE_SIZE}}, {insert, 'i', NO_ERROR, INSERT, {KEY_SIZE, VALUE_SIZE}},
{delete, 'd', NO_ERROR, DELETE, {KEY_SIZE}}, {delete, 'd', 0, DELETE, {KEY_SIZE}},
{exist, 'e', NO_ERROR, EXIST, {KEY_SIZE}}, {exist, 'e', 0, EXIST, {KEY_SIZE}},
{scan, 's', NO_ERROR, SCAN, {KEY_SIZE}}, {scan, 's', 0, SCAN, {KEY_SIZE}},
{reset, 'r', 0, RESET, {0}}, {reset, 'r', 0, RESET, {0}},
{password, 'p', 0, PASSWORD, {PASSWORD_SIZE, PASSWORD_SIZE}}, {password, 'p', 0, PASSWORD, {PASSWORD_SIZE, PASSWORD_SIZE}},
{lock, 'l', NO_ERROR, LOCK, {0}}, {lock, 'l', NO_ERROR, LOCK, {0}},
@@ -471,6 +478,9 @@ static int8_t process(int8_t code) {
return PROTOCOL_ERROR; return PROTOCOL_ERROR;
} }
} }
if (!recv_end_of_file()) {
return PROTOCOL_ERROR;
}
return action->run(); return action->run();
} }