diff options
| author | Elliott Hughes <enh@google.com> | 2019-05-10 04:22:14 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-10 04:22:14 +0200 |
| commit | f8053c58571543104250198a26574c3b1e338d5b (patch) | |
| tree | 7d8b66ab9a0f452e9a4f8f8ce7d2acc8ccd0735e /install | |
| parent | Merge "Skip hashtree computation during block image verify" am: c046a61d97 am: e945763a5d (diff) | |
| parent | Merge "Track libziparchive API change." am: 6da27adb0b (diff) | |
| download | android_bootable_recovery-f8053c58571543104250198a26574c3b1e338d5b.tar android_bootable_recovery-f8053c58571543104250198a26574c3b1e338d5b.tar.gz android_bootable_recovery-f8053c58571543104250198a26574c3b1e338d5b.tar.bz2 android_bootable_recovery-f8053c58571543104250198a26574c3b1e338d5b.tar.lz android_bootable_recovery-f8053c58571543104250198a26574c3b1e338d5b.tar.xz android_bootable_recovery-f8053c58571543104250198a26574c3b1e338d5b.tar.zst android_bootable_recovery-f8053c58571543104250198a26574c3b1e338d5b.zip | |
Diffstat (limited to 'install')
| -rw-r--r-- | install/install.cpp | 2 | ||||
| -rw-r--r-- | install/verifier.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
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); |