tequilaOS/platform_system_security
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1981 commits 1 branch 0 tags 12 MiB
Commit graph

1981 commits

This branch
This branch
All branches
Author SHA1 Message Date
Wenhao Wang
523a912137 Merge "Check correct err variable on wifi keystore HAL" 
am: 81f35573c7

Change-Id: I9e2644beb1f421e04c59f123636943dded81ae1b
 2019-08-22 15:04:05 -07:00
Wenhao Wang
81f35573c7 Merge "Check correct err variable on wifi keystore HAL" 2019-08-22 21:38:50 +00:00
Wenhao Wang
0ff2568e38 Check correct err variable on wifi keystore HAL 
Test: rebuild source code and flash it to phone (Pixel 3a), which works.
Change-Id: I152470dd9f6f5a8a7793eefd0cfb2f8d8d483205
 2019-08-21 09:43:39 -07:00
David Benjamin
b2eee45d4b Merge "Replace custom BoringSSL scopers with bssl::UniquePtr." am: 147f3df5c3 am: e2d3e0b584 am: c3704f0d81 
am: 884e1ed416

Change-Id: I38caf1576580dd6ee5874e3f9abec61a8ad0d660
 2019-08-19 17:33:01 -07:00
David Benjamin
884e1ed416 Merge "Replace custom BoringSSL scopers with bssl::UniquePtr." am: 147f3df5c3 am: e2d3e0b584 
am: c3704f0d81

Change-Id: I7941c044a92d6d36dcf22a67b15477e80b0cda38
 2019-08-19 17:24:30 -07:00
David Benjamin
c3704f0d81 Merge "Replace custom BoringSSL scopers with bssl::UniquePtr." am: 147f3df5c3 
am: e2d3e0b584

Change-Id: Idb4fd1b03f341eff170a7df1ed6531429fff3de7
 2019-08-19 17:11:04 -07:00
David Benjamin
e2d3e0b584 Merge "Replace custom BoringSSL scopers with bssl::UniquePtr." 
am: 147f3df5c3

Change-Id: Ieb0bb08b000fe2eada74c8884fc4845beadc9d0f
 2019-08-19 16:54:11 -07:00
Treehugger Robot
147f3df5c3 Merge "Replace custom BoringSSL scopers with bssl::UniquePtr." 2019-08-19 23:33:54 +00:00
David Benjamin
dc4d142303 Replace custom BoringSSL scopers with bssl::UniquePtr. 
BoringSSL already provides C++ scopers.

Test: mma
Change-Id: I34d4ec36fc0b51750560be0886768a83fe69fbf5
 2019-08-08 13:13:54 -04:00
Janis Danisevskis
c4e8531261 Merge "Keystore should be developed in AOSP." am: 52f822d6ae am: 277e536d5c am: a89d28810c 
am: aed0682671

Change-Id: I6d57886141979f9ae2bed7c86cb6a762df726a00
 2019-07-31 16:25:23 -07:00
Janis Danisevskis
aed0682671 Merge "Keystore should be developed in AOSP." am: 52f822d6ae am: 277e536d5c 
am: a89d28810c

Change-Id: Ia3a19b9ebe49f401a79ccd612317e842523d8b6a
 2019-07-31 16:06:11 -07:00
Janis Danisevskis
a89d28810c Merge "Keystore should be developed in AOSP." am: 52f822d6ae 
am: 277e536d5c

Change-Id: I07310f24c50e9b5f1504f5165413c9b0fb35bb68
 2019-07-31 15:44:34 -07:00
Janis Danisevskis
277e536d5c Merge "Keystore should be developed in AOSP." 
am: 52f822d6ae

Change-Id: I5c728903e615650946940d39f9bf3b2a7033b11d
 2019-07-31 15:19:50 -07:00
Treehugger Robot
52f822d6ae Merge "Keystore should be developed in AOSP." 2019-07-31 21:14:43 +00:00
Janis Danisevskis
d1d16c0977 Merge "Fixed unchecked key blob access in attestKey" am: 4e3f697233 am: 4eea9764a4 am: f5b7853bdb 
am: acd9e83f1a

Change-Id: I3b169d23d7bbebcc309a820306d1ecbc4a5693f0
 2019-07-31 13:39:09 -07:00
Janis Danisevskis
acd9e83f1a Merge "Fixed unchecked key blob access in attestKey" am: 4e3f697233 am: 4eea9764a4 
am: f5b7853bdb

Change-Id: I0272cb5b1b18bd41953c0da1561b59a0bda93ad5
 2019-07-31 13:15:42 -07:00
Janis Danisevskis
f5b7853bdb Merge "Fixed unchecked key blob access in attestKey" am: 4e3f697233 
am: 4eea9764a4

Change-Id: Ifb92bf2b45b14d182c330e2ffa377bf52cadbdf9
 2019-07-31 12:45:11 -07:00
Janis Danisevskis
4eea9764a4 Merge "Fixed unchecked key blob access in attestKey" 
am: 4e3f697233

Change-Id: If4a382525807b5d7663682f1a927b0d9c2607441
 2019-07-31 12:32:36 -07:00
Treehugger Robot
4e3f697233 Merge "Fixed unchecked key blob access in attestKey" 2019-07-31 18:54:32 +00:00
Janis Danisevskis
791956e492 Keystore should be developed in AOSP. 
Test: N/A
Bug: 118491737
Change-Id: I0a25be18e82172ff7cbceaf8d543fbdd27f2d8df
 2019-07-31 10:50:04 -07:00
Janis Danisevskis
9dff56c52b Fixed unchecked key blob access in attestKey 
In attestKey we did not check a return value after retrieving a key
blob. This results in a segfault if an attestation is requested on a non
existent or corrupted key.

Bug: 135907940
Merged-In: I1e84d334bb93ac878b63e15a59c35631f9e6e397
Change-Id: I1e84d334bb93ac878b63e15a59c35631f9e6e397
 2019-07-31 10:21:27 -07:00
Xin Li
fc9289ad6f [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" am: 9f22467a12 -s ours am: f955b4ac05 -s ours 
am: 4066752e95

Change-Id: I864e18def09b3795ba298c721f9b2003c5e3a4c7
 2019-07-10 23:26:24 -07:00
Xin Li
0f97ae667f [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: fefc1997a5 -s ours am: 4058a5ac0d -s ours 
am: dc3f596231

Change-Id: Id91a04b9fc5605380c94729e413f108c6b0afa79
 2019-07-10 22:53:24 -07:00
Xin Li
4066752e95 [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" am: 9f22467a12 -s ours 
am: f955b4ac05 -s ours
am skip reason: subject contains skip directive

Change-Id: If296e8a60cbcc618b37b2cfd170f00bd6d30b8cc
 2019-07-10 22:45:48 -07:00
Xin Li
dc3f596231 [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: fefc1997a5 -s ours 
am: 4058a5ac0d -s ours
am skip reason: subject contains skip directive

Change-Id: Ibc352fcd9901451c331cb197a89737d51b55871e
 2019-07-10 22:19:34 -07:00
Xin Li
f955b4ac05 [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" 
am: 9f22467a12 -s ours
am skip reason: subject contains skip directive

Change-Id: Icec27349c6e80c14c69a566e0ebf2f7c45526fd9
 2019-07-10 21:53:44 -07:00
Xin Li
4058a5ac0d [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master 
am: fefc1997a5 -s ours
am skip reason: subject contains skip directive

Change-Id: I7965419205f6a448599049ea95f3397ff8e25d8e
 2019-07-10 21:23:01 -07:00
Treehugger Robot
9f22467a12 Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" 2019-07-11 03:52:58 +00:00
Xin Li
fefc1997a5 DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master 
Bug: 136196576
Change-Id: I63f1465fcd85a1cd09d850bd7882b950cee2012b
 2019-07-09 17:18:51 -07:00
android-build-team Robot
de927dd8d5 Snap for 5622519 from c77e4768f5 to pi-platform-release 
Change-Id: Ieaa8427c189fe9429c9f4d5ff71dd1e03215a0eb
 2019-07-08 23:30:32 +00:00
android-build-team Robot
4a5cb0be76 Snap for 5600800 from 3a827b0a88 to pi-platform-release 
Change-Id: I507fd16c59236a9fd0f69db82876c3cb4f623f4c
 2019-07-08 18:21:48 +00:00
Xin Li
fd28a6b5d4 DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master 
am: 76206993e4

Change-Id: Ia264e41ab1d2693a51988e9bd1be7c0d0bbb85ab
 2019-07-02 13:46:27 -07:00
Xin Li
76206993e4 DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master 
Bug: 134405016
Change-Id: I7b2848c7eff8a193adc998d4d2dfea0ec05b7b73
 2019-07-01 21:00:30 +00:00
Steven Moreland
d7c7d8228e Merge "listByInterface -> listManifestByInterface" am: 40983e6ab7 am: 2fa525797f 
am: 173d152ddf

Change-Id: I80b14e31d6a110e82d9a45d189aeecd1f3ec8e42
 2019-05-17 16:11:01 -07:00
Steven Moreland
173d152ddf Merge "listByInterface -> listManifestByInterface" am: 40983e6ab7 
am: 2fa525797f

Change-Id: I0b46cd63ec70f6c7eea7bf3ac72c9f1a4fa70fa7
 2019-05-17 15:19:02 -07:00
Steven Moreland
2fa525797f Merge "listByInterface -> listManifestByInterface" 
am: 40983e6ab7

Change-Id: I0d9773723b086130e99c2eb7708ba70a841e5cdd
 2019-05-17 14:35:44 -07:00
Treehugger Robot
40983e6ab7 Merge "listByInterface -> listManifestByInterface" 2019-05-17 20:55:42 +00:00
Xin Li
5e04938c0f [automerger skipped] DO NOT MERGE - Skip pi-platform-release (PPRL.190505.001) in stage-aosp-master am: 9017c9f0c5 -s ours 
am: 7c79e5e2fa

Change-Id: I1a695b68e2a14d0139057bf2e641c9a55457ae16
 2019-05-16 02:55:25 -07:00
Xin Li
7c79e5e2fa [automerger skipped] DO NOT MERGE - Skip pi-platform-release (PPRL.190505.001) in stage-aosp-master 
am: 9017c9f0c5 -s ours
am skip reason: subject contains skip directive

Change-Id: I0ef0eebbb25a61634d13813e511edfb582cb74a9
 2019-05-15 17:45:00 -07:00
android-build-team Robot
c77e4768f5 Merge cherrypicks of [7513497, 7518418, 7517880, 7517881, 7517882, 7517883, 7517884, 7517885, 7517886, 7517956, 7517957, 7518438, 7518102, 7517887, 7518141, 7518142, 7518143, 7518144, 7517888, 7517889, 7517890, 7517891, 7518439, 7518440, 7518441, 7518442, 7518443, 7518029, 7518104, 7517892, 7517893, 7518061, 7518444, 7517894, 7517895, 7518030, 7518031, 7518445, 7517896, 7517969, 7517897, 7518105, 7518145, 7518146, 7518446] into pi-qpr3-b-release 
Change-Id: I9ac6516f25ce3a313fe7e888f9a0544316d28275
 2019-05-15 05:36:18 +00:00
Janis Danisevskis
3cdf309d9d Fix keystore wifi concurrency issue. 
Keystore was conceptually single threaded. Even with the introduction of
Keymaster workers it was always assumed that the service dispatcher
thread was single threaded. The wifi keystore service, however, calls
into the keystore service concurrently.

This patch adds a lock around all keystore service entry points to make
sure all dispatcher executions are serialised despite being called from
both the binder and hwbinder service thread.

Bug: 128810613
Bug: 129145334
Bug: 128774635
Bug: 130045583
Bug: 131622568
Test: Regressions tested with Keystore CTS test suite.
Merged-In: I8c5602d2c2cb1dd9423df713037e99b247cee71f
Change-Id: I8c5602d2c2cb1dd9423df713037e99b247cee71f
(cherry picked from commit 4ea6d7a447)
 2019-05-15 05:35:01 +00:00
Xin Li
9017c9f0c5 DO NOT MERGE - Skip pi-platform-release (PPRL.190505.001) in stage-aosp-master 
Bug: 132622481
Change-Id: Idfa9f62edf772ef641d5b6832c150451b174904e
 2019-05-14 12:13:17 -07:00
android-build-team Robot
3a827b0a88 Merge cherrypicks of [7496339, 7495273, 7495624, 7496340, 7496341, 7496342, 7496343, 7495658, 7494789, 7494790, 7494791, 7496344, 7496345, 7496346, 7496347, 7496574, 7496348, 7496575, 7496576, 7496260, 7496349, 7496350, 7496440, 7496577, 7496578, 7496261, 7495625, 7496442, 7496351] into pi-qpr3-release 
Change-Id: I43c7060e9f4c6d51851bf394418734b09c8c6403
 2019-05-14 05:00:02 +00:00
Janis Danisevskis
12370c8b5e Fix keystore wifi concurrency issue. 
Keystore was conceptually single threaded. Even with the introduction of
Keymaster workers it was always assumed that the service dispatcher
thread was single threaded. The wifi keystore service, however, calls
into the keystore service concurrently.

This patch adds a lock around all keystore service entry points to make
sure all dispatcher executions are serialised despite being called from
both the binder and hwbinder service thread.

Bug: 128810613
Bug: 129145334
Bug: 128774635
Bug: 130045583
Bug: 131622568
Test: Regressions tested with Keystore CTS test suite.
Merged-In: I8c5602d2c2cb1dd9423df713037e99b247cee71f
Change-Id: I8c5602d2c2cb1dd9423df713037e99b247cee71f
(cherry picked from commit 4ea6d7a447)
 2019-05-14 04:58:50 +00:00
Steven Moreland
13e5a2cc5c listByInterface -> listManifestByInterface 
This does two things:
- makes sure that HALs configured as lazy HALs will be retrieved
- will detect bad manifest entries earlier

Bug: 131703193
Test: boot
Change-Id: I6a5290a3eb8b48cca2206d3e08897b0aca0e69b3
 2019-05-13 12:56:25 -07:00
Janis Danisevskis
51d7a88d86 [automerger skipped] Fix keystore wifi concurrency issue. am: 1d898d107c -s ours am: e583877904 -s ours am: 7ba3854d5d -s ours am: 550cf87b04 -s ours 
am: 48a4d0f64a -s ours
am skip reason: change_id I8c5602d2c2cb1dd9423df713037e99b247cee71f with SHA1 1849841b48 is in history

Change-Id: I91c8938e31a6db597e38c206e5de8c34fb2e1a5a
 2019-05-08 17:36:02 -07:00
Janis Danisevskis
7d817b836f [automerger skipped] Fix keystore wifi concurrency issue. am: 1d898d107c -s ours am: e583877904 -s ours am: 7ba3854d5d -s ours am: 550cf87b04 -s ours 
am: 48a4d0f64a -s ours
am skip reason: change_id I8c5602d2c2cb1dd9423df713037e99b247cee71f with SHA1 1849841b48 is in history

Change-Id: I8f556af5b0a5d302bc08ad424ea1f3ef9aac359a
 2019-05-08 17:32:35 -07:00
Janis Danisevskis
48a4d0f64a [automerger skipped] Fix keystore wifi concurrency issue. am: 1d898d107c -s ours am: e583877904 -s ours am: 7ba3854d5d -s ours 
am: 550cf87b04 -s ours
am skip reason: change_id I8c5602d2c2cb1dd9423df713037e99b247cee71f with SHA1 1849841b48 is in history

Change-Id: I64cf5fc78ce7d4c9545180715f38ddbeb49cb53d
 2019-05-08 16:48:03 -07:00
Janis Danisevskis
550cf87b04 [automerger skipped] Fix keystore wifi concurrency issue. am: 1d898d107c -s ours am: e583877904 -s ours 
am: 7ba3854d5d -s ours
am skip reason: change_id I8c5602d2c2cb1dd9423df713037e99b247cee71f with SHA1 1849841b48 is in history

Change-Id: I01d77417e1400b7c7d4547920478c052826dce27
 2019-05-08 16:17:46 -07:00
Janis Danisevskis
7ba3854d5d [automerger skipped] Fix keystore wifi concurrency issue. am: 1d898d107c -s ours 
am: e583877904 -s ours
am skip reason: change_id I8c5602d2c2cb1dd9423df713037e99b247cee71f with SHA1 1849841b48 is in history

Change-Id: I64158f8b9ca9c7ec1e67ae7a9f495f2857965a92
 2019-05-08 16:00:39 -07:00