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

4908 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Dale
19e1008df7 Merge "Updated DrmDeviceCertificate for signature algo." into sc-dev 2021-02-23 06:53:18 +00:00
Robert Shih
bac93f6f4c Merge "OEMCrypto_LoadLicense doc cleanup" into sc-dev am: ae9b1cd128 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13639625

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iadc7f7e803a7de2057cb420afbdbaa1623c90eca
 2021-02-23 00:18:47 +00:00
Robert Shih
75f6a8871e wvhidl: map wvcdm LogPriority to hidl LogPriority am: f7285fb0e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13580488

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic1d8b48729adeba6931fca0cc900a35f0832dd59
 2021-02-23 00:18:11 +00:00
Robert Shih
ae9b1cd128 Merge "OEMCrypto_LoadLicense doc cleanup" into sc-dev 2021-02-22 23:30:55 +00:00
Robert Shih
00b4a9b5b5 OEMCrypto_LoadLicense doc cleanup 
Bug: 162255728
Change-Id: I11f74b1f38e0e073e0e2e464bdce41e720f00549
 2021-02-20 08:38:39 +00:00
Robert Shih
f7285fb0e9 wvhidl: map wvcdm LogPriority to hidl LogPriority 
[Merge of http://go/wvgerrit/117343]

Bug: 162255728
Test: VtsHalDrmV1_4TargetTest
Change-Id: I368b2d7a125e62e46ded322c1e171a15a9a7a1b4
 2021-02-19 01:53:22 -08:00
Alex Dale
e15c0607c7 Enable the CDM to track the DRM private key type. 
[ Merge of http://go/wvgerrit/110923 ]

The CDM is responsible for telling OEMCrypto the underlying DRM
private key type when loading it into a session.  To do this, the
CDM must determine and store the key type of a successfully loaded
provisioning response.  The type of key is available from the
DRM certificate proto that is provided in the reponse.

This change introduces a class to contain the wrapped key and
type together.  To store the type, the CDM device files have been
updated to include a key type with the DRM certificate and to
store from and load to the new class.

Unittests have been updated for using the new class where the
wrapped key was used before.

Test: Linux unit tests
Bug: 140813486
Change-Id: I09249afe9c291632fb651ecd00eac697d6939ec7
(cherry picked from commit 6c457402e944079271cef488aa4699f986da6a2e)
Merged-In: I09249afe9c291632fb651ecd00eac697d6939ec7
 2021-02-18 23:10:39 +00:00
Alex Dale
e70c7a116e Report OEMCrypto's ECC capabilities. 
[ Merge of http://go/wvgerrit/110824 ]

When generating a provisioning request, the CDM includes the different
certificate key types that are supported.

This change will enable the reporting of ECC certificate types if
OEMCrypto supports them.

Test: Linux unit tests and Android integration test
Bug: 140813486
Change-Id: I713ff1c469dff5c8a41461727ce63486d962575e
(cherry picked from commit 547d2f8775)
Merged-In: I713ff1c469dff5c8a41461727ce63486d962575e
 2021-02-18 23:09:53 +00:00
Alex Dale
5e982e8fff Updated DrmDeviceCertificate for signature algo. 
[ Merge of http://go/wvgerrit/110823 ]

DrmDeviceCertificate is the CDM's reduced version of DrmCertificate
used in the backend.  With the introduction of ECC, the CDM needs to
extract the signature algorithm to determine how to handle the wrapped
private key used by OEMCrypto post-provisioning.

This change brings the DrmDeviceCertificate in line with the
provisioning service's DrmCertificate message as the new source of
truth.

Bug: 140813486
Test: Compiled proto
Change-Id: I164a1c9266fb74b6cdd0ff35f1986ca032033bba
(cherry picked from commit 667c672c80)
Merged-In: I164a1c9266fb74b6cdd0ff35f1986ca032033bba
 2021-02-18 23:08:29 +00:00
Robert Shih
6ead838bb9 Merge "wv hidl: map CdmResponseType to drm@1.4 Status" into sc-dev am: 9397f5b972 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13526141

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib5d5fcde506fe122386d785f973ee699f81b75a8
 2021-02-18 00:49:02 +00:00
Robert Shih
50ceb0ee6b WVDrmPlugin: map OEMCryptoResult to drm@1.4 Status am: 0450bfcda1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13593533

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5b73be35ff7a7114fe35d2cbc3b55a26aee54b5f
 2021-02-18 00:48:54 +00:00
Robert Shih
9397f5b972 Merge "wv hidl: map CdmResponseType to drm@1.4 Status" into sc-dev 2021-02-18 00:25:48 +00:00
Robert Shih
8443dfcad1 Merge "Run git-clang-format on log.{h,cpp}" into sc-dev am: bbfa2b4ff4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13580486

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d11c8558bf1a56853ae0d7b4338bb3a7f3aeec1
 2021-02-17 09:38:47 +00:00
Robert Shih
0450bfcda1 WVDrmPlugin: map OEMCryptoResult to drm@1.4 Status 
Bug: 162255728
Change-Id: Ieb7de4e3d40e132ab17d5907132879714ef7e918
Test: MediaDrmTest#testExceptionMessage
 2021-02-17 09:05:21 +00:00
Robert Shih
bbfa2b4ff4 Merge "Run git-clang-format on log.{h,cpp}" into sc-dev 2021-02-17 09:01:14 +00:00
Robert Shih
89b9cb2706 Run git-clang-format on log.{h,cpp} 
Bug: 168341163
Test: build
Change-Id: Ie51b1d4ab66e256992b6fffa524331ec124e047d
 2021-02-16 00:39:43 -08:00
Robert Shih
25825d2b5d Run git-clang-format am: fa49fdade0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13549770

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iffd10c82bf128df0bb22a51a9df4f4c4142a6354
 2021-02-16 08:17:23 +00:00
Robert Shih
fa49fdade0 Run git-clang-format 
Bug: 168341163
Test: build
Change-Id: Icf8bd644ee5e87cd499ee017c8c522a96d385d4c
 2021-02-11 08:40:31 -08:00
Jeff Tinker
bcc3313828 Create a build_all_unit_tests.sh script 
bug: 163163467
test: ./build_all_unit_tests.sh
      ./build_and_run_all_unit_tests.sh

Merge from: go/wvgerrit/116524

Change-Id: I5eaf5ed34b46445d23530ca0edca94bfaeb3abaf
 2021-02-09 12:10:31 -08:00
Robert Shih
6ed2c30a0a wv hidl: map CdmResponseType to drm@1.4 Status 
Bug: 162255728
Test: VtsHalDrmV1_4TargetTest
Change-Id: Icc96c17f38218475efc7489348b75c9978f16b01
 2021-02-08 19:10:43 -08:00
Robert Shih
5e77f2e388 Merge "libwvhidl: implement API to get plugin logs" into sc-dev am: e77b029214 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13473325

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4584212f682efb29f343e787c360f1467cdffed8
 2021-02-05 06:15:42 +00:00
Robert Shih
e77b029214 Merge "libwvhidl: implement API to get plugin logs" into sc-dev 2021-02-05 05:28:00 +00:00
Edwin Wong
2cbecf1cce Fix potential decrypt src pointer overflow. am: c3a24e6c86 am: 25f89c373c am: 15ba854123 am: 37e0991645 am: 3ee1f400e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13421305

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifd5d9a9cdd01a43e5113da1fd627c3807d308540
 2021-02-04 18:29:58 +00:00
Robert Shih
c0979417fd Save recent Widevine CDM logs am: 83ef9081d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13472557

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If8f419a01ee2c4dfa08e73f0cefaadbf81d1250a
 2021-02-04 18:29:05 +00:00
Edwin Wong
3ee1f400e7 Fix potential decrypt src pointer overflow. am: c3a24e6c86 am: 25f89c373c am: 15ba854123 am: 37e0991645 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13421305

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I71106d21ee571a1446ffe9271e8c1f5672505abf
 2021-02-04 18:25:22 +00:00
Robert Shih
12995287fa libwvhidl: implement API to get plugin logs 
Bug: 162255728
Test: VtsHalDrmV1_4TargetTest
Change-Id: I333cb1ee2f25ae718e7f544f4a5f7ee50668041a
 2021-02-04 06:43:54 -08:00
Robert Shih
83ef9081d1 Save recent Widevine CDM logs 
Bug: 162255728
Test: cdm unit tests
Change-Id: Ibc0daf374bedd8ac2a9a0515835e2775045962a7
 2021-02-04 05:12:09 +00:00
Edwin Wong
734c386227 Fix potential decrypt src pointer overflow. am: c3a24e6c86 am: 25f89c373c am: 15ba854123 am: 0126cc541f am: cd37425acb am: 2b094e710e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13421305

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0c0d0a869976743f496e060005515f86339aaedf
 2021-02-03 02:56:19 +00:00
Edwin Wong
2b094e710e Fix potential decrypt src pointer overflow. am: c3a24e6c86 am: 25f89c373c am: 15ba854123 am: 0126cc541f am: cd37425acb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13421305

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0171ddb362a84d8b08c9a429e40adab4baf1b8c
 2021-02-03 02:19:51 +00:00
Edwin Wong
cd37425acb Fix potential decrypt src pointer overflow. am: c3a24e6c86 am: 25f89c373c am: 15ba854123 am: 0126cc541f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13421305

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1644e541f8f21e85f58b600880537da9bd7d9301
 2021-02-03 01:33:24 +00:00
Edwin Wong
37e0991645 Fix potential decrypt src pointer overflow. am: c3a24e6c86 am: 25f89c373c am: 15ba854123 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13421305

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3356e46dd849cd63e90f36d33e72dec525403f7d
 2021-02-03 01:13:28 +00:00
Edwin Wong
0126cc541f Fix potential decrypt src pointer overflow. am: c3a24e6c86 am: 25f89c373c am: 15ba854123 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13421305

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0ca1b56fb48691be44e302dc0acaecfdf14b7e5c
 2021-02-03 01:11:50 +00:00
Edwin Wong
15ba854123 Fix potential decrypt src pointer overflow. am: c3a24e6c86 am: 25f89c373c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13421305

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie5c32617a1ebbed4805aa0a048a2ab92ff958c11
 2021-02-03 00:35:53 +00:00
Edwin Wong
25f89c373c Fix potential decrypt src pointer overflow. am: c3a24e6c86 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13421305

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I243e7a6e4ea799af9759be2ee41f9d9ff7805f0e
 2021-02-03 00:03:49 +00:00
Edwin Wong
c3a24e6c86 Fix potential decrypt src pointer overflow. 
Merged from http://go/wvgerrit/114903

There is a potential integer overflow to bypass the
source base size check in decrypt. The source pointer
can then point to the outside of the source buffer,
which could potentially leak arbitrary memory content
to destination pointer.

Test: sts-tradefed
  sts-tradefed run sts-engbuild-no-spl-lock -m StsHostTestCases --test android.security.sts.Bug_176496160#testPocBug_176496160

Test: push to device with target_hwasan-userdebug build
  adb shell /data/local/tmp/Bug-17649616064

Bug: 176496160
Bug: 176444786
Change-Id: I208e0d5d949e8ef003fcf7d6f129eab66b9b3656
 2021-01-28 17:59:08 +00:00
bohu
26e7e4c098 widevine: allows to build service on 64bit only guest am: f225e9876e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13418915

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I33c86043f0a542deea43121203d087ee0e06054a
 2021-01-27 22:07:49 +00:00
bohu
f225e9876e widevine: allows to build service on 64bit only guest 
BUG: 177228019
Change-Id: I0181dcc355e706dd923f940018821fcae244a941
Merged-In: I0181dcc355e706dd923f940018821fcae244a941
(cherry picked from commit 8d723e7b8c)
 2021-01-27 18:17:24 +00:00
Robert Shih
e0a1e459a2 libwvhidl: implement setPlaybackId 
Bug: 159337195
Bug: 168341163
Test: GtsMediaTestCases MediaDrmTest#testSetPlaybackId
Change-Id: I4fc687892c9dd3b8077b3ecdfd9bbc355b298571
 2021-01-20 15:26:01 +00:00
Robert Shih
56195b41c6 libwvhidl: upgrade to android.hardware.drm@1.4 
Bug: 136119370
Test: GtsMediaTestCases MediaDrmTest#testRequiresSecureDecoder
Change-Id: Iaaa7c225c0056904b5fd98c4557ec47f661b2c7d
 2021-01-19 05:52:59 -08:00
Jingjiang Li
5eb7d21fd5 Merge "Allow priv-app to invoke signRSA API." 2021-01-14 03:30:54 +00:00
jingjiangli
5bf19f51a9 Allow priv-app to invoke signRSA API. 
For more details please refer to: https://docs.google.com/document/d/1FcnUvv7w5xu05UgEFjRtpUWcBiitBmatewYbYjh8w8s/edit#heading=h.44t8ehqbf98p

Bug: b/175603696
Change-Id: I5544ae858bc2b9358e53ca03c5d5805bc33f061e
 2021-01-14 02:39:42 +00:00
Bharath Chandra Elluru
1c27386af0 Merge "Merge oemcrypto buffer overflow tests from cdm" 2021-01-11 22:13:48 +00:00
Bharath Chandra Elluru
6b548748b2 Merge oemcrypto buffer overflow tests from cdm 
Widevine CLs:
http://go/wvgerrit/112243
http://go/wvgerrit/110563
http://go/wvgerrit/95483
http://go/wvgerrit/107047
http://go/wvgerrit/111123
http://go/wvgerrit/106224
http://go/wvgerrit/106263
http://go/wvgerrit/106223
http://go/wvgerrit/104223
http://go/wvgerrit/108583
http://go/wvgerrit/111403
http://go/wvgerrit/111623
http://go/wvgerrit/106264
http://go/wvgerrit/110483
http://go/wvgerrit/111944
http://go/wvgerrit/108684
http://go/wvgerrit/104183
http://go/wvgerrit/111443
http://go/wvgerrit/111869
http://go/wvgerrit/108843
http://go/wvgerrit/104363
http://go/wvgerrit/104423
http://go/wvgerrit/104263
http://go/wvgerrit/106584
http://go/wvgerrit/105924
http://go/wvgerrit/104524
http://go/wvgerrit/113023

Bug:175401639

Test: We would like to run these tests on pixel devices from master
branch using go/wv-and-dash

Change-Id: Ic4188504af64de9ce79941f75ac6feaf29189a4d
 2021-01-11 22:13:16 +00:00
Rahul Frias
53d6db47e5 Adding additional logs to the decryption flow 
[ Merge of http://go/wvgerrit/111507 ]

Bug: 174195349
Test: WV unit/integration tests
Change-Id: If8eb2c6ba326ed246da7adfa1137e16fe69bb044
 2020-12-20 12:12:35 -08:00
Rahul Frias
e851d42eb1 [automerger skipped] Reprovision on error 10085 [ DO NOT MERGE ] am: c5b65aa5ed am: dd140c463c -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibe54309a1e7b9d3f59da95c659ba5e9152a23dee
 2020-12-09 18:41:28 +00:00
Rahul Frias
dd140c463c Reprovision on error 10085 [ DO NOT MERGE ] am: c5b65aa5ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13139811

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0251d7327a8c395fd79c0aaf52241a548d954713
 2020-12-09 18:09:13 +00:00
Rahul Frias
14d2f62358 Merge "Reprovision on error 10085" 2020-12-08 20:29:48 +00:00
Alex Dale
6311f130c4 Merge "Restrict reserved Client ID fields." 2020-12-08 04:31:28 +00:00
Alex Dale
78f4bca3a9 Restrict reserved Client ID fields. 
[ Merge of http://go/wvgerrit/108904 ]

Client ID name-value fields in the license request share the same
namespace with app parameters and WV standard device information.  As
a result, it was possible for applications to provide parameters that
could potentially fool the license server with spoof values.

This CL restricts the use of the fields that are common across both the
Android CDM and CE CDM.  Currently, Android specific fields are
restricted by the MediaDrmPlugin layer, and there are no CE CDM
specific fields currently defined.

The non-HIDL DRM plugin does not restrict these fields; however, it
will be removed in S.

Bug: 171723566
Test: Android integration test
Change-Id: I5ad9ead73c5aff712dff8133953de5ddc3296452
 2020-12-04 12:34:01 -08:00
Rahul Frias
c5b65aa5ed Reprovision on error 10085 [ DO NOT MERGE ] 
[ Merge of http://go/wvgerrit/110603 and http://go/ag/13139808 ]

Qualcomm SoC may report 10085 (RSASSA-PSS signature error) when
OEMCrypto_PrepareAndSignLicenseRequest is called. The app needs to
reprovision (or the user needs to factory reset their device) in order
to recover.

If the 10085 error is returned, the app currently will get a
MediaDrmStateException. The app has no way to be able to tell
whether this is due to the 10085 error or some other error.

This change returns a NEED_PROVISIONING error at the CDM level, which
will result in the app receiving a NotProvisionedException when
MediaDrm.getKeyRequest is called.

Bug: 174375589
Test: GtsMediaTestCases, WV unit/integration tests
Change-Id: I4f2884c8a5fd88ab2e9bfbc0731a20e58cec0f36
 2020-12-03 03:29:33 -08:00