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
John W. Bruce
ed17d09c1b
Remove asserts from GenerateSimpleSampleDescription()
...
(This change is merged from http://go/wvgerrit/124824 )
GenerateSimpleSampleDescription() only had asserts to check parameters
that only came from other test code, so they weren't testing anything of
use. With the asserts removed, it's no longer necessary to wrap calls to
GenerateSimpleSampleDescription() with ASSERT_NO_FATAL_FAILURE(), which
a lot of callers were already forgetting to do anyway. This also
simplifies a future patch that will generalize the decryption test code
to work with entitlement licenses.
Bug: 186782279
Test: x86-64 platform
Test: build_and_run_all_unit_tests
Change-Id: I987427fdfee4826d77ab95344f9aca8c374b2001
2021-05-11 12:49:22 -07:00
TreeHugger Robot
18026660ad
Merge "[RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix sc-dev" into sc-dev am: ddaae9a17b am: 099c1ffdc9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14235494
Change-Id: I1207162115e6bce7f20006ee11d39df262ff7899
2021-05-10 22:46:20 +00:00
Cong Lin
3d53124c9e
[RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix sc-dev am: 22f8ee9498 am: 4dd5b67ab0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14235494
Change-Id: I1c6fa54ca5aa75f6c26855bc0852bdcfd598122f
2021-05-10 22:46:17 +00:00
TreeHugger Robot
099c1ffdc9
Merge "[RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix sc-dev" into sc-dev am: ddaae9a17b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14235494
Change-Id: I904d26ce4d9bd4e07ee589eb79027ee594b4df87
2021-05-10 22:21:00 +00:00
Cong Lin
4dd5b67ab0
[RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix sc-dev am: 22f8ee9498
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14235494
Change-Id: I9f6af72472a903d0cfe4c6bc7bd882f66448e0e4
2021-05-10 22:20:57 +00:00
TreeHugger Robot
14b30786d9
Merge "[RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix sc-dev" into sc-dev am: ddaae9a17b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14235494
Change-Id: I18c398e5c85161b1700461f962f51e1c72c8260e
2021-05-10 22:19:13 +00:00
Cong Lin
3aee415125
[RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix sc-dev am: 22f8ee9498
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14235494
Change-Id: I88e6f7a369777d2347139378abd9a1e7e343a844
2021-05-10 22:19:11 +00:00
TreeHugger Robot
227d29064f
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix sc-dev" into sc-dev am: ddaae9a17b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14235494
Change-Id: I6183235585939e4e46fe539e5715b98b45526557
2021-05-10 22:19:05 +00:00
TreeHugger Robot
ddaae9a17b
Merge "[RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix sc-dev" into sc-dev
2021-05-10 22:02:06 +00:00
Rahul Frias
eef5e51fe7
Merge "Disallow the ability to load offline licenses more than once" into sc-dev am: bb0b6b4ba5 am: e5814090a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14307365
Change-Id: Ia09e2d78a06266c4fd1eaed9ece48623b0a6898d
2021-05-07 23:02:07 +00:00
Rahul Frias
e5814090a0
Merge "Disallow the ability to load offline licenses more than once" into sc-dev am: bb0b6b4ba5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14307365
Change-Id: Ida8f36ca832b46eac218ff8b9da18d37e3687296
2021-05-07 22:36:29 +00:00
Rahul Frias
e36c0754c9
Merge "Disallow the ability to load offline licenses more than once" into sc-dev am: bb0b6b4ba5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14307365
Change-Id: I755b957f639ecba392728e1d39bd948d838d6fa4
2021-05-07 22:34:29 +00:00
Rahul Frias
361dbbe269
Merge "Disallow the ability to load offline licenses more than once" into sc-dev am: bb0b6b4ba5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14307365
Change-Id: If44b6b6e4bca49936efa3e76fd885774da0763e8
2021-05-07 22:34:22 +00:00
Rahul Frias
bb0b6b4ba5
Merge "Disallow the ability to load offline licenses more than once" into sc-dev
2021-05-07 22:21:03 +00:00
Cong Lin
96b2c404aa
[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
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888
Change-Id: If998e06e696f375362b03ba5d9b78562de5ec91d
2021-05-06 22:41:02 +00:00
Cong Lin
da983e01bb
[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
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14283069
Change-Id: I5899735188ccbec8e06d6eb7400f4306087650b4
2021-05-06 22:40:57 +00:00
Cong Lin
6e6b33e591
[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
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888
Change-Id: I231fb4ac427072ef7804c88403d86564fd677968
2021-05-06 22:40:51 +00:00
Cong Lin
d388582dff
[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
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888
Change-Id: I25b783bc205397a88c32b3a7cf80e5f7f22b0d78
2021-05-06 22:33:46 +00:00
Cong Lin
1af954ab02
[automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix am: 5ea6b86f79 -s ours am: 1fb5b4d68c am: 6514bde77e -s ours am: 1a3c6d7228
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14283069
Change-Id: I7c03712343d6ab0db31b716232571f7074bd4f5e
2021-05-06 22:33:15 +00:00
Cong Lin
3a98f11e6f
[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 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888
Change-Id: I964641f924512173dcb83b3fc3e685ee63c34397
2021-05-06 22:31:33 +00:00
Cong Lin
c1ce51690f
[automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix am: 5ea6b86f79 -s ours am: 1fb5b4d68c am: 6514bde77e -s ours am: 1a3c6d7228 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14283069
Change-Id: I6d2ae3ebc37f7e6eff077ed2f7d560848cf29b04
2021-05-06 22:31:28 +00:00
Cong Lin
8eceff3037
[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
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888
Change-Id: Ib39d6a6434fef9d56005a87b72ef4175b604f574
2021-05-06 22:31:05 +00:00
Cong Lin
b13379127c
[automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix am: 5ea6b86f79 -s ours am: 1fb5b4d68c am: 6514bde77e -s ours am: 1a3c6d7228
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14283069
Change-Id: Ifface1d7fbd00cca3436ad185611cbc3b21ca376
2021-05-06 22:30:47 +00:00
Cong Lin
1e032deed0
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888
Change-Id: I0d40134cf46b8362ada5feb640154a3c6d3de2c6
2021-05-06 22:26:02 +00:00
Cong Lin
2489444769
[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
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888
Change-Id: Ife464b7ee504a582a6ba62d47c826d1b4b5cf146
2021-05-06 22:24:35 +00:00
Cong Lin
1a3c6d7228
[automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix am: 5ea6b86f79 -s ours am: 1fb5b4d68c am: 6514bde77e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14283069
Change-Id: I140d768a4af03f7b5d9a216007a3b252ae27f28d
2021-05-06 22:24:26 +00:00
Cong Lin
a84927cca8
[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 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888
Change-Id: I981c1d9c490c48735375064c7e6bfcfe2aa1328b
2021-05-06 22:22:36 +00:00
Cong Lin
647ca0e3a0
[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
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888
Change-Id: I50db61137856d3411757c5749fd154e4497852a0
2021-05-06 22:22:10 +00:00
Cong Lin
23558d65b4
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888
Change-Id: I3bb67f7b01ff3ac4522f0bfd5943e259c4d2c3bd
2021-05-06 22:14:09 +00:00
Cong Lin
5ed13c2c28
[automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix qt-dev am: eb9a027f0a am: b6b2367e9d -s ours am: 9fbcb7f1ba am: 8b84dd36a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888
Change-Id: Iaf8cceab7ea631943c110149eb1bfdfd62830db2
2021-05-06 22:13:30 +00:00
Cong Lin
7a9ac3bd37
[automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix am: 5ea6b86f79 am: bc7c7a971d -s ours am: cff7fd681e am: 3ddbada6d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14283069
Change-Id: I30871b153ecb19f4adf7e91f0fafb878398fb2cd
2021-05-06 22:13:28 +00:00
Cong Lin
6514bde77e
[automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix am: 5ea6b86f79 -s ours am: 1fb5b4d68c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14283069
Change-Id: Ibe45158298b415d67de3132f598095d983d8af81
2021-05-06 22:13:27 +00:00
Cong Lin
3ddbada6d8
[automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix am: 5ea6b86f79 am: bc7c7a971d -s ours am: cff7fd681e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14283069
Change-Id: Ib150b4d361ef7ba052d511d8440960b9ecc7deaf
2021-05-06 21:57:55 +00:00
Cong Lin
5d1b215cb7
[automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix qt-dev am: eb9a027f0a am: b6b2367e9d -s ours am: 9fbcb7f1ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888
Change-Id: I4ab4f7c5a15822960cd6f6c9d35e3292a726db40
2021-05-06 21:57:38 +00:00
Cong Lin
8b84dd36a1
[automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix qt-dev am: eb9a027f0a am: b6b2367e9d -s ours am: 9fbcb7f1ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888
Change-Id: I6d284a16c6e5d40d0d39489d9853d032dec8e043
2021-05-06 21:56:09 +00:00
Cong Lin
1fb5b4d68c
[automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix am: 5ea6b86f79 -s ours
...
am skip reason: skipped by user conglin
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14283069
Change-Id: Iab364aea4690819a484a8527e73dcc4e0da358d6
2021-05-06 21:56:03 +00:00