tequilaOS/platform_system_security
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Add casts to avoid build warnings with gcc-4.7"

Browse source
This commit is contained in:
Kenny Root 2012-10-01 09:00:12 -07:00 committed by Gerrit Code Review
commit 9b0bd2b320
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
keystore/keystore.cpp
View file

@ -1331,7 +1331,7 @@ static const State STATE_ANY = (State) 0;
static struct action {
ResponseCode (*run)(KeyStore* keyStore, int sock, uid_t uid, Value* param1, Value* param2,
Value* param3);
int8_t code;
uint8_t code;
State state;
uint32_t perm;
int lengths[MAX_PARAM];
@ -1364,11 +1364,11 @@ static struct user {
uid_t euid;
uint32_t perms;
} users[] = {
{AID_SYSTEM, ~0, ~0},
{AID_VPN, AID_SYSTEM, P_GET | P_SIGN | P_VERIFY },
{AID_WIFI, AID_SYSTEM, P_GET | P_SIGN | P_VERIFY },
{AID_ROOT, AID_SYSTEM, P_GET},
{~0, ~0, P_TEST | P_GET | P_INSERT | P_DELETE | P_EXIST | P_SAW |
{AID_SYSTEM, (uid_t)(~0), (uint32_t)(~0)},
{AID_VPN, AID_SYSTEM, P_GET | P_SIGN | P_VERIFY },
{AID_WIFI, AID_SYSTEM, P_GET | P_SIGN | P_VERIFY },
{AID_ROOT, AID_SYSTEM, P_GET},
{(uid_t)(~0), (uid_t)(~0), P_TEST | P_GET | P_INSERT | P_DELETE | P_EXIST | P_SAW |
P_SIGN | P_VERIFY},
};

2
keystore/keystore_client.cpp
View file

@ -47,7 +47,7 @@ ResponseCode keystore_cmd(command_code_t cmd, Keystore_Reply* reply, int numArgs
return SYSTEM_ERROR;
}
uint8_t bytes[2] = { argLen >> 8, argLen };
uint8_t bytes[2] = { (uint8_t)(argLen >> 8), (uint8_t)argLen };
if (TEMP_FAILURE_RETRY(send(sock, bytes, 2, MSG_NOSIGNAL)) != 2
|| TEMP_FAILURE_RETRY(send(sock, arg, argLen, MSG_NOSIGNAL))
!= static_cast<ssize_t>(argLen)) {