diff options
author | Mark Salyzyn <salyzyn@google.com> | 2014-03-14 21:59:56 +0100 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-14 21:59:56 +0100 |
commit | 4b6de1ba1ce0fff95c18a8abb7ba6e5762006d49 (patch) | |
tree | 8fa1fa41069b4c6991157ac484069121caab9767 /verifier.cpp | |
parent | am a7266ef0: Merge "separate fbdev-specific code out from minui" (diff) | |
parent | Merge "Recovery 64-bit compile issues" (diff) | |
download | android_bootable_recovery-4b6de1ba1ce0fff95c18a8abb7ba6e5762006d49.tar android_bootable_recovery-4b6de1ba1ce0fff95c18a8abb7ba6e5762006d49.tar.gz android_bootable_recovery-4b6de1ba1ce0fff95c18a8abb7ba6e5762006d49.tar.bz2 android_bootable_recovery-4b6de1ba1ce0fff95c18a8abb7ba6e5762006d49.tar.lz android_bootable_recovery-4b6de1ba1ce0fff95c18a8abb7ba6e5762006d49.tar.xz android_bootable_recovery-4b6de1ba1ce0fff95c18a8abb7ba6e5762006d49.tar.zst android_bootable_recovery-4b6de1ba1ce0fff95c18a8abb7ba6e5762006d49.zip |
Diffstat (limited to '')
-rw-r--r-- | verifier.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/verifier.cpp b/verifier.cpp index 0930fbd15..019552b92 100644 --- a/verifier.cpp +++ b/verifier.cpp @@ -152,7 +152,7 @@ int verify_file(const char* path, const Certificate* pKeys, unsigned int numKeys size_t comment_size = footer[4] + (footer[5] << 8); size_t signature_start = footer[0] + (footer[1] << 8); - LOGI("comment is %d bytes; signature %d bytes from end\n", + LOGI("comment is %zu bytes; signature %zu bytes from end\n", comment_size, signature_start); if (signature_start <= FOOTER_SIZE) { @@ -292,24 +292,24 @@ int verify_file(const char* path, const Certificate* pKeys, unsigned int numKeys if (pKeys[i].key_type == Certificate::RSA) { if (sig_der_length < RSANUMBYTES) { // "signature" block isn't big enough to contain an RSA block. - LOGI("signature is too short for RSA key %d\n", i); + LOGI("signature is too short for RSA key %zu\n", i); continue; } if (!RSA_verify(pKeys[i].rsa, sig_der, RSANUMBYTES, hash, pKeys[i].hash_len)) { - LOGI("failed to verify against RSA key %d\n", i); + LOGI("failed to verify against RSA key %zu\n", i); continue; } - LOGI("whole-file signature verified against RSA key %d\n", i); + LOGI("whole-file signature verified against RSA key %zu\n", i); free(sig_der); return VERIFY_SUCCESS; } else if (pKeys[i].key_type == Certificate::EC && pKeys[i].hash_len == SHA256_DIGEST_SIZE) { p256_int r, s; if (!dsa_sig_unpack(sig_der, sig_der_length, &r, &s)) { - LOGI("Not a DSA signature block for EC key %d\n", i); + LOGI("Not a DSA signature block for EC key %zu\n", i); continue; } @@ -317,11 +317,11 @@ int verify_file(const char* path, const Certificate* pKeys, unsigned int numKeys p256_from_bin(hash, &p256_hash); if (!p256_ecdsa_verify(&(pKeys[i].ec->x), &(pKeys[i].ec->y), &p256_hash, &r, &s)) { - LOGI("failed to verify against EC key %d\n", i); + LOGI("failed to verify against EC key %zu\n", i); continue; } - LOGI("whole-file signature verified against EC key %d\n", i); + LOGI("whole-file signature verified against EC key %zu\n", i); free(sig_der); return VERIFY_SUCCESS; } else { |