Jed Estep
432918603f
Refactor existing tests to use gtest
...
Bug: 26962907
Change-Id: I5f80636af1740badeff7d08193f08e23f4e4fee1
2016-02-04 10:11:30 -08:00
Sen Jiang
c48cb5e597
Switch from mincrypt to BoringSSL in applypatch and updater.
...
Bug: 18790686
Change-Id: I7d2136fb39b2266f5ae5be24819c617b08a6c21e
2016-02-04 16:27:43 +08:00
Yabin Cui
c342c60cb0
Merge "uncrypt: add options to setup bcb and clear bcb." am: e3434279c8
...
am: 2ae24604d4
2016-02-03 19:00:11 +00:00
Yabin Cui
2ae24604d4
Merge "uncrypt: add options to setup bcb and clear bcb."
...
am: e3434279c8
2016-02-03 18:57:53 +00:00
Yabin Cui
e3434279c8
Merge "uncrypt: add options to setup bcb and clear bcb."
2016-02-03 18:52:52 +00:00
Yabin Cui
2d46da57e1
uncrypt: add options to setup bcb and clear bcb.
...
Bug: 26696173
Change-Id: I3a612f045aaa9e93e61ae45b05300d02b19bb3ad
2016-02-03 10:43:03 -08:00
Tao Bao
344f5c5c39
Merge "recovery: Refactor verifier and verifier_test." am: 351ddbbc0a
...
am: b177ead3d7
2016-02-03 17:49:46 +00:00
Tao Bao
b177ead3d7
Merge "recovery: Refactor verifier and verifier_test."
...
am: 351ddbbc0a
2016-02-03 17:43:28 +00:00
Tao Bao
351ddbbc0a
Merge "recovery: Refactor verifier and verifier_test."
2016-02-03 17:16:56 +00:00
Tao Bao
71e3e09ec2
recovery: Refactor verifier and verifier_test.
...
Move to using std::vector and std::unique_ptr to manage key
certificates to stop memory leaks.
Bug: 26908001
Change-Id: Ia5f799bc8dcc036a0ffae5eaa8d9f6e09abd031c
2016-02-02 21:51:32 -08:00
Yabin Cui
da5a5f80f4
Merge "uncrypt: generate map file by renaming tmp file." am: 4c07a7ec05
...
am: 32ddaaacfd
2016-02-02 00:19:36 +00:00
Yabin Cui
32ddaaacfd
Merge "uncrypt: generate map file by renaming tmp file."
...
am: 4c07a7ec05
2016-02-02 00:17:41 +00:00
Yabin Cui
4c07a7ec05
Merge "uncrypt: generate map file by renaming tmp file."
2016-02-02 00:12:21 +00:00
Yabin Cui
25dd0386fe
uncrypt: generate map file by renaming tmp file.
...
Writing map file directly can break consistency in map file if
it fails in the middle. Instead, we write a temporary file and
rename the temporary file to map file.
Bug: 26883096
Change-Id: I5e99e942e1b75e758af5f7a48f8a08a0b0041d6a
2016-02-01 14:43:14 -08:00
Tao Bao
9fcb016109
Merge "Fix build." am: 9d72d4175b
...
am: 2ab24d36b9
2016-01-29 06:09:04 +00:00
Tao Bao
2ab24d36b9
Merge "Fix build."
...
am: 9d72d4175b
2016-01-29 06:06:58 +00:00
Tao Bao
9d72d4175b
Merge "Fix build."
2016-01-29 06:01:32 +00:00
Tao Bao
8b0db11eba
Fix build.
...
Disable libimgpatch for non-Linux host.
Change-Id: Ib3615204b76564c691ddafaa29e59fef334d9d36
2016-01-28 21:59:09 -08:00
Tao Bao
484c49e99e
resolve merge conflicts of 725833e024 to master.
...
Change-Id: I68b8737e3bc2bd7bffd7625114723bc1efa47398
2016-01-28 20:58:59 -08:00
Sen Jiang
725833e024
Merge "applypatch: Compile libimgpatch for target and host."
...
am: 1f3616f3fd
2016-01-29 04:38:56 +00:00
Sen Jiang
1f3616f3fd
Merge "applypatch: Compile libimgpatch for target and host."
2016-01-29 04:35:05 +00:00
Sen Jiang
0cce9cda0c
applypatch: Compile libimgpatch for target and host.
...
update_engine need it for the new IMGDIFF operation.
Also removed __unused in ApplyImagePatch() as I got error building it
for the host, and I think it's dangerous not checking the size of the
input.
Test: mma
Bug: 26628339
Change-Id: I22d4cd55c2c3f87697d6afdf10e8106fef7d1a9c
2016-01-28 13:26:25 +08:00
Yabin Cui
a7e7cef949
Merge "edify: accept long string literal." am: d379b4410b
...
am: bb0e2754ac
2016-01-27 23:25:44 +00:00
Yabin Cui
bb0e2754ac
Merge "edify: accept long string literal."
...
am: d379b4410b
2016-01-27 23:23:53 +00:00
Yabin Cui
d379b4410b
Merge "edify: accept long string literal."
2016-01-27 23:05:57 +00:00
Yabin Cui
12f499e86d
edify: accept long string literal.
...
Bug: 24717917
Change-Id: I134cf00ae7efbc3703f976459a1b9f9a197e495d
2016-01-27 12:26:18 -08:00
Tao Bao
59f2815145
Merge "Change BCB to perform synchronous writes." am: 5797bf9c90
...
am: e51d0b4d38
2016-01-22 18:46:07 +00:00
Tao Bao
e51d0b4d38
Merge "Change BCB to perform synchronous writes."
...
am: 5797bf9c90
2016-01-22 17:27:38 +00:00
Tao Bao
5797bf9c90
Merge "Change BCB to perform synchronous writes."
2016-01-22 17:23:17 +00:00
Tao Bao
bd82b27341
Change BCB to perform synchronous writes.
...
Also some trivial clean-ups in bootloader control block (BCB) code.
Change-Id: I42828954caa4d08998310de40fd0391f76d99cbe
2016-01-21 14:49:13 -08:00
Tao Bao
b595e1722c
Merge "recovery: Fork a process for fuse when sideloading from SD card." am: 37e3c71da3
...
am: ce46828e08
2016-01-14 20:19:31 +00:00
Tao Bao
ce46828e08
Merge "recovery: Fork a process for fuse when sideloading from SD card."
...
am: 37e3c71da3
2016-01-14 18:29:05 +00:00
Tao Bao
37e3c71da3
Merge "recovery: Fork a process for fuse when sideloading from SD card."
2016-01-14 18:25:54 +00:00
Tao Bao
cdcf28f54f
recovery: Fork a process for fuse when sideloading from SD card.
...
For applying update from SD card, we used to use a thread to serve the
file with fuse. Since accessing through fuse involves going from kernel
to userspace to kernel, it may run into deadlock (e.g. for mmap_sem)
when a page fault occurs. Switch to using a process instead.
Bug: 23783099
Bug: 26313124
Change-Id: Iac0f55b1bdb078cadb520cfe1133e70fbb26eadd
2016-01-13 21:29:20 -08:00
Tao Bao
811353ab0f
Merge "uncrypt: avoid use-after-free" am: 0305fcecc5
...
am: 4edfeb84dd
2016-01-14 02:09:00 +00:00
Tao Bao
4edfeb84dd
Merge "uncrypt: avoid use-after-free"
...
am: 0305fcecc5
2016-01-14 02:05:31 +00:00
Tao Bao
0305fcecc5
Merge "uncrypt: avoid use-after-free"
2016-01-14 00:41:04 +00:00
Andriy Naborskyy
0a8762e50c
Revert "Byte swap to support BGRA in recovery mode" am: a5d5082222 am: 40cce13094
...
am: 2d127a1d4a
2016-01-13 18:50:21 +00:00
Ying Wang
fcf142be17
Merge "Rename .l/.y to .ll/.yy" am: ab9db5284e
...
am: f607e5a0bc
2016-01-13 18:45:22 +00:00
Ying Wang
c577660702
Rename .l/.y to .ll/.yy
...
Now to generate .cpp you need to use .ll/.yy.
Bug: 26492989
Change-Id: Ib078e03b3b0758f7a62595c343e52ae856bcb33f
2016-01-12 21:09:10 -08:00
Daniel Micay
c5631fc096
uncrypt: avoid use-after-free
...
The `std::string package` variable goes out of scope but the input_path
variable is then used to access the memory as it's set to `c_str()`.
This was detected via OpenBSD malloc's junk filling feature.
Change-Id: Ic4b939347881b6ebebf71884e7e2272ce99510e2
2016-01-12 14:08:34 -08:00
Andriy Naborskyy
2d127a1d4a
Revert "Byte swap to support BGRA in recovery mode" am: a5d5082222
...
am: 40cce13094
2016-01-12 20:42:52 +00:00
Andriy Naborskyy
40cce13094
Revert "Byte swap to support BGRA in recovery mode"
...
am: a5d5082222
2016-01-12 19:16:25 +00:00
Ying Wang
f607e5a0bc
Merge "Rename .l/.y to .ll/.yy"
...
am: ab9db5284e
2016-01-12 18:57:20 +00:00
Ying Wang
ab9db5284e
Merge "Rename .l/.y to .ll/.yy"
2016-01-12 17:35:33 +00:00
Ying Wang
c8abc4ec45
Rename .l/.y to .ll/.yy
...
Now to generate .cpp you need to use .ll/.yy.
Bug: 26492989
Change-Id: Ib078e03b3b0758f7a62595c343e52ae856bcb33f
2016-01-11 18:14:17 -08:00
Jed Estep
b1cc5d8434
Merge "IO fault injection for OTA packages"
2016-01-08 23:28:32 +00:00
Andriy Naborskyy
a5d5082222
Revert "Byte swap to support BGRA in recovery mode"
...
This reverts commit e5879c3639fd778e3e40
2016-01-08 10:15:57 -08:00
Tianjie Xu
cb93b61578
Merge "updater: Add a function to check first block" am: 6f8b9b60db
...
am: a3c89623e7
2016-01-08 00:30:45 +00:00
Tianjie Xu
a3c89623e7
Merge "updater: Add a function to check first block"
...
am: 6f8b9b60db
2016-01-08 00:28:42 +00:00
