summaryrefslogtreecommitdiffstats
path: root/install/verifier.cpp
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2019-05-23 19:55:27 +0200
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-05-23 19:55:27 +0200
commit7b67d2851806a6c4d66953564b5d2c052bdc8f9c (patch)
treeb191a6b41229ce9867842fc60e5bd9dae1e96f54 /install/verifier.cpp
parentMerge "Revert "recovery: report compliant reboot reason"" (diff)
parentMove off the Next ZipString overload. (diff)
downloadandroid_bootable_recovery-7b67d2851806a6c4d66953564b5d2c052bdc8f9c.tar
android_bootable_recovery-7b67d2851806a6c4d66953564b5d2c052bdc8f9c.tar.gz
android_bootable_recovery-7b67d2851806a6c4d66953564b5d2c052bdc8f9c.tar.bz2
android_bootable_recovery-7b67d2851806a6c4d66953564b5d2c052bdc8f9c.tar.lz
android_bootable_recovery-7b67d2851806a6c4d66953564b5d2c052bdc8f9c.tar.xz
android_bootable_recovery-7b67d2851806a6c4d66953564b5d2c052bdc8f9c.tar.zst
android_bootable_recovery-7b67d2851806a6c4d66953564b5d2c052bdc8f9c.zip
Diffstat (limited to 'install/verifier.cpp')
-rw-r--r--install/verifier.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/install/verifier.cpp b/install/verifier.cpp
index 3de58e4bb..02759cdc2 100644
--- a/install/verifier.cpp
+++ b/install/verifier.cpp
@@ -320,22 +320,21 @@ static std::vector<Certificate> IterateZipEntriesAndSearchForKeys(const ZipArchi
std::vector<Certificate> result;
- ZipString name;
+ std::string name;
ZipEntry entry;
while ((iter_status = Next(cookie, &entry, &name)) == 0) {
std::vector<uint8_t> pem_content(entry.uncompressed_length);
if (int32_t extract_status =
ExtractToMemory(handle, &entry, pem_content.data(), pem_content.size());
extract_status != 0) {
- LOG(ERROR) << "Failed to extract " << std::string(name.name, name.name + name.name_length);
+ LOG(ERROR) << "Failed to extract " << name;
return {};
}
Certificate cert(0, Certificate::KEY_TYPE_RSA, nullptr, nullptr);
// Aborts the parsing if we fail to load one of the key file.
if (!LoadCertificateFromBuffer(pem_content, &cert)) {
- LOG(ERROR) << "Failed to load keys from "
- << std::string(name.name, name.name + name.name_length);
+ LOG(ERROR) << "Failed to load keys from " << name;
return {};
}