summaryrefslogtreecommitdiffstats
path: root/applypatch/bspatch.cpp
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2017-05-19 00:20:55 +0200
committerandroid-build-merger <android-build-merger@google.com>2017-05-19 00:20:55 +0200
commit0abe9860d8a6fcaa038a5c793ad9586547680423 (patch)
tree67e4b121c8a9ea059ee6e43472fa17a6f8b29920 /applypatch/bspatch.cpp
parentMerge "libbootloader_message: convert to Android.bp" am: bec0d4cb94 am: 8226fd8926 (diff)
parentMerge "Print SHA1 of the patch if bsdiff fails with data error" am: 1f9808bd48 (diff)
downloadandroid_bootable_recovery-0abe9860d8a6fcaa038a5c793ad9586547680423.tar
android_bootable_recovery-0abe9860d8a6fcaa038a5c793ad9586547680423.tar.gz
android_bootable_recovery-0abe9860d8a6fcaa038a5c793ad9586547680423.tar.bz2
android_bootable_recovery-0abe9860d8a6fcaa038a5c793ad9586547680423.tar.lz
android_bootable_recovery-0abe9860d8a6fcaa038a5c793ad9586547680423.tar.xz
android_bootable_recovery-0abe9860d8a6fcaa038a5c793ad9586547680423.tar.zst
android_bootable_recovery-0abe9860d8a6fcaa038a5c793ad9586547680423.zip
Diffstat (limited to 'applypatch/bspatch.cpp')
-rw-r--r--applypatch/bspatch.cpp38
1 files changed, 24 insertions, 14 deletions
diff --git a/applypatch/bspatch.cpp b/applypatch/bspatch.cpp
index f75a2c680..65ee614ef 100644
--- a/applypatch/bspatch.cpp
+++ b/applypatch/bspatch.cpp
@@ -23,10 +23,14 @@
#include <stdio.h>
#include <sys/types.h>
+#include <string>
+
+#include <android-base/logging.h>
#include <bspatch.h>
#include <openssl/sha.h>
#include "applypatch/applypatch.h"
+#include "print_sha1.h"
void ShowBSDiffLicense() {
puts("The bsdiff library used herein is:\n"
@@ -67,18 +71,24 @@ int ApplyBSDiffPatch(const unsigned char* old_data, size_t old_size, const Value
if (ctx) SHA1_Update(ctx, data, len);
return len;
};
- return bsdiff::bspatch(old_data, old_size,
- reinterpret_cast<const uint8_t*>(&patch->data[patch_offset]),
- patch->data.size(), sha_sink);
-}
-int ApplyBSDiffPatchMem(const unsigned char* old_data, size_t old_size, const Value* patch,
- size_t patch_offset, std::vector<unsigned char>* new_data) {
- auto vector_sink = [new_data](const uint8_t* data, size_t len) {
- new_data->insert(new_data->end(), data, data + len);
- return len;
- };
- return bsdiff::bspatch(old_data, old_size,
- reinterpret_cast<const uint8_t*>(&patch->data[patch_offset]),
- patch->data.size(), vector_sink);
-}
+ CHECK(patch != nullptr);
+ CHECK_LE(patch_offset, patch->data.size());
+
+ int result = bsdiff::bspatch(old_data, old_size,
+ reinterpret_cast<const uint8_t*>(&patch->data[patch_offset]),
+ patch->data.size() - patch_offset, sha_sink);
+ if (result != 0) {
+ LOG(ERROR) << "bspatch failed, result: " << result;
+ // print SHA1 of the patch in the case of a data error.
+ if (result == 2) {
+ uint8_t digest[SHA_DIGEST_LENGTH];
+ SHA1(reinterpret_cast<const uint8_t*>(patch->data.data() + patch_offset),
+ patch->data.size() - patch_offset, digest);
+ std::string patch_sha1 = print_sha1(digest);
+ LOG(ERROR) << "Patch may be corrupted, offset: " << patch_offset << ", SHA1: "
+ << patch_sha1;
+ }
+ }
+ return result;
+} \ No newline at end of file