diff options
author | Tao Bao <tbao@google.com> | 2016-04-23 01:49:53 +0200 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-04-23 01:49:53 +0200 |
commit | 5e3aa78c8bb47ee96ed5d2d9713b64ae6c8823be (patch) | |
tree | c68cd4eae5e1ec9f9a87785593ff553a9dca0454 /verifier.cpp | |
parent | Go back to the old ear-wiggling Android animation. (diff) | |
parent | Merge "recovery: Dump the signature in the zip package." into nyc-dev (diff) | |
download | android_bootable_recovery-5e3aa78c8bb47ee96ed5d2d9713b64ae6c8823be.tar android_bootable_recovery-5e3aa78c8bb47ee96ed5d2d9713b64ae6c8823be.tar.gz android_bootable_recovery-5e3aa78c8bb47ee96ed5d2d9713b64ae6c8823be.tar.bz2 android_bootable_recovery-5e3aa78c8bb47ee96ed5d2d9713b64ae6c8823be.tar.lz android_bootable_recovery-5e3aa78c8bb47ee96ed5d2d9713b64ae6c8823be.tar.xz android_bootable_recovery-5e3aa78c8bb47ee96ed5d2d9713b64ae6c8823be.tar.zst android_bootable_recovery-5e3aa78c8bb47ee96ed5d2d9713b64ae6c8823be.zip |
Diffstat (limited to 'verifier.cpp')
-rw-r--r-- | verifier.cpp | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/verifier.cpp b/verifier.cpp index 523990561..996a1fdf9 100644 --- a/verifier.cpp +++ b/verifier.cpp @@ -28,6 +28,7 @@ #include "asn1_decoder.h" #include "common.h" +#include "print_sha1.h" #include "ui.h" #include "verifier.h" @@ -231,9 +232,14 @@ int verify_file(unsigned char* addr, size_t length, uint8_t* sig_der = nullptr; size_t sig_der_length = 0; + uint8_t* signature = eocd + eocd_size - signature_start; size_t signature_size = signature_start - FOOTER_SIZE; - if (!read_pkcs7(eocd + eocd_size - signature_start, signature_size, &sig_der, - &sig_der_length)) { + + LOGI("signature (offset: 0x%zx, length: %zu): %s\n", + length - signature_start, signature_size, + print_hex(signature, signature_size).c_str()); + + if (!read_pkcs7(signature, signature_size, &sig_der, &sig_der_length)) { LOGE("Could not find signature DER block\n"); return VERIFY_FAILURE; } @@ -288,6 +294,13 @@ int verify_file(unsigned char* addr, size_t length, } i++; } + + if (need_sha1) { + LOGI("SHA-1 digest: %s\n", print_hex(sha1, SHA_DIGEST_LENGTH).c_str()); + } + if (need_sha256) { + LOGI("SHA-256 digest: %s\n", print_hex(sha256, SHA256_DIGEST_LENGTH).c_str()); + } free(sig_der); LOGE("failed to verify whole-file signature\n"); return VERIFY_FAILURE; |