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

7097 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ulyana Trafimovich
7ca7e1b629 Merge "Disable dexpreopt and <uses-library> check for tests." into sc-dev am: 4b9ec9eab6 am: 2fe594f079 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14326926

Change-Id: Ia256ae128fac63f4b81d4ca2a55cbd4046ca218c
 2021-05-17 21:07:27 +00:00
Robert Shih
730ccc5b09 Merge "Update Android WVCdm version to 16.1.0" into sc-dev am: 7a061b503f am: c2f8ada7ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14313686

Change-Id: I654d74a9e1b6db30d42e551fc4922bc0d752bfb7
 2021-05-17 21:03:11 +00:00
Rahul Frias
698fe8b9e1 Merge "Address CE CDM code review comments" into sc-dev am: 9b3e37b038 am: a8a59e5f7c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14253246

Change-Id: I1d8893b18bcca78187dac0bb88e9e47212605625
 2021-05-17 20:52:31 +00:00
TreeHugger Robot
98ee102ef8 Merge changes I6dd829f4,Id8384c58,I9228b9cc,I744a1e89 into sc-dev am: 03dff71bd8 am: 63db607211 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14212412

Change-Id: I172bf8cd582e4581fc98c5e60a3504c198db5084
 2021-05-17 20:21:48 +00:00
Ereth McKnight-MacNeil
05f26fb422 Shell quoting in move_widevine_data.sh am: 63eae1f4a4 am: 0ef5d387f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13472583

Change-Id: Id3ab809856e0e0128ae790926b36c768544a885e
 2021-05-17 20:12:17 +00:00
Rahul Frias
6bc177a2bb Replace DeviceFiles::LicenseState with CdmOfflineLicenseState am: 4c4e746e57 am: 32286032e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14280044

Change-Id: I82d13f66b8b06f6941f08437fafe7e0407202e5b
 2021-05-17 19:46:58 +00:00
Alex Dale
fe28d4cafc [DO NOT MERGE] Revert "Restructed reference root of trust (3/3 OEM Cert)" 
This reverts commit 9f7e2c4413.

Reason for revert: Feature missed deadline

Bug: 135283522
Change-Id: I63eb0431762fd13c64bef926fb1e64b6edacb156
 2021-05-17 19:08:53 +00:00
Rahul Frias
c6da67eed9 Merge "Correct request_license_test failures" into sc-dev am: 46a3f6c608 am: 9ee95389ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14263147

Change-Id: I57b88589f6cac935f7fe137543ad102a2783cb1e
 2021-05-17 16:04:46 +00:00
TreeHugger Robot
d13bce562f Merge "Clean up CdmEngine logs." into sc-dev am: bee62d797e am: a8ced08a5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14137667

Change-Id: I40974080fee5405855bf7dd6873e5232324ad6db
 2021-05-17 15:44:57 +00:00
Bob Badour
2712f282a8 Merge "[LSC] Add LOCAL_LICENSE_KINDS to vendor/widevine" into sc-dev am: 99b73280e6 am: dc7573bb82 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14284399

Change-Id: I48c1c798ac9ecf3aee610c61def026dd71edff97
 2021-05-17 15:36:15 +00:00
Edwin Wong
dd56243b29 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow." into sc-dev am: 8c0769d8a9 am: 25988720e3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3983eb37b7283e5b2ac1c166253fada8e2fff292
 2021-05-17 15:11:24 +00:00
Edwin Wong
a7c9b9a0e1 [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow. am: 68b5b00567 am: deece4f746 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idc217420f8a19668b46ac5c20d1bc24d0c547e28
 2021-05-17 14:07:57 +00:00
TreeHugger Robot
95456f993b Merge "Use either spelling of AllocateSecureBuffer in dynamic adapter" into sc-dev am: 347bba5261 am: b8c670a32f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14150100

Change-Id: I78d396863427e67448a5b70dba2e5bcf9c1d9f94
 2021-05-17 13:47:18 +00:00
TreeHugger Robot
810c39ea75 Merge "Address review comments" into sc-dev am: 9c3c076cac am: db2c579afe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14207160

Change-Id: I6ad299dfed9751185572c198b5bc71feba0ec802
 2021-05-17 13:37:00 +00:00
Rahul Frias
1550faa8f2 Merge "Remove CBC1 and CENS test" into sc-dev am: c997497aa6 am: 93c6f6521a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14188281

Change-Id: I38b88028ae37a3bb62dab16110ed65a6613bacb7
 2021-05-17 12:43:55 +00:00
Alex Dale
761ffcab57 Merge "Only one function for reporting usage support." into sc-dev am: d4b24490f2 am: 73016e1f2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14137666

Change-Id: I4bb4834432a7203f17d73dfa5cbce0c5ed5b01aa
 2021-05-17 12:06:09 +00:00
Rahul Frias
a06545979e Merge "Address CE CDM test failures and code review comments" into sc-dev am: d59b009495 am: f83251974e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14123999

Change-Id: I8a4073ac100d0885d5bd379411f51da372922945
 2021-05-17 10:46:45 +00:00
Rahul Frias
d7c0e74297 Merge "Correct request_license_test failures" into sc-dev am: 5343a90f1f am: a90414daae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14185068

Change-Id: I233bd31c0345687430bde622c3f349ac5939b7a9
 2021-05-17 10:08:57 +00:00
TreeHugger Robot
6c3e2b22ae Merge changes Ic7459870,I655babf1,I463642fb,Iccdbcc0b,I2ebbd8f7, ... into sc-dev am: c1d423487f am: 6a3f8ee02d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14185071

Change-Id: I4000cdf76d390f07f5d7ab45c1def74badcd27f4
 2021-05-17 09:39:37 +00:00
Alex Dale
8cbc9e01c2 Merge "Extended Android file store error logs." into sc-dev am: 93cfe22910 am: a4332714bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13736812

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

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

Change-Id: I6bda32cce94902d4bea9e65f158e29f71911069b
 2021-05-16 07:58:01 +00:00
Cong Lin
4d446f8a73 [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix sc-dev am: 22f8ee9498 am: 3aee415125 -s ours 
am skip reason: subject contains skip directive

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

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

Change-Id: I35d7c099df07ef8a9213fb44f8fcfc0bf834fb85
 2021-05-16 07:47:10 +00:00
Cong Lin
146cb923fe [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 skip reason: subject contains skip directive

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

Change-Id: Ic4783758b07647aaeb8d9b40f2454cc96343f7b2
 2021-05-16 07:25:35 +00:00
Cong Lin
3627e852cb [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 skip reason: subject contains skip directive

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

Change-Id: I238b01059d06f46276a678ac0201adb748f1a585
 2021-05-16 07:16:34 +00:00
Cong Lin
d11e560f7f [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 skip reason: subject contains skip directive

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

Change-Id: Ia933ccda0869428d6e61827f8da1f72e5bb5d0ed
 2021-05-16 07:01:30 +00:00
Cong Lin
cded22bf8d [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix am: 5ea6b86f79 am: bc7c7a971d -s ours am: cff7fd681e am: b777a01117 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I08e5b5aed7b3453bafbe8b864c51ac11f65a2e3f
 2021-05-16 06:07:32 +00:00
TreeHugger Robot
c57b135a6e Merge "Report Rental duration remaining" into sc-dev am: 4057559ae5 am: 2695afcc94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14383050

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

Change-Id: I048d43cb40a8bbbd5bfcbf64cb9532a0fc1c6d46
 2021-05-16 04:59:27 +00:00
Alex Dale
8e8d37245d Clean up other core CDM logs. am: 0579fe805e am: c3f1395994 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238896

Change-Id: I0724414a161c78f7a334749e65ff58702c66f5de
 2021-05-15 14:25:03 +00:00
John W. Bruce
d742daf9c7 Validate decryption with entitled keys in OEC tests 
(This change is merged from http://go/wvgerrit/124825)

The OEMCrypto tests have tests that verify that entitled keys can be
loaded but not that they can be successfully used for decrypt. This
patch adds a decrypt portion to the existing tests.

As part of this, the existing Session::EncryptCTR() method and portions
of Session::TestDecryptCTR() are lifted to be static functions so they
can be shared across unrelated classes in oec_session_util.cpp.
EncryptCTR() had no dependence on its enclosing class and is unchanged
other than being moved outside the class.

To reduce ambiguity with the new decrypt verification, this patch also
renames EntitledMessage::VerifyEntitlementTestKeys() to the
more-specific EntitledMessage::VerifyKCBs(). Its behavior is unchanged.

Bug: 186782279
Test: x86-64 platform
Test: opk_ta platform
Test: build_and_run_all_unit_tests
Change-Id: I15156882907b0987215087aaf43b4666fedc171a
 2021-05-11 12:52:24 -07:00