aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianjie Xu2016-09-08 22:10:11 -0500
committerTianjie Xu2016-10-17 19:41:51 -0500
commit8cf5c8f60f51049278b08ae4cbc31df397b651fd (patch)
treea49e8f62581f0fbc8f7e352ee780220130435a6f /verifier.cpp
parent2b17b24ae5eccd6c472c06abde93b5b83950c658 (diff)
downloadplatform-bootable-recovery-8cf5c8f60f51049278b08ae4cbc31df397b651fd.tar.gz
platform-bootable-recovery-8cf5c8f60f51049278b08ae4cbc31df397b651fd.tar.xz
platform-bootable-recovery-8cf5c8f60f51049278b08ae4cbc31df397b651fd.zip
Replace minzip with libziparchive
Clean up the duplicated codes that handle the zip files in bootable/recovery; and rename the library of the remaining utility functions to libotautil. Test: Update package installed successfully on angler. Bug: 19472796 Change-Id: Iea8962fcf3004473cb0322b6bb3a9ea3ca7f679e
Diffstat (limited to 'verifier.cpp')
-rw-r--r--verifier.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/verifier.cpp b/verifier.cpp
index 401bd7e3..82cdd3bc 100644
--- a/verifier.cpp
+++ b/verifier.cpp
@@ -184,7 +184,7 @@ int verify_file(unsigned char* addr, size_t length,
184 if (eocd[i ] == 0x50 && eocd[i+1] == 0x4b && 184 if (eocd[i ] == 0x50 && eocd[i+1] == 0x4b &&
185 eocd[i+2] == 0x05 && eocd[i+3] == 0x06) { 185 eocd[i+2] == 0x05 && eocd[i+3] == 0x06) {
186 // if the sequence $50 $4b $05 $06 appears anywhere after 186 // if the sequence $50 $4b $05 $06 appears anywhere after
187 // the real one, minzip will find the later (wrong) one, 187 // the real one, libziparchive will find the later (wrong) one,
188 // which could be exploitable. Fail verification if 188 // which could be exploitable. Fail verification if
189 // this sequence occurs anywhere after the real one. 189 // this sequence occurs anywhere after the real one.
190 LOG(ERROR) << "EOCD marker occurs after start of EOCD"; 190 LOG(ERROR) << "EOCD marker occurs after start of EOCD";