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

6479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
da1e3c5de2 Merge "Added mutex for reserved_license_ids_." into tm-dev 2022-04-29 19:36:30 +00:00
John Bruce
5ebb827ecf Merge "First-stage Provisioning 4.0 client ID encryption" into tm-dev am: 7d78ce9ac8 am: 48a64d2240 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17949160

Change-Id: Id57a18e8d34d0ab41afa16b825242d4a591f8c1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 19:19:27 +00:00
John Bruce
4812f775d8 Merge "First-stage Provisioning 4.0 client ID encryption" into tm-dev am: 7d78ce9ac8 am: 22d2ba8bf1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17949160

Change-Id: I28d73f99f951a7ac37607c97c0cc98f9bf264961
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 19:13:24 +00:00
John Bruce
3d4df9b5d4 Merge "First-stage Provisioning 4.0 client ID encryption" into tm-dev am: 7d78ce9ac8 am: 9063559c43 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17949160

Change-Id: I044eff2022cbb905409f5f0ca1d49b4dcf549ac5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 19:12:11 +00:00
Alex Dale
adff500240 Merge "Specify DRM certificate duration in tests." into tm-dev am: 38b639f920 am: e4cb3e49b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17779678

Change-Id: I4362428aab8ee1b5ba0cbaa6ea635cd17d9f10d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 19:03:45 +00:00
Alex Dale
d780c8bc6b Merge "Specify DRM certificate duration in tests." into tm-dev am: 38b639f920 am: e4cb3e49b1 am: f9fc3e3828 am: 538904dec9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17779678

Change-Id: I5151e635a92e6a39621462e10ff90d380989f03c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 19:03:36 +00:00
Alex Dale
05c41a56be Merge "Specify DRM certificate duration in tests." into tm-dev am: 38b639f920 am: cae67a0b19 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17779678

Change-Id: If611de42b11d4b61fcf0cb384d0d2b4d96c621be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:52:29 +00:00
John Bruce
8201d91231 Merge "First-stage Provisioning 4.0 client ID encryption" into tm-dev am: 7d78ce9ac8 am: 22d2ba8bf1 am: 8db98d1bc9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17949160

Change-Id: Ib97df795cd954fde73758d6fdc2747eb18c26672
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:44:34 +00:00
Alex Dale
538904dec9 Merge "Specify DRM certificate duration in tests." into tm-dev am: 38b639f920 am: e4cb3e49b1 am: f9fc3e3828 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17779678

Change-Id: Ibc75216e73374903c9864cc66f3119d8341add99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:43:25 +00:00
Alex Dale
654e6208f6 Merge "Specify DRM certificate duration in tests." into tm-dev am: 38b639f920 am: beddef3475 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17779678

Change-Id: I31e1ba2f4e5d9a96b457b6aa5c2d6dcc69ff7b57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:42:17 +00:00
John Bruce
8db98d1bc9 Merge "First-stage Provisioning 4.0 client ID encryption" into tm-dev am: 7d78ce9ac8 am: 22d2ba8bf1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17949160

Change-Id: I0e4e6046ceea13b6b77206a11ddb837748476d76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:25:18 +00:00
Alex Dale
f9fc3e3828 Merge "Specify DRM certificate duration in tests." into tm-dev am: 38b639f920 am: e4cb3e49b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17779678

Change-Id: Ia18a4ab7636e253cef5f27ccc21a4e63ff90f85b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:24:33 +00:00
John "Juce" Bruce
30a3da1b83 Skip key padding better 
(This is a merge of http://go/wvgerrit/151112.)

The Widevine CDMs have never validated the padding on AES keys. However,
the code to ignore the padding was unusual and based on the assumption
the keys would always have either 0 or 16 bytes of padding and did not
handle other cases correctly. This patch updates the padding-ignoring
code to just do the obvious thing: Reject keys that are too small and
ignore all extra bytes regardless of count.

Bug: 114159862
Test: x86-64
Change-Id: Ic48010477e4cb5f7d2afbde25cf2f098e3470089
 2022-04-29 18:20:31 +00:00
John Bruce
22d2ba8bf1 Merge "First-stage Provisioning 4.0 client ID encryption" into tm-dev am: 7d78ce9ac8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17949160

Change-Id: I20a06b97e6cd2a97b688c744a73981fbe4c98700
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:05:10 +00:00
Alex Dale
e4cb3e49b1 Merge "Specify DRM certificate duration in tests." into tm-dev am: 38b639f920 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17779678

Change-Id: Ib0903a3afd461b8d053a5bbcc10533bd74f1f22a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:02:27 +00:00
John Bruce
48a64d2240 Merge "First-stage Provisioning 4.0 client ID encryption" into tm-dev am: 7d78ce9ac8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17949160

Change-Id: I8497ffcc5af5f19727fdf5ff0b8d5034994e0f49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:01:50 +00:00
John Bruce
9063559c43 Merge "First-stage Provisioning 4.0 client ID encryption" into tm-dev am: 7d78ce9ac8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17949160

Change-Id: I34a211b4f201580a227c3c0f725d12244d244abb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:01:39 +00:00
Alex Dale
cae67a0b19 Merge "Specify DRM certificate duration in tests." into tm-dev am: 38b639f920 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17779678

Change-Id: Ie78be345758fc67e01f185a01fe91119abfb61e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:00:18 +00:00
Alex Dale
beddef3475 Merge "Specify DRM certificate duration in tests." into tm-dev am: 38b639f920 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17779678

Change-Id: I440cb42578dbf320ea192a540329d9401b52a5b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:00:02 +00:00
John Bruce
7d78ce9ac8 Merge "First-stage Provisioning 4.0 client ID encryption" into tm-dev 2022-04-29 17:38:39 +00:00
Alex Dale
38b639f920 Merge "Specify DRM certificate duration in tests." into tm-dev 2022-04-29 17:34:59 +00:00
Robert Shih
c9c897408a Merge "WVCdm: no destroy global log buffer on exit" into tm-dev am: 5c38b38514 am: 71a89e2daa am: 7c8c12797a am: 9cd58c8832 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17570520

Change-Id: I67560710d885ede9d7a0f5804a3e96a7a7bd0619
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 05:22:07 +00:00
Robert Shih
8a2774d569 Merge "Widevine PRODUCT_PACKAGES makefiles" into tm-dev am: 3b44c810d6 am: 022c86d666 am: 9a66b5a614 am: b7ca3947e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17133103

Change-Id: If2309066e288e7ac0313d8b4f984346f81c1fc0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 05:07:54 +00:00
Robert Shih
92ed2f07ac Merge "WVCdm: no destroy global log buffer on exit" into tm-dev am: 5c38b38514 am: 470f49f87c am: 965a198106 am: 02a3668fc8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17570520

Change-Id: I8738229632e0d8f530d0caff3648cba817810c60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 04:53:56 +00:00
Robert Shih
9b4068e57b Merge "Widevine PRODUCT_PACKAGES makefiles" into tm-dev am: 3b44c810d6 am: fbec9a1c8b am: 34d9771f06 am: f65d971118 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17133103

Change-Id: I3d5fa178e26355b5730044a5c096a208616e7dbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 04:03:20 +00:00
Robert Shih
9136ff312a Merge "WVCdm: no destroy global log buffer on exit" into tm-dev am: 5c38b38514 am: 470f49f87c am: dbf6986c98 am: aee8d5f57e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17570520

Change-Id: Idd77d9133e83392decf4dc22f14e64c6074ea278
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 02:18:04 +00:00
Robert Shih
07ece938fe Merge "Widevine PRODUCT_PACKAGES makefiles" into tm-dev am: 3b44c810d6 am: fbec9a1c8b am: 6b54740110 am: cad8ff6aab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17133103

Change-Id: I1a5de2b42615288db32522eb106055cedef727aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 13:06:38 +00:00
Robert Shih
9cd58c8832 Merge "WVCdm: no destroy global log buffer on exit" into tm-dev am: 5c38b38514 am: 71a89e2daa am: 7c8c12797a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17570520

Change-Id: Ic3eb8121cbe002ed75f05306c8910886750195a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 23:15:47 +00:00
Robert Shih
b7ca3947e6 Merge "Widevine PRODUCT_PACKAGES makefiles" into tm-dev am: 3b44c810d6 am: 022c86d666 am: 9a66b5a614 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17133103

Change-Id: I7cbfbb33befb785c0a50ef49bb4b70d7cc3c1226
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 23:15:34 +00:00
Robert Shih
02a3668fc8 Merge "WVCdm: no destroy global log buffer on exit" into tm-dev am: 5c38b38514 am: 470f49f87c am: 965a198106 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17570520

Change-Id: Ifccaea031bb21f4a47b33cd4c1a2ce75e033735a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 23:15:08 +00:00
Robert Shih
f65d971118 Merge "Widevine PRODUCT_PACKAGES makefiles" into tm-dev am: 3b44c810d6 am: fbec9a1c8b am: 34d9771f06 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17133103

Change-Id: Ie929c02c8e5e258922e7e3b33cbedaffc57ed6e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 23:14:15 +00:00
Robert Shih
aee8d5f57e Merge "WVCdm: no destroy global log buffer on exit" into tm-dev am: 5c38b38514 am: 470f49f87c am: dbf6986c98 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17570520

Change-Id: I2c99174f69063d88d7f8138b35ae6c2fd699ed7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 23:13:33 +00:00
Robert Shih
cad8ff6aab Merge "Widevine PRODUCT_PACKAGES makefiles" into tm-dev am: 3b44c810d6 am: fbec9a1c8b am: 6b54740110 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17133103

Change-Id: I0477dc3a81c18cee2971695ed99444e58ec12a0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 23:13:26 +00:00
Robert Shih
7c8c12797a Merge "WVCdm: no destroy global log buffer on exit" into tm-dev am: 5c38b38514 am: 71a89e2daa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17570520

Change-Id: Id29cc4e198a89e52ddc88f91a1b9343850d871af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 22:11:14 +00:00
Robert Shih
9a66b5a614 Merge "Widevine PRODUCT_PACKAGES makefiles" into tm-dev am: 3b44c810d6 am: 022c86d666 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17133103

Change-Id: I884a2db9719e069705e1ee422aa694ed3926dd3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 22:10:49 +00:00
Robert Shih
965a198106 Merge "WVCdm: no destroy global log buffer on exit" into tm-dev am: 5c38b38514 am: 470f49f87c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17570520

Change-Id: Icb1e0942b54fa39ffb541b22a04d0ab2ead8e917
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 22:09:13 +00:00
Robert Shih
dbf6986c98 Merge "WVCdm: no destroy global log buffer on exit" into tm-dev am: 5c38b38514 am: 470f49f87c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17570520

Change-Id: I61adb53f7b9303fdd305596b138892ef6d18de9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 22:09:11 +00:00
Robert Shih
34d9771f06 Merge "Widevine PRODUCT_PACKAGES makefiles" into tm-dev am: 3b44c810d6 am: fbec9a1c8b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17133103

Change-Id: Ifcd11fecace4529cac7053f4d44408980a2b4201
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 22:08:57 +00:00
Robert Shih
aeef8cc0e7 Merge "WVCdm: no destroy global log buffer on exit" into tm-dev am: 5c38b38514 am: 5c15da7afc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17570520

Change-Id: I393967ede53cf655dfb7966be610a6dcbceca5e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 22:08:46 +00:00
Robert Shih
6b54740110 Merge "Widevine PRODUCT_PACKAGES makefiles" into tm-dev am: 3b44c810d6 am: fbec9a1c8b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17133103

Change-Id: I31c1eadee8026d82df07780d4328a3ab07a52ff2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 22:08:40 +00:00
Robert Shih
eee7bc58be Merge "Widevine PRODUCT_PACKAGES makefiles" into tm-dev am: 3b44c810d6 am: 2212311d21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17133103

Change-Id: I0647aef166fd25590187c308b23c791da3b6917e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 22:08:38 +00:00
Robert Shih
470f49f87c Merge "WVCdm: no destroy global log buffer on exit" into tm-dev am: 5c38b38514 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17570520

Change-Id: I57a2da0c868d7e26c655115a4f6bd08197d32d86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 21:44:57 +00:00
Robert Shih
fbec9a1c8b Merge "Widevine PRODUCT_PACKAGES makefiles" into tm-dev am: 3b44c810d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17133103

Change-Id: I8591e0f7fac5a499165ae45634d2989d54bdc06e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 21:44:32 +00:00
Robert Shih
5c15da7afc Merge "WVCdm: no destroy global log buffer on exit" into tm-dev am: 5c38b38514 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17570520

Change-Id: Id1f9debd87340d9df72e7a97f06acf51551843c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 21:43:54 +00:00
Robert Shih
71a89e2daa Merge "WVCdm: no destroy global log buffer on exit" into tm-dev am: 5c38b38514 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17570520

Change-Id: I75fff489cf7945b9aca39990ceea1ea34f08c35a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 21:43:30 +00:00
Robert Shih
2212311d21 Merge "Widevine PRODUCT_PACKAGES makefiles" into tm-dev am: 3b44c810d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17133103

Change-Id: Ia8b63e21ccd0b519fc11046a278bc5f2e0128e63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 21:43:30 +00:00
Robert Shih
022c86d666 Merge "Widevine PRODUCT_PACKAGES makefiles" into tm-dev am: 3b44c810d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17133103

Change-Id: I7841f278f3e70bb0513c7bfa0b889e4f6a2b0376
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 21:43:13 +00:00
Robert Shih
5c38b38514 Merge "WVCdm: no destroy global log buffer on exit" into tm-dev 2022-04-27 21:23:53 +00:00
Robert Shih
3b44c810d6 Merge "Widevine PRODUCT_PACKAGES makefiles" into tm-dev 2022-04-27 21:23:47 +00:00
Alex Dale
f696a48318 Logging CDM session ID on Decrypt() failures. 
[ Merge of http://go/wvgerrit/149690 ]

This changes extends the CryptoSession logging to include the OEMCrypto
session ID in its decrypt failure logs, and adds a new CdmSession
decrypt failure log which includes the CDM session ID.  The CDM session
directly maps to the MediaDRM session ID, making app debugging easier.

The Decrypt() code pathway is one of the most frequently called
portions of the CDM code, and the pathway attempts to make as few
logging calls as possible in order to keep latency low and log
verbosity to a minimum.  It is anticiapted that when a call to
Decrypt() fails, there will be a burst of failures as the app may
make several calls to Decrypt() before handling the first decrypt
error.

To keep logging low, the following rules are followed:
- CryptoSession: decrypt errors are only logged when the decrypt error
  changes.
- CdmSession: decrypt errors are only logged when the last call to
  decrypt had succeeded.

Bug: 183984396
Test: MediaGTS with decrypt failures
Change-Id: Ic6124646d129efbc8a690b5bfd4dc422e04e677b
 2022-04-26 21:23:12 +00:00