f7eb760fe7
Mostly for applypatch family APIs like ApplyBSDiffPatch() and ApplyImagePatch(). Changing to size_t doesn't indicate they would necessarily work with very large size_t (e.g. > ssize_t), just similar to write(2). But otherwise accepting negative length doesn't make much sense. Also change the return type of SinkFn from ssize_t to size_t. Callers tell a successful sink by comparing the number of written bytes against the desired value. Negative return values like -1 are not needed. This also makes it consistent with bsdiff::bspatch interface. Test: recovery_component_test Test: Apply an incremental with the new updater. Change-Id: I7ff1615203a5c9854134f75d019e266f4ea6e714
85 lines
3.8 KiB
C++
85 lines
3.8 KiB
C++
/*
|
|
* Copyright (C) 2008 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
// This file is a nearly line-for-line copy of bspatch.c from the
|
|
// bsdiff-4.3 distribution; the primary differences being how the
|
|
// input and output data are read and the error handling. Running
|
|
// applypatch with the -l option will display the bsdiff license
|
|
// notice.
|
|
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
|
|
#include <bspatch.h>
|
|
|
|
#include "applypatch/applypatch.h"
|
|
#include "openssl/sha.h"
|
|
|
|
void ShowBSDiffLicense() {
|
|
puts("The bsdiff library used herein is:\n"
|
|
"\n"
|
|
"Copyright 2003-2005 Colin Percival\n"
|
|
"All rights reserved\n"
|
|
"\n"
|
|
"Redistribution and use in source and binary forms, with or without\n"
|
|
"modification, are permitted providing that the following conditions\n"
|
|
"are met:\n"
|
|
"1. Redistributions of source code must retain the above copyright\n"
|
|
" notice, this list of conditions and the following disclaimer.\n"
|
|
"2. Redistributions in binary form must reproduce the above copyright\n"
|
|
" notice, this list of conditions and the following disclaimer in the\n"
|
|
" documentation and/or other materials provided with the distribution.\n"
|
|
"\n"
|
|
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR\n"
|
|
"IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\n"
|
|
"WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n"
|
|
"ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY\n"
|
|
"DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n"
|
|
"DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\n"
|
|
"OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n"
|
|
"HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\n"
|
|
"STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING\n"
|
|
"IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE\n"
|
|
"POSSIBILITY OF SUCH DAMAGE.\n"
|
|
"\n------------------\n\n"
|
|
"This program uses Julian R Seward's \"libbzip2\" library, available\n"
|
|
"from http://www.bzip.org/.\n"
|
|
);
|
|
}
|
|
|
|
int ApplyBSDiffPatch(const unsigned char* old_data, size_t old_size, const Value* patch,
|
|
size_t patch_offset, SinkFn sink, void* token, SHA_CTX* ctx) {
|
|
auto sha_sink = [&](const uint8_t* data, size_t len) {
|
|
len = sink(data, len, token);
|
|
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);
|
|
}
|