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

2083 commits

This branch
This branch
All branches
Author SHA1 Message Date
Xin Li
31451a1742 [automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: 783cebfdbc -s ours 
am skip reason: subject contains skip directive

Change-Id: I4fa0e742ef50dbb885b5ea5486f6decb903eb3e6
 2020-03-20 18:32:02 +00:00
Xin Li
783cebfdbc DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master 
Bug: 151763422
Change-Id: I8bbb12db6494ceb2925a0126f72f03b04b6f20eb
 2020-03-19 10:10:44 -07:00
Automerger Merge Worker
adfdb18872 [automerger skipped] Add permission check on onKeyguardVisibilityChanged am: 3cac4c660a -s ours am: 092ed74fbd -s ours am: 7033e889be -s ours am: fc96b70b56 -s ours 
am skip reason: Change-Id Idb8a200dc2963e1085e9fddd0c565c5172465e65 with SHA-1 ed9a255fc6 is in history

Change-Id: I6e5bfc719de7b22480bd8b4e2fcd39babeb28af7
 2020-03-12 01:27:13 +00:00
Automerger Merge Worker
35cc0d0309 [automerger skipped] Add permission check on onKeyguardVisibilityChanged am: 3cac4c660a -s ours am: 092ed74fbd -s ours am: 7033e889be -s ours 
am skip reason: Change-Id Idb8a200dc2963e1085e9fddd0c565c5172465e65 with SHA-1 ed9a255fc6 is in history

Change-Id: I2d38d3f8a335fd20e96d91170bb53cd8562e8605
 2020-03-12 01:15:03 +00:00
Automerger Merge Worker
fc96b70b56 [automerger skipped] Add permission check on onKeyguardVisibilityChanged am: 3cac4c660a -s ours am: 092ed74fbd -s ours am: 7033e889be -s ours 
am skip reason: Change-Id Idb8a200dc2963e1085e9fddd0c565c5172465e65 with SHA-1 ed9a255fc6 is in history

Change-Id: I454e27a7acbfdd5f43608df0f35871079d4cb3ac
 2020-03-12 01:14:43 +00:00
Automerger Merge Worker
7033e889be [automerger skipped] Add permission check on onKeyguardVisibilityChanged am: 3cac4c660a -s ours am: 092ed74fbd -s ours 
am skip reason: Change-Id Idb8a200dc2963e1085e9fddd0c565c5172465e65 with SHA-1 ed9a255fc6 is in history

Change-Id: Iba53a6f79c445039c711e1b4683714183dda14f6
 2020-03-12 00:55:55 +00:00
Automerger Merge Worker
092ed74fbd [automerger skipped] Add permission check on onKeyguardVisibilityChanged am: 3cac4c660a -s ours 
am skip reason: skipped by user jdanis

Change-Id: I404d35d60df4eb7630ded0759086750aaccfa85d
 2020-03-12 00:40:04 +00:00
Automerger Merge Worker
18cf3bd23d [automerger skipped] Add permission check on onKeyguardVisibilityChanged am: ed9a255fc6 -s ours am: 6b4ea906b3 -s ours 
am skip reason: Change-Id Idb8a200dc2963e1085e9fddd0c565c5172465e65 with SHA-1 86022f2ab8 is in history

Change-Id: I3049e82171c69c2b4d23a157218b989e4d9c59c4
 2020-03-12 00:39:59 +00:00
Automerger Merge Worker
b7a3bc85b3 [automerger skipped] Add permission check on onKeyguardVisibilityChanged am: aad9178b57 -s ours 
am skip reason: skipped by user jdanis

Change-Id: Id71ef84fa6c9f0c0112639ff21206921f8bbf660
 2020-03-12 00:39:43 +00:00
Automerger Merge Worker
669ee76d63 [automerger skipped] Add permission check on onKeyguardVisibilityChanged am: ed9a255fc6 -s ours am: 6b4ea906b3 -s ours am: 53b77ad226 -s ours 
am skip reason: Change-Id Idb8a200dc2963e1085e9fddd0c565c5172465e65 with SHA-1 aad9178b57 is in history

Change-Id: Ia94efe818f1041dbe040e955e9728ff187fdec7c
 2020-03-11 23:50:02 +00:00
Automerger Merge Worker
53b77ad226 [automerger skipped] Add permission check on onKeyguardVisibilityChanged am: ed9a255fc6 -s ours am: 6b4ea906b3 -s ours 
am skip reason: Change-Id Idb8a200dc2963e1085e9fddd0c565c5172465e65 with SHA-1 aad9178b57 is in history

Change-Id: If0eb9aa3ac043734ec4006975b59bba1adb21ed8
 2020-03-11 23:35:17 +00:00
Automerger Merge Worker
6b4ea906b3 [automerger skipped] Add permission check on onKeyguardVisibilityChanged am: ed9a255fc6 -s ours 
am skip reason: Change-Id Idb8a200dc2963e1085e9fddd0c565c5172465e65 with SHA-1 aad9178b57 is in history

Change-Id: I27da261e0838c804115fb72ba02495619c5cc824
 2020-03-11 23:22:43 +00:00
Janis Danisevskis
a6eaaf427b Merge "Add permission check on onKeyguardVisibilityChanged" into qt-qpr1-dev-plus-aosp 2020-03-11 23:06:20 +00:00
Automerger Merge Worker
f9b879cb7b [automerger skipped] Add permission check on onKeyguardVisibilityChanged am: aad9178b57 -s ours am: 4bfcb32809 -s ours 
am skip reason: Change-Id Idb8a200dc2963e1085e9fddd0c565c5172465e65 with SHA-1 21f452c372 is in history

Change-Id: I7d4ad1240bc9210cf50fca27f96668ff3f83d912
 2020-03-11 22:50:45 +00:00
Automerger Merge Worker
4bfcb32809 [automerger skipped] Add permission check on onKeyguardVisibilityChanged am: aad9178b57 -s ours 
am skip reason: Change-Id Idb8a200dc2963e1085e9fddd0c565c5172465e65 with SHA-1 21f452c372 is in history

Change-Id: I033f6086e462c4324ad64e95559a1c4bce692235
 2020-03-11 22:38:05 +00:00
Automerger Merge Worker
bef60fca96 [automerger skipped] Merge "credstore: signingKeyBlob was moved from finishRetrieval() to startRetrieval()." into rvc-dev am: ff7e85efda -s ours 
am skip reason: Change-Id If2479a10f80fba748591c30aa7b8662e1063787e with SHA-1 55975ecbcf is in history

Change-Id: Ib79f9e2b38241e19ccb631297b4e53bed060001c
 2020-03-09 22:14:51 +00:00
TreeHugger Robot
ff7e85efda Merge "credstore: signingKeyBlob was moved from finishRetrieval() to startRetrieval()." into rvc-dev 2020-03-09 22:07:45 +00:00
Automerger Merge Worker
9f4ddf49d6 [automerger skipped] Revert "Make keystore a core service" am: 44106186ae -s ours 
am skip reason: Change-Id I4fe3c6aeecf960377671d11be0a4dc9fa60dfb18 with SHA-1 19f1caefba is in history

Change-Id: Ia9281e6b5c18f98fa153e51632634d685068d6d2
 2020-03-09 21:48:36 +00:00
Automerger Merge Worker
c597b58aaa [automerger skipped] Stop reading fs-verity certificate from keystore am: d8f95847b3 -s ours 
am skip reason: Change-Id I3bc342a7df0c47c02494ef6fdae24e7ad00a8507 with SHA-1 2bcd5376ec is in history

Change-Id: I7c768bafd66bfb27db2dc91cd711f9369e671021
 2020-03-09 21:48:35 +00:00
Automerger Merge Worker
3196336ea7 Merge "Stop reading fs-verity certificate from keystore" am: 21b6c38fa0 am: d26b301d8b 
Change-Id: Ieddef0ad1caaea59acc22f3d8b2566fffd031daf
 2020-03-09 20:32:00 +00:00
Automerger Merge Worker
dfa3fcb3ae Merge "Stop reading fs-verity certificate from keystore" am: 21b6c38fa0 am: d26b301d8b 
Change-Id: I119a34e7c9365862ee37687222e8ecfbe20df719
 2020-03-09 20:31:55 +00:00
Automerger Merge Worker
00142e2ee2 Merge "Revert "Make keystore a core service"" am: 4b6865baa0 am: 181826633e 
Change-Id: Ie3c1209012b787c7364843c8b00b13de5b61746a
 2020-03-09 20:31:42 +00:00
Automerger Merge Worker
97cb30027a Merge "Revert "Make keystore a core service"" am: 4b6865baa0 am: 181826633e 
Change-Id: Ia3defe8f38353b561d8719d5b3b40373ad1e3cd9
 2020-03-09 20:31:40 +00:00
Automerger Merge Worker
d26b301d8b Merge "Stop reading fs-verity certificate from keystore" am: 21b6c38fa0 
Change-Id: I1225c319b281b6bdc63bac44d55fbf06e3943b9f
 2020-03-09 20:15:54 +00:00
Automerger Merge Worker
181826633e Merge "Revert "Make keystore a core service"" am: 4b6865baa0 
Change-Id: Id6a961dc1bfec6083c9f749984ca1b0c213126eb
 2020-03-09 20:15:24 +00:00
Victor Hsieh
44106186ae Revert "Make keystore a core service" 
This reverts commit 7fd8e853e9.

Test: still see keystore process running
Bug: 112038744
Bug: 150267620
Change-Id: I4fe3c6aeecf960377671d11be0a4dc9fa60dfb18
Merged-In: I4fe3c6aeecf960377671d11be0a4dc9fa60dfb18
 2020-03-09 12:44:37 -07:00
Victor Hsieh
d8f95847b3 Stop reading fs-verity certificate from keystore 
We punting support for extra certificate to S.

Test: boot
Bug: 112038744
Change-Id: I3bc342a7df0c47c02494ef6fdae24e7ad00a8507
Merged-In: I3bc342a7df0c47c02494ef6fdae24e7ad00a8507
 2020-03-09 12:43:52 -07:00
David Zeuthen
f0ffada9d0 credstore: signingKeyBlob was moved from finishRetrieval() to startRetrieval(). 
The implementation of the Identity Credential TA in constrained
environments may need to incrementally update the HMAC-SHA256 of
DeviceAuthencation CBOR to avoid keeping the entire CBOR structure in
memory. To do this they need to calculate the derived key before
starting to build the CBOR so they need access to the signingKey
earlier on. Update credstore to pass the signingKey earlier.

Bug: 150390415
Test: atest android.security.identity.cts
Test: VtsHalIdentityTargetTest
Merged-In: If2479a10f80fba748591c30aa7b8662e1063787e
Change-Id: I34879bec73b88b4ba647d69abcaab36bbb482dbc
 2020-03-09 15:42:44 -04:00
Treehugger Robot
21b6c38fa0 Merge "Stop reading fs-verity certificate from keystore" 2020-03-09 19:42:41 +00:00
Treehugger Robot
4b6865baa0 Merge "Revert "Make keystore a core service"" 2020-03-09 19:41:43 +00:00
Automerger Merge Worker
edb3cfac3e Merge "credstore: signingKeyBlob was moved from finishRetrieval() to startRetrieval()." am: 37d5b94d14 am: 567cff88a1 
Change-Id: I097ab43d8c6e14a625d488fcaa48183fa1a27453
 2020-02-28 15:33:41 +00:00
Automerger Merge Worker
cc7ccd658d Merge "credstore: signingKeyBlob was moved from finishRetrieval() to startRetrieval()." am: 37d5b94d14 am: 567cff88a1 
Change-Id: I637800d62e8443d9baafaa28e0b98885d49a5616
 2020-02-28 15:33:31 +00:00
Automerger Merge Worker
567cff88a1 Merge "credstore: signingKeyBlob was moved from finishRetrieval() to startRetrieval()." am: 37d5b94d14 
Change-Id: I955a93741dd2eea92e2d13822b6d982029ea7355
 2020-02-28 15:22:35 +00:00
Treehugger Robot
37d5b94d14 Merge "credstore: signingKeyBlob was moved from finishRetrieval() to startRetrieval()." 2020-02-28 15:08:41 +00:00
David Zeuthen
55975ecbcf credstore: signingKeyBlob was moved from finishRetrieval() to startRetrieval(). 
The implementation of the Identity Credential TA in constrained
environments may need to incrementally update the HMAC-SHA256 of
DeviceAuthencation CBOR to avoid keeping the entire CBOR structure in
memory. To do this they need to calculate the derived key before
starting to build the CBOR so they need access to the signingKey
earlier on. Update credstore to pass the signingKey earlier.

Bug: 150390415
Test: atest android.security.identity.cts
Test: VtsHalIdentityTargetTest
Change-Id: If2479a10f80fba748591c30aa7b8662e1063787e
 2020-02-27 14:32:55 -05:00
Victor Hsieh
2bcd5376ec Stop reading fs-verity certificate from keystore 
We punting support for extra certificate to S.

Test: boot
Bug: 112038744
Change-Id: I3bc342a7df0c47c02494ef6fdae24e7ad00a8507
 2020-02-26 12:39:15 -08:00
Victor Hsieh
19f1caefba Revert "Make keystore a core service" 
This reverts commit 7fd8e853e9.

Test: still see keystore process running
Bug: 112038744
Bug: 150267620
Change-Id: I4fe3c6aeecf960377671d11be0a4dc9fa60dfb18
 2020-02-26 12:37:41 -08:00
Automerger Merge Worker
9851ffaa2e Merge "Revert "Making software km implementation both backup and default"" am: 24dce34ad5 am: 4f0fd48c01 am: a970ec3877 
Change-Id: I030c7905cd6aac5a24429b1c719ce8b8507a8a8c
 2020-02-20 14:46:08 +00:00
Automerger Merge Worker
a970ec3877 Merge "Revert "Making software km implementation both backup and default"" am: 24dce34ad5 am: 4f0fd48c01 
Change-Id: Ibf9b3f005e55400ac2c2a1f02e499950438a53df
 2020-02-20 14:32:32 +00:00
Automerger Merge Worker
4f0fd48c01 Merge "Revert "Making software km implementation both backup and default"" am: 24dce34ad5 
Change-Id: I19932e3111b573ec45d7a36e145bbdb804f043b5
 2020-02-20 14:16:40 +00:00
Wale Ogunwale
24dce34ad5 Merge "Revert "Making software km implementation both backup and default"" 2020-02-20 14:05:52 +00:00
Wale Ogunwale
ba61bbbc0b Revert "Making software km implementation both backup and default" 
This reverts commit cfc8b73b67.

Reason for revert: Causing pre-submit failure with window manager
Bug: 148773266
Bug: 149892576

Change-Id: I1acd288aa1a1cb004d1118b7db775511a2cda344
 2020-02-20 12:35:36 +00:00
Automerger Merge Worker
6391867773 Merge "Port credstore to IdentityCredential AIDL." am: c092adeb2b am: 4718a821b3 am: 10938d3e26 
Change-Id: I3c8857252d86fdacdbe8ab0d762f5c1f3db797ff
 2020-02-19 23:18:16 +00:00
Automerger Merge Worker
10938d3e26 Merge "Port credstore to IdentityCredential AIDL." am: c092adeb2b am: 4718a821b3 
Change-Id: I88470d983520d63de2aa25c775187fcd05f05c6e
 2020-02-19 22:38:30 +00:00
Automerger Merge Worker
4718a821b3 Merge "Port credstore to IdentityCredential AIDL." am: c092adeb2b 
Change-Id: Ie497c7c1f9e38a88411ba7acab83f4ee85ddbb84
 2020-02-19 22:23:14 +00:00
David Zeuthen
c092adeb2b Merge "Port credstore to IdentityCredential AIDL." 2020-02-19 21:14:41 +00:00
Automerger Merge Worker
8210743f12 Merge "Making software km implementation both backup and default" am: 67be8d72bf am: 803b6971a7 am: 81ff06ea77 
Change-Id: I702b1742f8a970b8f1a779b87534e150315f3e89
 2020-02-19 19:49:55 +00:00
Automerger Merge Worker
81ff06ea77 Merge "Making software km implementation both backup and default" am: 67be8d72bf am: 803b6971a7 
Change-Id: Ib11f2cc51a2a262642911f2fff6da65f25c6fa63
 2020-02-19 18:44:03 +00:00
Automerger Merge Worker
803b6971a7 Merge "Making software km implementation both backup and default" am: 67be8d72bf 
Change-Id: Ie1a107c4904e8bcd507ec5d25cb61f98fe09f0b5
 2020-02-19 18:32:18 +00:00
Treehugger Robot
67be8d72bf Merge "Making software km implementation both backup and default" 2020-02-19 18:20:06 +00:00