widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,028 Commits 2 Branches 0 Tags
c43b9fc3de4313e44f1885cc7a4b97ec6da16cbf
Commit Graph

6028 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cong Lin
77f9be1d01 [RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate 
build

This is a merge of CL from widevine repo (obfuscated code only):
https://widevine-internal-review.googlesource.com/c/cdm/+/124963

The source code change that produced the obfucated code is here:
https://widevine-internal-review.googlesource.com/c/cdm/+/121763

Original commit message from the fix above:
"This is a security improvement against an L3 exploit b/182584472.
The change is to store RSA private key in two parts instead of one,
and load it separately when the key is needed. This will make it
more difficult to find the entire RSA key.

This CL does the key loading part only. Key splitting is done
in Haystack in CL: cl/367515385"

New L3 system IDs included in the obfuscated code:
ID     Description
22593  Android S ARM L3 Field Provisioning 3.0
22594  Android S ARM 64 L3 Field Provisioning 3.0
22595  Android S x86 L3 Field Provisioning 3.0
22596  Android S x86 64 L3 Field Provisioning 3.0

Bug: 182584472
Test: L3 unit tests
Test: GTS tests
https://android-build.googleplex.com/builds/forrest/run/L16300000887061939
The only failed case is a test issue due to the new IDs not being added
to the allow list of the test yet. This test passed on local run with
the updated allow list.

Change-Id: I50730b80e27d7ba78d5b28341cfe0f2085b03b2c
 2021-05-18 11:20:24 -07:00
TreeHugger Robot
0d73618aae Merge "Validate decryption with entitled keys in OEC tests" into sc-dev am: e233e68de1 am: ea6f596e96 am: 86bbd25775 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14506727

Change-Id: Ia1640bd4c51f1e2203d5b7f848925eafcc7d1666
 2021-05-17 22:41:22 +00:00
TreeHugger Robot
4f9d0720e2 Merge "Remove asserts from GenerateSimpleSampleDescription()" into sc-dev am: 418d322961 am: 69d18ebcf9 am: 36198f6066 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14506726

Change-Id: If1c4204b0239f7e0cea92137598951251a8a00b2
 2021-05-17 22:40:40 +00:00
TreeHugger Robot
6e78d618d9 [automerger skipped] Merge "[DO NOT MERGE] Revert "Restructed reference root of trust (3/3 OEM Cert)"" into sc-dev am: 4948331656 am: d49e3362ea -s ours am: e2ed4f0585 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14472446

Change-Id: I45634a56c6e7f4ebd16fd39da04a1a0fe70a5c0a
 2021-05-17 22:39:49 +00:00
Alex Dale
c7456bab72 [automerger skipped] [DO NOT MERGE] Revert "Restructed reference root of trust (3/3 OEM Cert)" am: fe28d4cafc am: ce38cd3a5e -s ours am: bfd230c1d7 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14472446

Change-Id: I798c9fa248de50dee3f718657a0d614676a8d339
 2021-05-17 22:39:48 +00:00
TreeHugger Robot
0b3c3b65a1 Merge "Validate decryption with entitled keys in OEC tests" into sc-dev am: e233e68de1 am: e0344b8efb am: 7ebf3c7c0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14506727

Change-Id: Ie1a6465e32cbc0f646446f7f803297b32a6406f9
 2021-05-17 22:33:54 +00:00
TreeHugger Robot
bd91a3f031 Merge "Remove asserts from GenerateSimpleSampleDescription()" into sc-dev am: 418d322961 am: ac87531b36 am: 698a6b0151 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14506726

Change-Id: I8c6c39037f45d9a4985114bdf0a04ea20de1ee46
 2021-05-17 22:33:06 +00:00
TreeHugger Robot
2accc51959 [automerger skipped] Merge "[DO NOT MERGE] Revert "Restructed reference root of trust (3/3 OEM Cert)"" into sc-dev am: 4948331656 -s ours am: 961e1a7eb9 am: 84ed07a1e9 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14472446

Change-Id: I0d7992a9dac71353348ef28c37c450bc1f6c73b9
 2021-05-17 22:32:17 +00:00
TreeHugger Robot
86bbd25775 Merge "Validate decryption with entitled keys in OEC tests" into sc-dev am: e233e68de1 am: ea6f596e96 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14506727

Change-Id: I86b6e91b07ed51805bd18d81bb30f475f3a80f36
 2021-05-17 22:31:10 +00:00
TreeHugger Robot
36198f6066 Merge "Remove asserts from GenerateSimpleSampleDescription()" into sc-dev am: 418d322961 am: 69d18ebcf9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14506726

Change-Id: Id2cce2db5f894e1ae6d01830a78210d3ead25c99
 2021-05-17 22:31:08 +00:00
TreeHugger Robot
e2ed4f0585 [automerger skipped] Merge "[DO NOT MERGE] Revert "Restructed reference root of trust (3/3 OEM Cert)"" into sc-dev am: 4948331656 am: d49e3362ea -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14472446

Change-Id: I5f4b0554771c93d2afb71866cc2b865a2f987357
 2021-05-17 22:31:01 +00:00
Alex Dale
bfd230c1d7 [automerger skipped] [DO NOT MERGE] Revert "Restructed reference root of trust (3/3 OEM Cert)" am: fe28d4cafc am: ce38cd3a5e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14472446

Change-Id: Ibfc459967aa5cb6c735dc6b918a37e583e741416
 2021-05-17 22:31:00 +00:00
TreeHugger Robot
d6a1277950 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix sc-dev" into sc-dev am: ddaae9a17b am: 14b30786d9 -s ours am: 42431589c9 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14235494

Change-Id: I49b7b37b4c47cd78df4d9359482ab04c18c3a43f
 2021-05-17 22:30:55 +00:00
Cong Lin
1f94819718 [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix sc-dev am: 22f8ee9498 am: 3aee415125 -s ours am: 4d446f8a73 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14235494

Change-Id: I183d6079446a096dbe9a5baae5d95f11a3c992b0
 2021-05-17 22:30:54 +00:00
Rahul Frias
9131483144 Merge "Disallow the ability to load offline licenses more than once" into sc-dev am: bb0b6b4ba5 am: 361dbbe269 am: 9482d07f10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14307365

Change-Id: If86877b7deb8f73b98aec75c9a02b06bec1eaac7
 2021-05-17 22:29:50 +00:00
TreeHugger Robot
7ebf3c7c0e Merge "Validate decryption with entitled keys in OEC tests" into sc-dev am: e233e68de1 am: e0344b8efb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14506727

Change-Id: Ic93cc95351f2e8d09c247075928578c0212ca999
 2021-05-17 22:29:29 +00:00
TreeHugger Robot
698a6b0151 Merge "Remove asserts from GenerateSimpleSampleDescription()" into sc-dev am: 418d322961 am: ac87531b36 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14506726

Change-Id: I81682f41b5405a51f1d1c7a19c7a2a5ad6c3e8ab
 2021-05-17 22:29:27 +00:00
TreeHugger Robot
84ed07a1e9 [automerger skipped] Merge "[DO NOT MERGE] Revert "Restructed reference root of trust (3/3 OEM Cert)"" into sc-dev am: 4948331656 -s ours am: 961e1a7eb9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14472446

Change-Id: I1ac84784702a8a04ab0a031299fea779524a32dc
 2021-05-17 22:29:15 +00:00
Cong Lin
c34fa3d08e [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix qt-dev am: eb9a027f0a am: b6b2367e9d -s ours am: 9fbcb7f1ba am: 8b84dd36a1 am: 5ed13c2c28 -s ours am: 1e032deed0 am: 8eceff3037 -s ours am: 146cb923fe -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888

Change-Id: I397e0ff24b57670acbcb0833e65cc35e2f6c0c5d
 2021-05-17 22:22:05 +00:00
Cong Lin
d828f20dfd [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix am: 5ea6b86f79 -s ours am: 1fb5b4d68c am: 6514bde77e -s ours am: 1a3c6d7228 am: b13379127c -s ours am: 3627e852cb -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14283069

Change-Id: I5a36d5ecac1f5bfc73cebf8acb7cc11120c9aa13
 2021-05-17 22:21:03 +00:00
Cong Lin
b1b095497d [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix qt-dev am: eb9a027f0a am: b6b2367e9d -s ours am: 9fbcb7f1ba am: 5d1b215cb7 -s ours am: 23558d65b4 am: 647ca0e3a0 -s ours am: d11e560f7f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888

Change-Id: Icaf2174e54be2119bdc66b9a8c36e256f516ca72
 2021-05-17 22:19:54 +00:00
TreeHugger Robot
c542472a0e Merge "Validate decryption with entitled keys in OEC tests" into sc-dev am: e233e68de1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14506727

Change-Id: I795dae66dea135602177fe688fef6160dff942ae
 2021-05-17 22:18:27 +00:00
Cong Lin
bba0320725 [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix am: 5ea6b86f79 am: bc7c7a971d -s ours am: cff7fd681e am: b777a01117 -s ours am: cded22bf8d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14283069

Change-Id: I5bc638db498d28200afc26cedfc7e1c95123bbaf
 2021-05-17 22:18:26 +00:00
TreeHugger Robot
8cd6168dfe Merge "Remove asserts from GenerateSimpleSampleDescription()" into sc-dev am: 418d322961 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14506726

Change-Id: I7bfc106e46a61173236009d490f31d8dd2f9317c
 2021-05-17 22:18:23 +00:00
TreeHugger Robot
ea6f596e96 Merge "Validate decryption with entitled keys in OEC tests" into sc-dev am: e233e68de1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14506727

Change-Id: Iae742c9f96d689c05970c8630555f03b976d351b
 2021-05-17 22:13:41 +00:00
TreeHugger Robot
69d18ebcf9 Merge "Remove asserts from GenerateSimpleSampleDescription()" into sc-dev am: 418d322961 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14506726

Change-Id: If04536a13255810ddcb9416ce17daec641fa7fcd
 2021-05-17 22:13:37 +00:00
TreeHugger Robot
cb3bea320e Merge "Report Rental duration remaining" into sc-dev am: 4057559ae5 am: 2695afcc94 am: c57b135a6e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14383050

Change-Id: I9fabc2d65392fa51852fe98f314c1d6c3507ef72
 2021-05-17 22:12:43 +00:00
TreeHugger Robot
4179857f4a Merge "Use Usage information from OEMCrypto on clock rollback" into sc-dev am: b7662fcbf2 am: 15662cb9c1 am: 615727603d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14294932

Change-Id: I1a8967b2f5fc381061540ed20f73df8c8e6f233d
 2021-05-17 22:11:33 +00:00
TreeHugger Robot
e0344b8efb Merge "Validate decryption with entitled keys in OEC tests" into sc-dev am: e233e68de1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14506727

Change-Id: Ifd10be34ef0ac4ca02c5f5781db013436c1c6c85
 2021-05-17 22:10:23 +00:00
TreeHugger Robot
ac87531b36 Merge "Remove asserts from GenerateSimpleSampleDescription()" into sc-dev am: 418d322961 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14506726

Change-Id: Ia4c41e3fe92fe8a5514e3253db930ec95b3eaec6
 2021-05-17 22:10:18 +00:00
Alex Dale
651a65abbd Clean up other core CDM logs. am: 0579fe805e am: c3f1395994 am: 8e8d37245d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238896

Change-Id: I5a37e2ebf8d7d263e214c5e06a2bb80118524db4
 2021-05-17 22:10:04 +00:00
TreeHugger Robot
961e1a7eb9 [automerger skipped] Merge "[DO NOT MERGE] Revert "Restructed reference root of trust (3/3 OEM Cert)"" into sc-dev am: 4948331656 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14472446

Change-Id: I2127568fa68bbb5d4e7ed6abad2b22f82c8df409
 2021-05-17 22:10:01 +00:00
TreeHugger Robot
e233e68de1 Merge "Validate decryption with entitled keys in OEC tests" into sc-dev 2021-05-17 22:09:52 +00:00
TreeHugger Robot
418d322961 Merge "Remove asserts from GenerateSimpleSampleDescription()" into sc-dev 2021-05-17 22:09:21 +00:00
TreeHugger Robot
e2b43f91ba Merge "[DO NOT MERGE] Revert "Restructed reference root of trust (3/3 OEM Cert)"" into sc-dev am: 4948331656 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14472446

Change-Id: I186dc35f50216b6fed5336b0143bc96f819f5e1f
 2021-05-17 22:08:37 +00:00
Alex Dale
15b3e947bf [DO NOT MERGE] Revert "Restructed reference root of trust (3/3 OEM Cert)" am: fe28d4cafc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14472446

Change-Id: Ie1359c954353362dbe6242dc3d7144baef8cc13f
 2021-05-17 22:08:36 +00:00
TreeHugger Robot
ec45774392 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix sc-dev" into sc-dev am: ddaae9a17b am: 099c1ffdc9 am: 18026660ad -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14235494

Change-Id: I32c7e3cc1cf881b1211e702851c63f32873e83ac
 2021-05-17 22:08:25 +00:00
Cong Lin
6f9bffac0e [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix sc-dev am: 22f8ee9498 am: 4dd5b67ab0 am: 3d53124c9e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14235494

Change-Id: I60cab5a26dee1cf1cfd4f3924a01c5374507eefa
 2021-05-17 22:08:24 +00:00
TreeHugger Robot
d49e3362ea Merge "[DO NOT MERGE] Revert "Restructed reference root of trust (3/3 OEM Cert)"" into sc-dev am: 4948331656 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14472446

Change-Id: I3101e409d3a14764a22b14db023dd93e364abd54
 2021-05-17 22:05:20 +00:00
Alex Dale
ce38cd3a5e [DO NOT MERGE] Revert "Restructed reference root of trust (3/3 OEM Cert)" am: fe28d4cafc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14472446

Change-Id: I0b5496505deaab8d596fea3ec4f5804eb7b88824
 2021-05-17 22:05:20 +00:00
Rahul Frias
a03303714a Merge "Disallow the ability to load offline licenses more than once" into sc-dev am: bb0b6b4ba5 am: e5814090a0 am: eef5e51fe7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14307365

Change-Id: I7921d7d078f6dd0645fb99ed1c0d185115a6b23a
 2021-05-17 22:03:38 +00:00
Cong Lin
4e001a0ce4 [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix qt-dev am: eb9a027f0a am: b6b2367e9d -s ours am: 9fbcb7f1ba am: 8b84dd36a1 am: 5ed13c2c28 -s ours am: 1e032deed0 am: d388582dff am: 96b2c404aa -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888

Change-Id: I0fab61496104f97a99730e29052a1e7d2d5d214a
 2021-05-17 22:01:24 +00:00
Cong Lin
d9bb7ea85e [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix am: 5ea6b86f79 -s ours am: 1fb5b4d68c am: 6514bde77e -s ours am: 1a3c6d7228 am: 1af954ab02 am: da983e01bb -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14283069

Change-Id: Id139e72b14da63398374f3ebce72f0486e782425
 2021-05-17 21:58:34 +00:00
Cong Lin
719c3ae3d7 [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix qt-dev am: eb9a027f0a am: b6b2367e9d -s ours am: 9fbcb7f1ba am: 5d1b215cb7 -s ours am: 23558d65b4 am: 2489444769 am: 6e6b33e591 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888

Change-Id: I366cb39a94e5a9677a34fb02b976461ad6e18dc1
 2021-05-17 21:53:20 +00:00
TreeHugger Robot
4948331656 Merge "[DO NOT MERGE] Revert "Restructed reference root of trust (3/3 OEM Cert)"" into sc-dev 2021-05-17 21:50:36 +00:00
Cong Lin
4432b07ede [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix am: 5ea6b86f79 am: bc7c7a971d -s ours am: cff7fd681e am: 3ddbada6d8 am: 7a9ac3bd37 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14283069

Change-Id: I3a988a28ad92e9ac70b11d95ea457c66220c4ab5
 2021-05-17 21:49:41 +00:00
TreeHugger Robot
88bb59ac54 Merge "Report Rental duration remaining" into sc-dev am: 4057559ae5 am: d6ed573989 am: 593f3fb581 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14383050

Change-Id: Ie70752e32accd0728d6367c3e8f03be35517a99a
 2021-05-17 21:40:07 +00:00
TreeHugger Robot
dc12260268 Merge "Use Usage information from OEMCrypto on clock rollback" into sc-dev am: b7662fcbf2 am: 8f84fd0491 am: fae6d81df4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14294932

Change-Id: If7710b06afac1add494ed6c680ecfa0bb02f3b00
 2021-05-17 21:32:23 +00:00
Alex Dale
d70421578b Clean up other core CDM logs. am: 0579fe805e am: ef3e079834 am: 56211c2c46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238896

Change-Id: Iae3b2074a3ef0eae5746daa4a4b3e8b67065ee2e
 2021-05-17 21:20:08 +00:00
Robert Shih
b929864bd4 Merge "metrics: set OEMCrypto initialization errors correctly" into sc-dev am: 85afe8c0b0 am: d133f5fc43 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238887

Change-Id: I89e67dc6d460c457589cbb0a77c46ae4b5b4ee87
 2021-05-17 21:11:51 +00:00