summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2019-05-09 23:32:52 +0200
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-05-09 23:32:52 +0200
commit6da27adb0bcac44ae092c385da9ba6a2be3319b6 (patch)
tree9f5cc5c5cb6c9fec552b28694849b14f39dba30b
parentMerge "Skip hashtree computation during block image verify" (diff)
parentTrack libziparchive API change. (diff)
downloadandroid_bootable_recovery-6da27adb0bcac44ae092c385da9ba6a2be3319b6.tar
android_bootable_recovery-6da27adb0bcac44ae092c385da9ba6a2be3319b6.tar.gz
android_bootable_recovery-6da27adb0bcac44ae092c385da9ba6a2be3319b6.tar.bz2
android_bootable_recovery-6da27adb0bcac44ae092c385da9ba6a2be3319b6.tar.lz
android_bootable_recovery-6da27adb0bcac44ae092c385da9ba6a2be3319b6.tar.xz
android_bootable_recovery-6da27adb0bcac44ae092c385da9ba6a2be3319b6.tar.zst
android_bootable_recovery-6da27adb0bcac44ae092c385da9ba6a2be3319b6.zip
-rw-r--r--applypatch/imgdiff.cpp2
-rw-r--r--install/install.cpp2
-rw-r--r--install/verifier.cpp3
3 files changed, 3 insertions, 4 deletions
diff --git a/applypatch/imgdiff.cpp b/applypatch/imgdiff.cpp
index 415d95f14..cb34d4699 100644
--- a/applypatch/imgdiff.cpp
+++ b/applypatch/imgdiff.cpp
@@ -675,7 +675,7 @@ bool ZipModeImage::Initialize(const std::string& filename) {
// Iterate the zip entries and compose the image chunks accordingly.
bool ZipModeImage::InitializeChunks(const std::string& filename, ZipArchiveHandle handle) {
void* cookie;
- int ret = StartIteration(handle, &cookie, nullptr, nullptr);
+ int ret = StartIteration(handle, &cookie);
if (ret != 0) {
LOG(ERROR) << "Failed to iterate over entries in " << filename << ": " << ErrorCodeString(ret);
return false;
diff --git a/install/install.cpp b/install/install.cpp
index d62bffc59..1b51b4246 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -529,7 +529,7 @@ bool verify_package_compatibility(ZipArchiveHandle package_zip) {
// Iterate all the entries inside COMPATIBILITY_ZIP_ENTRY and read the contents.
void* cookie;
- ret = StartIteration(zip_handle, &cookie, nullptr, nullptr);
+ ret = StartIteration(zip_handle, &cookie);
if (ret != 0) {
LOG(ERROR) << "Failed to start iterating zip entries: " << ErrorCodeString(ret);
CloseArchive(zip_handle);
diff --git a/install/verifier.cpp b/install/verifier.cpp
index 6ba1d77c3..3de58e4bb 100644
--- a/install/verifier.cpp
+++ b/install/verifier.cpp
@@ -311,8 +311,7 @@ int verify_file(VerifierInterface* package, const std::vector<Certificate>& keys
static std::vector<Certificate> IterateZipEntriesAndSearchForKeys(const ZipArchiveHandle& handle) {
void* cookie;
- ZipString suffix("x509.pem");
- int32_t iter_status = StartIteration(handle, &cookie, nullptr, &suffix);
+ int32_t iter_status = StartIteration(handle, &cookie, "", "x509.pem");
if (iter_status != 0) {
LOG(ERROR) << "Failed to iterate over entries in the certificate zipfile: "
<< ErrorCodeString(iter_status);