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

am e040a571: Merge "Use %zu, %td for size_t, ptrdiff_t, respectively."

Browse source 
* commit 'e040a5710561686d70d110e3cc1bcafedbeb7ec2':
  Use %zu, %td for size_t, ptrdiff_t, respectively.
This commit is contained in:
Brian Carlstrom 2013-12-11 11:29:55 -08:00 committed by Android Git Automerger
commit b66675149c
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
keystore/keystore.cpp
View file

@ -1817,7 +1817,7 @@ public:
rsa_params.modulus_size = keySize;
if (args->size() > 1) {
ALOGI("invalid number of arguments: %d", args->size());
ALOGI("invalid number of arguments: %zu", args->size());
return ::SYSTEM_ERROR;
} else if (args->size() == 1) {
sp<KeystoreArg> pubExpBlob = args->itemAt(0);

4
softkeymaster/keymaster_openssl.cpp
View file

@ -191,7 +191,7 @@ static EVP_PKEY* unwrap_key(const uint8_t* keyBlob, const size_t keyBlobLength)
publicLen = (publicLen << 8) | *p++;
}
if (p + publicLen > end) {
ALOGE("public key length encoding error: size=%ld, end=%d", publicLen, end - p);
ALOGE("public key length encoding error: size=%ld, end=%td", publicLen, end - p);
return NULL;
}
@ -204,7 +204,7 @@ static EVP_PKEY* unwrap_key(const uint8_t* keyBlob, const size_t keyBlobLength)
privateLen = (privateLen << 8) | *p++;
}
if (p + privateLen > end) {
ALOGE("private key length encoding error: size=%ld, end=%d", privateLen, end - p);
ALOGE("private key length encoding error: size=%ld, end=%td", privateLen, end - p);
return NULL;
}