diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2010-03-08 17:50:56 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-08 17:50:56 -0800 |
| commit | 3eeffc1857d4340f8f87ab57ede899b86cf11c54 (patch) | |
| tree | ea864671559527f15ae8faa82756ca10db50fa23 /cmds/keystore | |
| parent | 56ec3c888a19b16ef056c157ed63d94adef7f201 (diff) | |
| parent | 4165dd21592c958bacc97043d56b1ea914ab94c9 (diff) | |
| download | frameworks_base-3eeffc1857d4340f8f87ab57ede899b86cf11c54.zip frameworks_base-3eeffc1857d4340f8f87ab57ede899b86cf11c54.tar.gz frameworks_base-3eeffc1857d4340f8f87ab57ede899b86cf11c54.tar.bz2 | |
Merge "keystore: add AID_ROOT into the user table."
Diffstat (limited to 'cmds/keystore')
| -rw-r--r-- | cmds/keystore/keystore.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/cmds/keystore/keystore.c b/cmds/keystore/keystore.c index 4426874..60cc521 100644 --- a/cmds/keystore/keystore.c +++ b/cmds/keystore/keystore.c @@ -46,7 +46,7 @@ * user-defined password. To keep things simple, buffers are always larger than * the maximum space we needed, so boundary checks on buffers are omitted. */ -#define KEY_SIZE 120 +#define KEY_SIZE ((NAME_MAX - 15) / 2) #define VALUE_SIZE 32768 #define PASSWORD_SIZE VALUE_SIZE @@ -442,10 +442,11 @@ static struct user { uid_t euid; uint32_t perms; } users[] = { - {AID_SYSTEM, 0, ~GET}, + {AID_SYSTEM, ~0, ~GET}, {AID_VPN, AID_SYSTEM, GET}, {AID_WIFI, AID_SYSTEM, GET}, - {0, 0, TEST | GET | INSERT | DELETE | EXIST | SAW}, + {AID_ROOT, AID_SYSTEM, GET}, + {~0, ~0, TEST | GET | INSERT | DELETE | EXIST | SAW}, }; static int8_t process(int8_t code) { @@ -453,7 +454,7 @@ static int8_t process(int8_t code) { struct action *action = actions; int i; - while (user->uid && user->uid != uid) { + while (~user->uid && user->uid != uid) { ++user; } while (action->code && action->code != code) { @@ -468,7 +469,7 @@ static int8_t process(int8_t code) { if (action->state && action->state != state) { return state; } - if (user->euid) { + if (~user->euid) { uid = user->euid; } for (i = 0; i < MAX_PARAM && action->lengths[i]; ++i) { |