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

Merge "Implement the new v4 signing scheme in adb" into rvc-dev am: 742ef23ee9

Browse source 
Change-Id: I1f30ddb248fca223a47a532ad8d02e5dcc6a0c59
This commit is contained in:
Automerger Merge Worker 2020-03-14 02:35:08 +00:00
commit cde607bfed
1 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
adb/client/incremental.cpp
View file

@ -45,33 +45,29 @@ static inline int32_t read_int32(borrowed_fd fd) {
return result;
}
static inline int32_t read_be_int32(borrowed_fd fd) {
return int32_t(be32toh(read_int32(fd)));
}
static inline void append_int(borrowed_fd fd, std::vector<char>* bytes) {
int32_t be_val = read_int32(fd);
int32_t le_val = read_int32(fd);
auto old_size = bytes->size();
bytes->resize(old_size + sizeof(be_val));
memcpy(bytes->data() + old_size, &be_val, sizeof(be_val));
bytes->resize(old_size + sizeof(le_val));
memcpy(bytes->data() + old_size, &le_val, sizeof(le_val));
}
static inline void append_bytes_with_size(borrowed_fd fd, std::vector<char>* bytes) {
int32_t be_size = read_int32(fd);
int32_t size = int32_t(be32toh(be_size));
int32_t le_size = read_int32(fd);
int32_t size = int32_t(le32toh(le_size));
auto old_size = bytes->size();
bytes->resize(old_size + sizeof(be_size) + size);
memcpy(bytes->data() + old_size, &be_size, sizeof(be_size));
ReadFully(fd, bytes->data() + old_size + sizeof(be_size), size);
bytes->resize(old_size + sizeof(le_size) + size);
memcpy(bytes->data() + old_size, &le_size, sizeof(le_size));
ReadFully(fd, bytes->data() + old_size + sizeof(le_size), size);
}
static inline std::pair<std::vector<char>, int32_t> read_id_sig_headers(borrowed_fd fd) {
std::vector<char> result;
append_int(fd, &result); // version
append_bytes_with_size(fd, &result); // verityRootHash
append_bytes_with_size(fd, &result); // v3Digest
append_bytes_with_size(fd, &result); // pkcs7SignatureBlock
auto tree_size = read_be_int32(fd); // size of the verity tree
append_bytes_with_size(fd, &result); // hashingInfo
append_bytes_with_size(fd, &result); // signingInfo
auto le_tree_size = read_int32(fd);
auto tree_size = int32_t(le32toh(le_tree_size)); // size of the verity tree
return {std::move(result), tree_size};
}