PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,396 Commits 1 Branch 0 Tags
ddca75fb0a878a888685d48dfcaf9dd62c01e2c8
Commit Graph

1396 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tianjie Xu ddca75fb0a DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours 
am: 37a5941440

Change-Id: I87b102e92e9ee2bc49af6b7c8ec4d0a48894f732
 2017-01-19 18:48:03 +00:00
Tianjie Xu 37a5941440 DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 
am: 2b1bcab427  -s ours

Change-Id: I74119e64e0d5fe813c18191a201fadbf9870c400
 2017-01-19 18:45:32 +00:00
Tianjie Xu 2b1bcab427 DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours 
am: 94c8b5e5a6

Change-Id: I42132e10d5ba4cdf77232dadb88100e6c29acf80
 2017-01-19 18:43:02 +00:00
Tianjie Xu 94c8b5e5a6 DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours 
am: 051dfa7ec3  -s ours

Change-Id: I88ff80ef082f32825f4ed860af9b9d67d282e11a
 2017-01-19 18:41:01 +00:00
Tianjie Xu 051dfa7ec3 DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours 
am: a41cc29447  -s ours

Change-Id: Ib3a827173380145bf7a3fcd7e4f8386571228699
 2017-01-19 18:39:02 +00:00
Tianjie Xu a41cc29447 DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 
am: 5346da0220  -s ours

Change-Id: I2952d0746c6cc00837c90370d09a30049d462df3
 2017-01-19 18:36:01 +00:00
Tianjie Xu 6ea9888d51 Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d 
am: d3d5e54a45

Change-Id: Ib892c1745197ccb42d77c7bc8647f2e6b725a7dd
 2017-01-18 22:28:46 +00:00
Tianjie Xu d3d5e54a45 Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b 
am: fb80b4f72d

Change-Id: Iba2da78981e4bd7a2b263b2f6b18ab6c176e5fc8
 2017-01-18 22:26:47 +00:00
Tianjie Xu fb80b4f72d Add a checker for signature boundary in verifier am: 54ea136fde 
am: 0a34b17c8b

Change-Id: I4dbba92ea717951307dbcb6bf287edf4f6144a38
 2017-01-18 22:24:16 +00:00
Tianjie Xu 0a34b17c8b Add a checker for signature boundary in verifier 
am: 54ea136fde

Change-Id: Ide2da96e322c6a913b7f2e950e43c4d11278338e
 2017-01-18 22:22:16 +00:00
Tianjie Xu 5346da0220 DO NOT MERGE: Add a checker for signature boundary in verifier 
am: f616da1726

Change-Id: I05a1a6775229a1041e1a93388a86262d36d6581b
 2017-01-18 22:22:16 +00:00
Tianjie Xu f616da1726 DO NOT MERGE: Add a checker for signature boundary in verifier 
The 'signature_start' variable marks the location of the signature
from the end of a zip archive. And a boundary check is missing where
'signature_start' should be within the EOCD comment field. This causes
problems when sideloading a malicious package. Also add a corresponding
test.

Bug: 31914369
Test: Verification fails correctly when sideloading recovery_test.zip on
angler.

Change-Id: I6ea96bf04dac5d8d4d6719e678d504f957b4d5c1
(cherry-picked from f69e6a9475)
(cherry picked from commit 54ea136fde)
 2016-12-19 16:46:44 -08:00
Tianjie Xu 54ea136fde Add a checker for signature boundary in verifier 
The 'signature_start' variable marks the location of the signature
from the end of a zip archive. And a boundary check is missing where
'signature_start' should be within the EOCD comment field. This causes
problems when sideloading a malicious package. Also add a corresponding
test.

Bug: 31914369
Test: Verification fails correctly when sideloading recovery_test.zip on
angler.

Change-Id: I6ea96bf04dac5d8d4d6719e678d504f957b4d5c1
(cherry-picked from f69e6a9475)
 2016-12-16 16:24:09 -08:00
Matt Sarett 300af0779d resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad 
am: aa02888e55

* commit 'aa02888e55147ec78fa5636a87e2447bda136d68':
  DO NOT MERGE Use updated libpng API

Change-Id: I10705dd579623e4b208093cfc4839aad496081c8
 2016-05-19 23:17:52 +00:00
Matt Sarett aa02888e55 resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 
am: 8a1d4e97ad

* commit '8a1d4e97ad3b748a06db618f9d7ccf5114ea16d0':
  DO NOT MERGE Use updated libpng API

Change-Id: I09e8917976c05beec8bf881140539948c323ce58
 2016-05-19 23:14:39 +00:00
Matt Sarett 8a1d4e97ad resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 
am: ca45737e27

* commit 'ca45737e272aeefd657451a6faaa088d1903378c':
  DO NOT MERGE Use updated libpng API

Change-Id: Ia9c36583c9d60d01fec7ee9aefc973dabb1c07d3
 2016-05-19 23:12:10 +00:00
Matt Sarett ca45737e27 resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e 
am: 1f814d7630

* commit '1f814d7630c56cc9e825ed411e068414c97acb6c':
  DO NOT MERGE Use updated libpng API

Change-Id: Ib381e8ccefe9181911a2144d7255ecadefb42b5c
 2016-05-19 23:08:54 +00:00
Matt Sarett 1f814d7630 resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f 
am: 36acff7d7e

* commit '36acff7d7e88549bbeab6a08488ab48596d7fbc5':
  DO NOT MERGE Use updated libpng API

Change-Id: I7f01d932235ef69640ed4859d0e62344b3b774de
 2016-05-19 23:06:06 +00:00
Matt Sarett 36acff7d7e resolve merge conflicts of 86a28d0 to klp-modular-dev 
am: a5bc59620f

* commit 'a5bc59620fd43c99621eb98ac84cbeea867d0c93':
  DO NOT MERGE Use updated libpng API

Change-Id: I3d8d27b08fd1fd89c6b8d9c39b883a45aecb83ce
 2016-05-19 23:03:35 +00:00
Matt Sarett a5bc59620f resolve merge conflicts of 86a28d0 to klp-modular-dev 
Change-Id: Ic0b085e008155da3718dab8fd5a36be6d4059aee
 2016-05-19 15:47:25 -04:00
Matt Sarett 86a28d0aaf DO NOT MERGE Use updated libpng API 
am: 839b4e592a

* commit '839b4e592a7c81bdebe08fae4eef6e909c89acd6':
  DO NOT MERGE Use updated libpng API

Change-Id: I7bbece70a4129554d953fd22c71527b2ca11262e
 2016-05-19 19:26:12 +00:00
Matt Sarett 839b4e592a DO NOT MERGE Use updated libpng API 
BUG:23265085
Change-Id: Ibc521fae11dad22283d8469329326ef79525b414
 2016-05-17 20:28:54 +00:00
Yabin Cui 682d691052 Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29 am: 877dcba47a am: f4ee1720f3 
am: cae056f219

* commit 'cae056f21908173bcf2fa9a1724e46f16abb3258':
  Fix integer overflows in recovery procedure.
 2016-02-23 06:47:37 +00:00
Yabin Cui cae056f219 Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29 am: 877dcba47a 
am: f4ee1720f3

* commit 'f4ee1720f33a01518f79a2bf8df4664dab3564d4':
  Fix integer overflows in recovery procedure.
 2016-02-23 06:44:46 +00:00
Yabin Cui f4ee1720f3 Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29 
am: 877dcba47a

* commit '877dcba47ac311aa65b27e42b3625bcb58d84e47':
  Fix integer overflows in recovery procedure.
 2016-02-23 06:42:07 +00:00
Yabin Cui 877dcba47a Fix integer overflows in recovery procedure. am: 1273956e69 
am: 5978a71d29

* commit '5978a71d2954c7df02cbd0c51582ce4063346f77':
  Fix integer overflows in recovery procedure.
 2016-02-23 06:35:46 +00:00
Yabin Cui 5978a71d29 Fix integer overflows in recovery procedure. 
am: 1273956e69

* commit '1273956e69a7d1d5b636f269050b446e0ced3f9b':
  Fix integer overflows in recovery procedure.
 2016-02-23 06:33:20 +00:00
Yabin Cui 1273956e69 Fix integer overflows in recovery procedure. 
Bug: 26960931
Change-Id: Ieae45caccfb4728fcf514f0d920976585d8e6caf
(cherry picked from commit 4f2df162c6)
 2016-02-22 17:42:02 -08:00
Yabin Cui 4f2df162c6 Fix integer overflows in recovery procedure. 
Bug: 26960931
Change-Id: Ieae45caccfb4728fcf514f0d920976585d8e6caf
(cherry picked from commit a029c9a458)
 2016-02-22 11:02:08 -08:00
Narayan Kamath 838768ca57 am 15da523e: am 3c7f655b: (-s ours) am 0e804d54: am d396b9db: am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE 
* commit '15da523e5fe7dbdc3a8d49c809042bc760081920':
  Track usage of Vector / SortedVector from libutils DO NOT MERGE
 2015-09-16 23:06:09 +00:00
Narayan Kamath 15da523e5f am 3c7f655b: (-s ours) am 0e804d54: am d396b9db: am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE 
* commit '3c7f655bf0382776617d3c98293e28d9967c9a96':
  Track usage of Vector / SortedVector from libutils DO NOT MERGE
 2015-09-16 22:57:58 +00:00
Narayan Kamath 3c7f655bf0 am 0e804d54: am d396b9db: am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE 
* commit '0e804d542a2c151d254cad0d8581d9709a394a9a':
  Track usage of Vector / SortedVector from libutils DO NOT MERGE
 2015-09-16 22:48:24 +00:00
Narayan Kamath 0e804d542a am d396b9db: am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE 
* commit 'd396b9dbd99924f7c8687227b22220a87c85d9c7':
  Track usage of Vector / SortedVector from libutils DO NOT MERGE
 2015-09-16 22:33:14 +00:00
Narayan Kamath d396b9dbd9 am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE 
* commit '710b6bb9d7d36ce16453850efc3112016a77e9ff':
  Track usage of Vector / SortedVector from libutils DO NOT MERGE
 2015-09-12 06:30:01 +00:00
Narayan Kamath 710b6bb9d7 am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE 
* commit 'ec4b58ad8a21b511bf6b136792bb924eb6e9e299':
  Track usage of Vector / SortedVector from libutils DO NOT MERGE
 2015-09-10 20:55:33 +00:00
Narayan Kamath ec4b58ad8a am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE 
* commit 'ec63d564a86ad5b30f75aa307b4bd271f6a96a56':
  Track usage of Vector / SortedVector from libutils DO NOT MERGE
 2015-09-10 18:26:12 +00:00
Narayan Kamath ec63d564a8 Track usage of Vector / SortedVector from libutils DO NOT MERGE 
bug: 22953624
Change-Id: Ifcc17e39433ac91ca41da5d336fb3006dfbb65a8
 2015-09-09 10:42:10 +00:00
Tao Bao 5aa3ce3aaa am be19dce8: udpater: Call fsync() after rename(). 
* commit 'be19dce86ce7d4a83f1cfcd11db393f8be8f4397':
  udpater: Call fsync() after rename().
 2015-08-04 21:01:11 +00:00
Tao Bao be19dce86c udpater: Call fsync() after rename(). 
We need to ensure the renamed filename reaches the underlying storage.

Bug: 22840552
Change-Id: I824b6e9d8a9c5966035be7b42a73678d07376342
(cherry picked from commit dc3922622a)
 2015-08-04 11:28:12 -07:00
Tao Bao 6e9dda70cb uncrypt: Support file level encryption. 
Bug: 22534003
Change-Id: Iaf42a6e5b40cfef904de66e212ae8b77b2953ef7
 2015-07-16 20:04:39 -07:00
Paul Lawrence 90c75b0beb Change init sequence to support file level encryption 
File level encryption must get the key between mounting userdata and
calling post_fs_data when the directories are created. This requires
access to keymaster, which in turn is found from a system property.

Split property loaded into system and data, and load in right order.

Bug: 22233063
Change-Id: I409c12e3f4a8cef474eb48818e96760fe292cc49
 2015-07-07 13:26:17 -07:00
Paul Lawrence 10cf0942a7 Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev 2015-07-07 17:29:02 +00:00
Paul Lawrence 392879eec0 Revert "Change init sequence to support file level encryption" 
This reverts commit 98c1a3de23.

Change-Id: I524060418de18f97c3865ebc4435f501015e92ee
 2015-07-07 17:05:39 +00:00
Paul Lawrence d6b2b65dc4 Merge "Change init sequence to support file level encryption" into mnc-dev 2015-07-06 19:33:28 +00:00
Paul Lawrence 98c1a3de23 Change init sequence to support file level encryption 
File level encryption must get the key between mounting userdata and
calling post_fs_data when the directories are created. This requires
access to keymaster, which in turn is found from a system property.

Split property loaded into system and data, and load in right order.

Bug: 22233063
Change-Id: I409c12e3f4a8cef474eb48818e96760fe292cc49
 2015-07-06 10:44:33 -07:00
Mohamad Ayyash 501282a42d am b4b41daa: am 0ddfa329: Allow mounting squashfs partitions 
* commit 'b4b41daa2ddbe8849dacdeeafd240e2a265cb594':
  Allow mounting squashfs partitions
 2015-07-02 00:47:06 +00:00
Mohamad Ayyash b4b41daa2d am 0ddfa329: Allow mounting squashfs partitions 
* commit '0ddfa329acb1e6464fe5d66b58257013abf21116':
  Allow mounting squashfs partitions
 2015-07-02 00:30:57 +00:00
Vincent Palatin 8409b08888 Merge "Add drm support to minui" into mnc-dev 2015-07-01 23:24:55 +00:00
Stéphane Marchesin 1a92c4458d Add drm support to minui 
Bug: 22231636

Change-Id: I103c8e906b7dd9862b7bb89d8642268e9a3006b4
Signed-off-by: Stéphane Marchesin <marcheu@chromium.org>
 2015-07-01 15:27:48 -07:00
Mohamad Ayyash 0ddfa329ac Allow mounting squashfs partitions 
Change-Id: Ic023eb7d8a11e2a65172a23ff39fa902ef566183
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
 2015-07-01 10:13:16 -07:00