tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

resolve merge conflicts of 90d3f20c to stage-aosp-master

Browse source 
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9c1806eceb56712c4b3d1c67d54f4b21bd3fe50a
This commit is contained in:
Tao Bao 2017-03-18 07:33:26 -07:00
commit 553c7bd307
4 changed files with 253 additions and 315 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
install.cpp
View file

@ -27,6 +27,7 @@
#include <unistd.h> #include <unistd.h>
#include <chrono> #include <chrono>
#include <functional>
#include <limits> #include <limits>
#include <map> #include <map>
#include <string> #include <string>
@ -578,23 +579,24 @@ install_package(const char* path, bool* wipe_cache, const char* install_file,
} }
bool verify_package(const unsigned char* package_data, size_t package_size) { bool verify_package(const unsigned char* package_data, size_t package_size) {
std::vector<Certificate> loadedKeys; std::vector<Certificate> loadedKeys;
if (!load_keys(PUBLIC_KEYS_FILE, loadedKeys)) { if (!load_keys(PUBLIC_KEYS_FILE, loadedKeys)) {
LOG(ERROR) << "Failed to load keys"; LOG(ERROR) << "Failed to load keys";
return false; return false;
} }
LOG(INFO) << loadedKeys.size() << " key(s) loaded from " << PUBLIC_KEYS_FILE; LOG(INFO) << loadedKeys.size() << " key(s) loaded from " << PUBLIC_KEYS_FILE;
// Verify package. // Verify package.
ui->Print("Verifying update package...\n"); ui->Print("Verifying update package...\n");
auto t0 = std::chrono::system_clock::now(); auto t0 = std::chrono::system_clock::now();
int err = verify_file(const_cast<unsigned char*>(package_data), package_size, loadedKeys); int err = verify_file(const_cast<unsigned char*>(package_data), package_size, loadedKeys,
std::chrono::duration<double> duration = std::chrono::system_clock::now() - t0; std::bind(&RecoveryUI::SetProgress, ui, std::placeholders::_1));
ui->Print("Update package verification took %.1f s (result %d).\n", duration.count(), err); std::chrono::duration<double> duration = std::chrono::system_clock::now() - t0;
if (err != VERIFY_SUCCESS) { ui->Print("Update package verification took %.1f s (result %d).\n", duration.count(), err);
LOG(ERROR) << "Signature verification failed"; if (err != VERIFY_SUCCESS) {
LOG(ERROR) << "error: " << kZipVerificationFailure; LOG(ERROR) << "Signature verification failed";
return false; LOG(ERROR) << "error: " << kZipVerificationFailure;
} return false;
return true; }
return true;
} }

149
tests/component/verifier_test.cpp
View file

@ -22,93 +22,34 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <memory>
#include <string> #include <string>
#include <vector> #include <vector>
#include <openssl/sha.h> #include <android-base/file.h>
#include <android-base/stringprintf.h> #include <android-base/stringprintf.h>
#include <ziparchive/zip_archive.h> #include <android-base/test_utils.h>
#include "common.h"
#include "common/test_constants.h" #include "common/test_constants.h"
#include "otautil/SysUtil.h" #include "otautil/SysUtil.h"
#include "ui.h"
#include "verifier.h" #include "verifier.h"
RecoveryUI* ui = NULL;
class MockUI : public RecoveryUI {
bool Init(const std::string&) override {
return true;
}
void SetStage(int, int) override {}
void SetBackground(Icon /*icon*/) override {}
void SetSystemUpdateText(bool /*security_update*/) override {}
void SetProgressType(ProgressType /*determinate*/) override {}
void ShowProgress(float /*portion*/, float /*seconds*/) override {}
void SetProgress(float /*fraction*/) override {}
void ShowText(bool /*visible*/) override {}
bool IsTextVisible() override {
return false;
}
bool WasTextEverVisible() override {
return false;
}
void Print(const char* fmt, ...) override {
va_list ap;
va_start(ap, fmt);
vfprintf(stderr, fmt, ap);
va_end(ap);
}
void PrintOnScreenOnly(const char* fmt, ...) override {
va_list ap;
va_start(ap, fmt);
vfprintf(stderr, fmt, ap);
va_end(ap);
}
void ShowFile(const char*) override {}
void StartMenu(const char* const* /*headers*/, const char* const* /*items*/,
int /*initial_selection*/) override {}
int SelectMenu(int /*sel*/) override {
return 0;
}
void EndMenu() override {}
};
void
ui_print(const char* format, ...) {
va_list ap;
va_start(ap, format);
vfprintf(stdout, format, ap);
va_end(ap);
}
class VerifierTest : public testing::TestWithParam<std::vector<std::string>> { class VerifierTest : public testing::TestWithParam<std::vector<std::string>> {
public: protected:
MemMapping memmap; void SetUp() override {
std::vector<Certificate> certs; std::vector<std::string> args = GetParam();
std::string package = from_testdata_base(args[0]);
virtual void SetUp() { if (sysMapFile(package.c_str(), &memmap) != 0) {
std::vector<std::string> args = GetParam(); FAIL() << "Failed to mmap " << package << ": " << strerror(errno) << "\n";
std::string package = from_testdata_base(args[0]);
if (sysMapFile(package.c_str(), &memmap) != 0) {
FAIL() << "Failed to mmap " << package << ": " << strerror(errno) << "\n";
}
for (auto it = ++(args.cbegin()); it != args.cend(); ++it) {
std::string public_key_file = from_testdata_base("testkey_" + *it + ".txt");
ASSERT_TRUE(load_keys(public_key_file.c_str(), certs));
}
} }
static void SetUpTestCase() { for (auto it = ++args.cbegin(); it != args.cend(); ++it) {
ui = new MockUI(); std::string public_key_file = from_testdata_base("testkey_" + *it + ".txt");
ASSERT_TRUE(load_keys(public_key_file.c_str(), certs));
} }
}
MemMapping memmap;
std::vector<Certificate> certs;
}; };
class VerifierSuccessTest : public VerifierTest { class VerifierSuccessTest : public VerifierTest {
@ -118,47 +59,47 @@ class VerifierFailureTest : public VerifierTest {
}; };
TEST_P(VerifierSuccessTest, VerifySucceed) { TEST_P(VerifierSuccessTest, VerifySucceed) {
ASSERT_EQ(verify_file(memmap.addr, memmap.length, certs), VERIFY_SUCCESS); ASSERT_EQ(verify_file(memmap.addr, memmap.length, certs, nullptr), VERIFY_SUCCESS);
} }
TEST_P(VerifierFailureTest, VerifyFailure) { TEST_P(VerifierFailureTest, VerifyFailure) {
ASSERT_EQ(verify_file(memmap.addr, memmap.length, certs), VERIFY_FAILURE); ASSERT_EQ(verify_file(memmap.addr, memmap.length, certs, nullptr), VERIFY_FAILURE);
} }
INSTANTIATE_TEST_CASE_P(SingleKeySuccess, VerifierSuccessTest, INSTANTIATE_TEST_CASE_P(SingleKeySuccess, VerifierSuccessTest,
::testing::Values( ::testing::Values(
std::vector<std::string>({"otasigned_v1.zip", "v1"}), std::vector<std::string>({"otasigned_v1.zip", "v1"}),
std::vector<std::string>({"otasigned_v2.zip", "v2"}), std::vector<std::string>({"otasigned_v2.zip", "v2"}),
std::vector<std::string>({"otasigned_v3.zip", "v3"}), std::vector<std::string>({"otasigned_v3.zip", "v3"}),
std::vector<std::string>({"otasigned_v4.zip", "v4"}), std::vector<std::string>({"otasigned_v4.zip", "v4"}),
std::vector<std::string>({"otasigned_v5.zip", "v5"}))); std::vector<std::string>({"otasigned_v5.zip", "v5"})));
INSTANTIATE_TEST_CASE_P(MultiKeySuccess, VerifierSuccessTest, INSTANTIATE_TEST_CASE_P(MultiKeySuccess, VerifierSuccessTest,
::testing::Values( ::testing::Values(
std::vector<std::string>({"otasigned_v1.zip", "v1", "v2"}), std::vector<std::string>({"otasigned_v1.zip", "v1", "v2"}),
std::vector<std::string>({"otasigned_v2.zip", "v5", "v2"}), std::vector<std::string>({"otasigned_v2.zip", "v5", "v2"}),
std::vector<std::string>({"otasigned_v3.zip", "v5", "v1", "v3"}), std::vector<std::string>({"otasigned_v3.zip", "v5", "v1", "v3"}),
std::vector<std::string>({"otasigned_v4.zip", "v5", "v1", "v4"}), std::vector<std::string>({"otasigned_v4.zip", "v5", "v1", "v4"}),
std::vector<std::string>({"otasigned_v5.zip", "v4", "v1", "v5"}))); std::vector<std::string>({"otasigned_v5.zip", "v4", "v1", "v5"})));
INSTANTIATE_TEST_CASE_P(WrongKey, VerifierFailureTest, INSTANTIATE_TEST_CASE_P(WrongKey, VerifierFailureTest,
::testing::Values( ::testing::Values(
std::vector<std::string>({"otasigned_v1.zip", "v2"}), std::vector<std::string>({"otasigned_v1.zip", "v2"}),
std::vector<std::string>({"otasigned_v2.zip", "v1"}), std::vector<std::string>({"otasigned_v2.zip", "v1"}),
std::vector<std::string>({"otasigned_v3.zip", "v5"}), std::vector<std::string>({"otasigned_v3.zip", "v5"}),
std::vector<std::string>({"otasigned_v4.zip", "v5"}), std::vector<std::string>({"otasigned_v4.zip", "v5"}),
std::vector<std::string>({"otasigned_v5.zip", "v3"}))); std::vector<std::string>({"otasigned_v5.zip", "v3"})));
INSTANTIATE_TEST_CASE_P(WrongHash, VerifierFailureTest, INSTANTIATE_TEST_CASE_P(WrongHash, VerifierFailureTest,
::testing::Values( ::testing::Values(
std::vector<std::string>({"otasigned_v1.zip", "v3"}), std::vector<std::string>({"otasigned_v1.zip", "v3"}),
std::vector<std::string>({"otasigned_v2.zip", "v4"}), std::vector<std::string>({"otasigned_v2.zip", "v4"}),
std::vector<std::string>({"otasigned_v3.zip", "v1"}), std::vector<std::string>({"otasigned_v3.zip", "v1"}),
std::vector<std::string>({"otasigned_v4.zip", "v2"}))); std::vector<std::string>({"otasigned_v4.zip", "v2"})));
INSTANTIATE_TEST_CASE_P(BadPackage, VerifierFailureTest, INSTANTIATE_TEST_CASE_P(BadPackage, VerifierFailureTest,
::testing::Values( ::testing::Values(
std::vector<std::string>({"random.zip", "v1"}), std::vector<std::string>({"random.zip", "v1"}),
std::vector<std::string>({"fake-eocd.zip", "v1"}), std::vector<std::string>({"fake-eocd.zip", "v1"}),
std::vector<std::string>({"alter-metadata.zip", "v1"}), std::vector<std::string>({"alter-metadata.zip", "v1"}),
std::vector<std::string>({"alter-footer.zip", "v1"}))); std::vector<std::string>({"alter-footer.zip", "v1"})));

367
verifier.cpp
View file

@ -21,6 +21,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <functional>
#include <algorithm> #include <algorithm>
#include <memory> #include <memory>
@ -108,207 +109,199 @@ static bool read_pkcs7(uint8_t* pkcs7_der, size_t pkcs7_der_len, uint8_t** sig_d
return *sig_der != NULL; return *sig_der != NULL;
} }
// Look for an RSA signature embedded in the .ZIP file comment given /*
// the path to the zip. Verify it matches one of the given public * Looks for an RSA signature embedded in the .ZIP file comment given the path to the zip. Verifies
// keys. * that it matches one of the given public keys. A callback function can be optionally provided for
// * posting the progress.
// Return VERIFY_SUCCESS, VERIFY_FAILURE (if any error is encountered *
// or no key matches the signature). * Returns VERIFY_SUCCESS or VERIFY_FAILURE (if any error is encountered or no key matches the
* signature).
*/
int verify_file(unsigned char* addr, size_t length, const std::vector<Certificate>& keys,
const std::function<void(float)>& set_progress) {
if (set_progress) {
set_progress(0.0);
}
int verify_file(unsigned char* addr, size_t length, // An archive with a whole-file signature will end in six bytes:
const std::vector<Certificate>& keys) { //
ui->SetProgress(0.0); // (2-byte signature start) $ff $ff (2-byte comment size)
//
// An archive with a whole-file signature will end in six bytes: // (As far as the ZIP format is concerned, these are part of the archive comment.) We start by
// // reading this footer, this tells us how far back from the end we have to start reading to find
// (2-byte signature start) $ff $ff (2-byte comment size) // the whole comment.
//
// (As far as the ZIP format is concerned, these are part of the
// archive comment.) We start by reading this footer, this tells
// us how far back from the end we have to start reading to find
// the whole comment.
#define FOOTER_SIZE 6 #define FOOTER_SIZE 6
if (length < FOOTER_SIZE) { if (length < FOOTER_SIZE) {
LOG(ERROR) << "not big enough to contain footer"; LOG(ERROR) << "not big enough to contain footer";
return VERIFY_FAILURE; return VERIFY_FAILURE;
} }
unsigned char* footer = addr + length - FOOTER_SIZE; unsigned char* footer = addr + length - FOOTER_SIZE;
if (footer[2] != 0xff || footer[3] != 0xff) { if (footer[2] != 0xff || footer[3] != 0xff) {
LOG(ERROR) << "footer is wrong"; LOG(ERROR) << "footer is wrong";
return VERIFY_FAILURE; return VERIFY_FAILURE;
} }
size_t comment_size = footer[4] + (footer[5] << 8); size_t comment_size = footer[4] + (footer[5] << 8);
size_t signature_start = footer[0] + (footer[1] << 8); size_t signature_start = footer[0] + (footer[1] << 8);
LOG(INFO) << "comment is " << comment_size << " bytes; signature is " << signature_start LOG(INFO) << "comment is " << comment_size << " bytes; signature is " << signature_start
<< " bytes from end"; << " bytes from end";
if (signature_start > comment_size) { if (signature_start > comment_size) {
LOG(ERROR) << "signature start: " << signature_start << " is larger than comment size: " LOG(ERROR) << "signature start: " << signature_start << " is larger than comment size: "
<< comment_size; << comment_size;
return VERIFY_FAILURE; return VERIFY_FAILURE;
} }
if (signature_start <= FOOTER_SIZE) { if (signature_start <= FOOTER_SIZE) {
LOG(ERROR) << "Signature start is in the footer"; LOG(ERROR) << "Signature start is in the footer";
return VERIFY_FAILURE; return VERIFY_FAILURE;
} }
#define EOCD_HEADER_SIZE 22 #define EOCD_HEADER_SIZE 22
// The end-of-central-directory record is 22 bytes plus any // The end-of-central-directory record is 22 bytes plus any comment length.
// comment length. size_t eocd_size = comment_size + EOCD_HEADER_SIZE;
size_t eocd_size = comment_size + EOCD_HEADER_SIZE;
if (length < eocd_size) { if (length < eocd_size) {
LOG(ERROR) << "not big enough to contain EOCD"; LOG(ERROR) << "not big enough to contain EOCD";
return VERIFY_FAILURE;
}
// Determine how much of the file is covered by the signature.
// This is everything except the signature data and length, which
// includes all of the EOCD except for the comment length field (2
// bytes) and the comment data.
size_t signed_len = length - eocd_size + EOCD_HEADER_SIZE - 2;
unsigned char* eocd = addr + length - eocd_size;
// If this is really is the EOCD record, it will begin with the
// magic number $50 $4b $05 $06.
if (eocd[0] != 0x50 || eocd[1] != 0x4b ||
eocd[2] != 0x05 || eocd[3] != 0x06) {
LOG(ERROR) << "signature length doesn't match EOCD marker";
return VERIFY_FAILURE;
}
for (size_t i = 4; i < eocd_size-3; ++i) {
if (eocd[i ] == 0x50 && eocd[i+1] == 0x4b &&
eocd[i+2] == 0x05 && eocd[i+3] == 0x06) {
// if the sequence $50 $4b $05 $06 appears anywhere after
// the real one, libziparchive will find the later (wrong) one,
// which could be exploitable. Fail verification if
// this sequence occurs anywhere after the real one.
LOG(ERROR) << "EOCD marker occurs after start of EOCD";
return VERIFY_FAILURE;
}
}
bool need_sha1 = false;
bool need_sha256 = false;
for (const auto& key : keys) {
switch (key.hash_len) {
case SHA_DIGEST_LENGTH: need_sha1 = true; break;
case SHA256_DIGEST_LENGTH: need_sha256 = true; break;
}
}
SHA_CTX sha1_ctx;
SHA256_CTX sha256_ctx;
SHA1_Init(&sha1_ctx);
SHA256_Init(&sha256_ctx);
double frac = -1.0;
size_t so_far = 0;
while (so_far < signed_len) {
// On a Nexus 5X, experiment showed 16MiB beat 1MiB by 6% faster for a
// 1196MiB full OTA and 60% for an 89MiB incremental OTA.
// http://b/28135231.
size_t size = std::min(signed_len - so_far, 16 * MiB);
if (need_sha1) SHA1_Update(&sha1_ctx, addr + so_far, size);
if (need_sha256) SHA256_Update(&sha256_ctx, addr + so_far, size);
so_far += size;
double f = so_far / (double)signed_len;
if (f > frac + 0.02 || size == so_far) {
ui->SetProgress(f);
frac = f;
}
}
uint8_t sha1[SHA_DIGEST_LENGTH];
SHA1_Final(sha1, &sha1_ctx);
uint8_t sha256[SHA256_DIGEST_LENGTH];
SHA256_Final(sha256, &sha256_ctx);
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;
LOG(INFO) << "signature (offset: " << std::hex << (length - signature_start) << ", length: "
<< signature_size << "): " << print_hex(signature, signature_size);
if (!read_pkcs7(signature, signature_size, &sig_der, &sig_der_length)) {
LOG(ERROR) << "Could not find signature DER block";
return VERIFY_FAILURE;
}
/*
* Check to make sure at least one of the keys matches the signature. Since
* any key can match, we need to try each before determining a verification
* failure has happened.
*/
size_t i = 0;
for (const auto& key : keys) {
const uint8_t* hash;
int hash_nid;
switch (key.hash_len) {
case SHA_DIGEST_LENGTH:
hash = sha1;
hash_nid = NID_sha1;
break;
case SHA256_DIGEST_LENGTH:
hash = sha256;
hash_nid = NID_sha256;
break;
default:
continue;
}
// The 6 bytes is the "(signature_start) $ff $ff (comment_size)" that
// the signing tool appends after the signature itself.
if (key.key_type == Certificate::KEY_TYPE_RSA) {
if (!RSA_verify(hash_nid, hash, key.hash_len, sig_der,
sig_der_length, key.rsa.get())) {
LOG(INFO) << "failed to verify against RSA key " << i;
continue;
}
LOG(INFO) << "whole-file signature verified against RSA key " << i;
free(sig_der);
return VERIFY_SUCCESS;
} else if (key.key_type == Certificate::KEY_TYPE_EC
&& key.hash_len == SHA256_DIGEST_LENGTH) {
if (!ECDSA_verify(0, hash, key.hash_len, sig_der,
sig_der_length, key.ec.get())) {
LOG(INFO) << "failed to verify against EC key " << i;
continue;
}
LOG(INFO) << "whole-file signature verified against EC key " << i;
free(sig_der);
return VERIFY_SUCCESS;
} else {
LOG(INFO) << "Unknown key type " << key.key_type;
}
i++;
}
if (need_sha1) {
LOG(INFO) << "SHA-1 digest: " << print_hex(sha1, SHA_DIGEST_LENGTH);
}
if (need_sha256) {
LOG(INFO) << "SHA-256 digest: " << print_hex(sha256, SHA256_DIGEST_LENGTH);
}
free(sig_der);
LOG(ERROR) << "failed to verify whole-file signature";
return VERIFY_FAILURE; return VERIFY_FAILURE;
}
// Determine how much of the file is covered by the signature. This is everything except the
// signature data and length, which includes all of the EOCD except for the comment length field
// (2 bytes) and the comment data.
size_t signed_len = length - eocd_size + EOCD_HEADER_SIZE - 2;
unsigned char* eocd = addr + length - eocd_size;
// If this is really is the EOCD record, it will begin with the magic number $50 $4b $05 $06.
if (eocd[0] != 0x50 || eocd[1] != 0x4b || eocd[2] != 0x05 || eocd[3] != 0x06) {
LOG(ERROR) << "signature length doesn't match EOCD marker";
return VERIFY_FAILURE;
}
for (size_t i = 4; i < eocd_size-3; ++i) {
if (eocd[i ] == 0x50 && eocd[i+1] == 0x4b && eocd[i+2] == 0x05 && eocd[i+3] == 0x06) {
// If the sequence $50 $4b $05 $06 appears anywhere after the real one, libziparchive will
// find the later (wrong) one, which could be exploitable. Fail the verification if this
// sequence occurs anywhere after the real one.
LOG(ERROR) << "EOCD marker occurs after start of EOCD";
return VERIFY_FAILURE;
}
}
bool need_sha1 = false;
bool need_sha256 = false;
for (const auto& key : keys) {
switch (key.hash_len) {
case SHA_DIGEST_LENGTH: need_sha1 = true; break;
case SHA256_DIGEST_LENGTH: need_sha256 = true; break;
}
}
SHA_CTX sha1_ctx;
SHA256_CTX sha256_ctx;
SHA1_Init(&sha1_ctx);
SHA256_Init(&sha256_ctx);
double frac = -1.0;
size_t so_far = 0;
while (so_far < signed_len) {
// On a Nexus 5X, experiment showed 16MiB beat 1MiB by 6% faster for a
// 1196MiB full OTA and 60% for an 89MiB incremental OTA.
// http://b/28135231.
size_t size = std::min(signed_len - so_far, 16 * MiB);
if (need_sha1) SHA1_Update(&sha1_ctx, addr + so_far, size);
if (need_sha256) SHA256_Update(&sha256_ctx, addr + so_far, size);
so_far += size;
if (set_progress) {
double f = so_far / (double)signed_len;
if (f > frac + 0.02 || size == so_far) {
set_progress(f);
frac = f;
}
}
}
uint8_t sha1[SHA_DIGEST_LENGTH];
SHA1_Final(sha1, &sha1_ctx);
uint8_t sha256[SHA256_DIGEST_LENGTH];
SHA256_Final(sha256, &sha256_ctx);
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;
LOG(INFO) << "signature (offset: " << std::hex << (length - signature_start) << ", length: "
<< signature_size << "): " << print_hex(signature, signature_size);
if (!read_pkcs7(signature, signature_size, &sig_der, &sig_der_length)) {
LOG(ERROR) << "Could not find signature DER block";
return VERIFY_FAILURE;
}
// Check to make sure at least one of the keys matches the signature. Since any key can match,
// we need to try each before determining a verification failure has happened.
size_t i = 0;
for (const auto& key : keys) {
const uint8_t* hash;
int hash_nid;
switch (key.hash_len) {
case SHA_DIGEST_LENGTH:
hash = sha1;
hash_nid = NID_sha1;
break;
case SHA256_DIGEST_LENGTH:
hash = sha256;
hash_nid = NID_sha256;
break;
default:
continue;
}
// The 6 bytes is the "(signature_start) $ff $ff (comment_size)" that the signing tool appends
// after the signature itself.
if (key.key_type == Certificate::KEY_TYPE_RSA) {
if (!RSA_verify(hash_nid, hash, key.hash_len, sig_der, sig_der_length, key.rsa.get())) {
LOG(INFO) << "failed to verify against RSA key " << i;
continue;
}
LOG(INFO) << "whole-file signature verified against RSA key " << i;
free(sig_der);
return VERIFY_SUCCESS;
} else if (key.key_type == Certificate::KEY_TYPE_EC && key.hash_len == SHA256_DIGEST_LENGTH) {
if (!ECDSA_verify(0, hash, key.hash_len, sig_der, sig_der_length, key.ec.get())) {
LOG(INFO) << "failed to verify against EC key " << i;
continue;
}
LOG(INFO) << "whole-file signature verified against EC key " << i;
free(sig_der);
return VERIFY_SUCCESS;
} else {
LOG(INFO) << "Unknown key type " << key.key_type;
}
i++;
}
if (need_sha1) {
LOG(INFO) << "SHA-1 digest: " << print_hex(sha1, SHA_DIGEST_LENGTH);
}
if (need_sha256) {
LOG(INFO) << "SHA-256 digest: " << print_hex(sha256, SHA256_DIGEST_LENGTH);
}
free(sig_der);
LOG(ERROR) << "failed to verify whole-file signature";
return VERIFY_FAILURE;
} }
std::unique_ptr<RSA, RSADeleter> parse_rsa_key(FILE* file, uint32_t exponent) { std::unique_ptr<RSA, RSADeleter> parse_rsa_key(FILE* file, uint32_t exponent) {

14
verifier.h
View file

@ -17,6 +17,7 @@
#ifndef _RECOVERY_VERIFIER_H #ifndef _RECOVERY_VERIFIER_H
#define _RECOVERY_VERIFIER_H #define _RECOVERY_VERIFIER_H
#include <functional>
#include <memory> #include <memory>
#include <vector> #include <vector>
@ -58,13 +59,14 @@ struct Certificate {
std::unique_ptr<EC_KEY, ECKEYDeleter> ec; std::unique_ptr<EC_KEY, ECKEYDeleter> ec;
}; };
/* addr and length define a an update package file that has been /*
* loaded (or mmap'ed, or whatever) into memory. Verify that the file * 'addr' and 'length' define an update package file that has been loaded (or mmap'ed, or
* is signed and the signature matches one of the given keys. Return * whatever) into memory. Verifies that the file is signed and the signature matches one of the
* one of the constants below. * given keys. It optionally accepts a callback function for posting the progress to. Returns one
* of the constants of VERIFY_SUCCESS and VERIFY_FAILURE.
*/ */
int verify_file(unsigned char* addr, size_t length, int verify_file(unsigned char* addr, size_t length, const std::vector<Certificate>& keys,
const std::vector<Certificate>& keys); const std::function<void(float)>& set_progress = nullptr);
bool load_keys(const char* filename, std::vector<Certificate>& certs); bool load_keys(const char* filename, std::vector<Certificate>& certs);