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

6376 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cong Lin
0031791ec8 Loosen KCB encryption checks in L3 am: 9935fae50d am: 9feaf68ea5 am: 196d291162 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18528965

Change-Id: Iaa8d3c0cdad739618721fb976d6d87be78414e3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-22 07:44:39 +00:00
Cong Lin
adafba08f1 Loosen KCB encryption checks in L3 am: 9935fae50d am: 9feaf68ea5 am: 28ca5aa3cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18528965

Change-Id: I7c2675affa33831095d180da7d0c57d1f26a5d85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-22 07:44:23 +00:00
Cong Lin
196d291162 Loosen KCB encryption checks in L3 am: 9935fae50d am: 9feaf68ea5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18528965

Change-Id: I4c6a1c8a181406509f4b3e045a45d852b3ffdd45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-22 07:26:01 +00:00
Cong Lin
28ca5aa3cf Loosen KCB encryption checks in L3 am: 9935fae50d am: 9feaf68ea5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18528965

Change-Id: I5257ca933846b7b60b2c83046b617a46171421d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-22 07:25:59 +00:00
Cong Lin
9feaf68ea5 Loosen KCB encryption checks in L3 am: 9935fae50d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18528965

Change-Id: If52667414b27b20b16c0e84f0b92a906b75b4834
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-22 07:09:58 +00:00
Cong Lin
9935fae50d Loosen KCB encryption checks in L3 
This is a merge from:
https://widevine-internal-review.googlesource.com/c/cdm/+/152372

The L3 source change which produced these libraries is:
https://widevine-internal-review.googlesource.com/c/cdm/+/152371/

Original commit message:
To address the bug with certain 16.4.x SDK versions returning a
clear key control block (KCB) for clients newer than 16.5, the
exact version check to determine whether key control blocks are
clear or not has been loosened.

Original behavior:
- ODK version >= 16.5.x --> Assume clear
- ODK version <= 16.4.x --> Assume encrypted
New behavior:
- No KCB IV --> Assume clear
- Otherwise --> Assume encrypted

This CL also includes a change to oemcrypto/include/OEMCryptoCENC.h
The changes to OEMCryptoCENC.h in the CL are comments or variable name
change. So it should be safe.
This change was merged to wv tm-dev here:
https://widevine-internal-review.googlesource.com/c/cdm/+/148411
So, adding it to Android tm-dev.

Test: run_level3_static_tests, CdmDecryptTest/CdmTestWithDecryptParam.* against LS SDK 16.4.2 & 17.0
Bug: 232557453
Change-Id: I2bbb5ab3ea33a16bd6c198077e5aefe960737ea0
 2022-05-22 06:35:22 +00:00
Robert Shih
35de7f5d7f Merge "dumpsys widevine: print hex IDs to avoid garbled text" into tm-dev am: 186e489562 am: 22c314b3c5 am: 0ff5a94b18 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17992673

Change-Id: I82d0e2080fb90cfea9109a70ef6c51a11d0fd8f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 09:16:38 +00:00
Automerger Merge Worker
fb3ac97c6f Merge "Merge "dumpsys widevine: print hex IDs to avoid garbled text" into tm-dev am: 186e489562 am: 22c314b3c5" into tm-d1-dev-plus-aosp am: 0089fad7fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17992673

Change-Id: If6bf17d94f836c8ede79f39d6cd7f9718431b846
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 08:22:58 +00:00
Robert Shih
034e8bd518 Merge "dumpsys widevine: print hex IDs to avoid garbled text" into tm-dev am: 186e489562 am: f8bd90fe71 am: 1584175d60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17992673

Change-Id: I59919c1f04e8c1e76a5803f8c47f6eae538884c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 08:22:41 +00:00
Automerger Merge Worker
0089fad7fc Merge "Merge "dumpsys widevine: print hex IDs to avoid garbled text" into tm-dev am: 186e489562 am: 22c314b3c5" into tm-d1-dev-plus-aosp 2022-05-16 08:05:37 +00:00
Robert Shih
edfc22c061 Merge "dumpsys widevine: print hex IDs to avoid garbled text" into tm-dev am: 186e489562 am: 22c314b3c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17992673

Change-Id: I5aab87e4686521d02b96273c4507ea907281ac17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 08:05:35 +00:00
Robert Shih
1584175d60 Merge "dumpsys widevine: print hex IDs to avoid garbled text" into tm-dev am: 186e489562 am: f8bd90fe71 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17992673

Change-Id: I5628a86db0390964d189bbb3748fa574706532fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 08:05:34 +00:00
Robert Shih
0ff5a94b18 Merge "dumpsys widevine: print hex IDs to avoid garbled text" into tm-dev am: 186e489562 am: 22c314b3c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17992673

Change-Id: I4caf1a7412913122341c2d24271036be8bbac357
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 08:05:33 +00:00
Robert Shih
22c314b3c5 Merge "dumpsys widevine: print hex IDs to avoid garbled text" into tm-dev am: 186e489562 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17992673

Change-Id: I8bc719c40571d8ecac10a23e982d5a83dd537213
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 07:40:55 +00:00
Robert Shih
f8bd90fe71 Merge "dumpsys widevine: print hex IDs to avoid garbled text" into tm-dev am: 186e489562 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17992673

Change-Id: I354f65e931b14d00f0f7da7951e94e3a1a89f67d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 07:39:39 +00:00
Robert Shih
186e489562 Merge "dumpsys widevine: print hex IDs to avoid garbled text" into tm-dev 2022-05-16 06:17:33 +00:00
Alex Dale
8709d9322d Move system ID extraction outside of CryptoSession. am: 9d169a00bb am: 11a55d2e8e am: 3b1f15ddee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18244016

Change-Id: I0a0f0a12435d572db69c03539f39d354c69da5f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 19:07:21 +00:00
Alex Dale
931d425f5b Move system ID extraction outside of CryptoSession. am: 9d169a00bb am: e28711c3ca am: c9c8ecd1e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18244016

Change-Id: I82817064a5368a1c51abddacca39ba194f913d15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 19:06:36 +00:00
Alex Dale
40677ed273 Move system ID extraction outside of CryptoSession. am: 9d169a00bb am: e28711c3ca am: 62c43f71d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18244016

Change-Id: I4ea1dc01ec99b19d65578d9ab052a0ec423cf2bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 19:05:41 +00:00
Alex Dale
3b1f15ddee Move system ID extraction outside of CryptoSession. am: 9d169a00bb am: 11a55d2e8e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18244016

Change-Id: I85184973cdf55c6ef21729c06c7f9404056657d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 18:39:53 +00:00
Alex Dale
c9c8ecd1e3 Move system ID extraction outside of CryptoSession. am: 9d169a00bb am: e28711c3ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18244016

Change-Id: I521b19d7a705a28b9c29b27fccb50af1fa027f1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 18:39:36 +00:00
Alex Dale
62c43f71d4 Move system ID extraction outside of CryptoSession. am: 9d169a00bb am: e28711c3ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18244016

Change-Id: Ia7f7342cb648251893282c56c899f944afd81eb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 18:39:33 +00:00
Alex Dale
e28711c3ca Move system ID extraction outside of CryptoSession. am: 9d169a00bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18244016

Change-Id: Ifa0f6c87c52a3090edc3977d86522163bb68738b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 18:20:40 +00:00
Alex Dale
11a55d2e8e Move system ID extraction outside of CryptoSession. am: 9d169a00bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18244016

Change-Id: If5782404e3ffff41a2377d6bd2d0a35851f78529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 18:18:23 +00:00
Alex Dale
9d169a00bb Move system ID extraction outside of CryptoSession. 
[ Merge of http://go/wvgerrit/151391 ]

This CL moves the logic for extracting the system ID from keybox or
OEM certificate (from OEMCrypto or device files) to a dedicated
SystemIdExtractor.

Before Provisioning 4.0, the system ID could only be found from data
returned by OEMCrypto.  However, with provisioning 4.0, the system ID
can now be found in the OEM certificate that is stored on the device
files.

Bug: 232020319
Test: system_id_extractor_unittest
Test: Forest L37800000954493485
Change-Id: Ie1b7987906e2e4fef015cd659a947b6dbb7594b1
 2022-05-12 19:22:03 -07:00
Alex Dale
5c07a8b6b5 Merge "Added metrics for production readiness." into tm-dev am: 8ac7ca3f46 am: c01aca1d4d am: ca085f1d41 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18304422

Change-Id: I3be107f966d20edae9b7f7cc1077bd3d80712e89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 00:05:57 +00:00
Alex Dale
0700ba921b Merge "Added metrics for production readiness." into tm-dev am: 8ac7ca3f46 am: 53e513dc05 am: a669b0acfd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18304422

Change-Id: Icc4483ce83f56816f7179e7d61e70b1e7371a999
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 00:01:49 +00:00
Alex Dale
60a7610484 Merge "Added metrics for production readiness." into tm-dev am: 8ac7ca3f46 am: 53e513dc05 am: f298a5adca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18304422

Change-Id: I8b094f4202a7276dc41709336e855626122e80d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 23:57:29 +00:00
Alex Dale
f298a5adca Merge "Added metrics for production readiness." into tm-dev am: 8ac7ca3f46 am: 53e513dc05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18304422

Change-Id: Ie48bb4f7460e193c5d678c98a4086bf1fbf80517
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 23:40:18 +00:00
Alex Dale
ca085f1d41 Merge "Added metrics for production readiness." into tm-dev am: 8ac7ca3f46 am: c01aca1d4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18304422

Change-Id: Ia7c19d70f0c0c695f06a25cbec1e1b962666d1c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 23:39:44 +00:00
Alex Dale
a669b0acfd Merge "Added metrics for production readiness." into tm-dev am: 8ac7ca3f46 am: 53e513dc05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18304422

Change-Id: I2319d49bbaba97d0020f12167625fa4632136449
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 23:39:20 +00:00
Alex Dale
53e513dc05 Merge "Added metrics for production readiness." into tm-dev am: 8ac7ca3f46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18304422

Change-Id: Ifac854ca29c96aff77a35f59e726ede451828929
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 23:04:01 +00:00
Alex Dale
c01aca1d4d Merge "Added metrics for production readiness." into tm-dev am: 8ac7ca3f46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18304422

Change-Id: Ia06436ff571d566428b059e3cfb7e052988f4e9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 23:01:56 +00:00
Alex Dale
8ac7ca3f46 Merge "Added metrics for production readiness." into tm-dev 2022-05-12 22:10:24 +00:00
Automerger Merge Worker
5fbc87c2b6 Merge "Add hal_metrics_adapter_unittest for AIDL service. am: cf3771e54a am: e277ac0aaf" into tm-d1-dev-plus-aosp am: df80023bde 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18308868

Change-Id: I65a49d03efe0c164777b1f7f09b5126fe1a1ff6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 03:46:04 +00:00
Edwin Wong
2ce23c5a30 Add hal_metrics_adapter_unittest for AIDL service. am: cf3771e54a am: 67522b7b65 am: 990a818041 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18308868

Change-Id: Iba92111ba36f11681de6c3e40f85c3b0f4b7cff1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 03:45:43 +00:00
Edwin Wong
4879f9a555 Add hal_metrics_adapter_unittest for AIDL service. am: cf3771e54a am: 67522b7b65 am: ba8e028d3b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18308868

Change-Id: Ia580f19f62383ff5669b97859b42b1fb903f7681
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 03:45:19 +00:00
Automerger Merge Worker
df80023bde Merge "Add hal_metrics_adapter_unittest for AIDL service. am: cf3771e54a am: e277ac0aaf" into tm-d1-dev-plus-aosp 2022-05-12 03:30:02 +00:00
Edwin Wong
ee0dee053b Add hal_metrics_adapter_unittest for AIDL service. am: cf3771e54a am: e277ac0aaf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18308868

Change-Id: I37198ee18979f45e702fe5e338abb243ae1966c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 03:29:59 +00:00
Edwin Wong
990a818041 Add hal_metrics_adapter_unittest for AIDL service. am: cf3771e54a am: 67522b7b65 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18308868

Change-Id: Ifb08a21ad728b6e03e27b23f772f7d84931f6a08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 03:29:58 +00:00
Edwin Wong
ba8e028d3b Add hal_metrics_adapter_unittest for AIDL service. am: cf3771e54a am: 67522b7b65 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18308868

Change-Id: I7967755fcea35ab9518d9f640a4fdf3dfb110e01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 03:29:55 +00:00
Edwin Wong
67522b7b65 Add hal_metrics_adapter_unittest for AIDL service. am: cf3771e54a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18308868

Change-Id: I2f20175c6204807803a0745de0d47e06e8042fcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 03:10:44 +00:00
Edwin Wong
e277ac0aaf Add hal_metrics_adapter_unittest for AIDL service. am: cf3771e54a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18308868

Change-Id: Ic0e965c34364ace57f6b10b8ddbaf637b954d1a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 03:09:13 +00:00
Edwin
26d232ada4 Add libwvdrmdrmplugin_hal_test for AIDL service am: 5202862e9a am: 9586d34201 am: 2305263b2d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17831572

Change-Id: Ic3cbaa0f2989f7a5d328edd4db1299e1db7378ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 00:33:28 +00:00
Edwin
e8a63dc927 Add libwvdrmdrmplugin_hal_test for AIDL service am: 5202862e9a am: 9586d34201 am: c4d06d6ea6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17831572

Change-Id: I121f0077b533b98444593f52deb465b35495ffa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 00:32:02 +00:00
Edwin Wong
cf3771e54a Add hal_metrics_adapter_unittest for AIDL service. 
[ Merged from http://go/wvgerrit/151750 ]

Test: m hal_metrics_adapter_unittest -j128
Test: m hal_metrics_adapter_unittest  WV_UNITTESTS_BUILD_TARGET=hidl -j128
Test: adb push $(OUT)/data/nativetest/hal_metrics_adapter_unittest  /data/nativetest/.
Test: adb shell  LD_LIBRARY_PATH=/vendor/lib64 /data/nativetest/hal_metrics_adapter_unittest

Bug: 217247987
Change-Id: I0c890d2fab754bf993632659293a0272c863b11f
 2022-05-11 22:01:35 +00:00
Edwin
2305263b2d Add libwvdrmdrmplugin_hal_test for AIDL service am: 5202862e9a am: 9586d34201 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17831572

Change-Id: I59bc66217b8170a2ad369732bbb8ac6e4dcf4fbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:40:42 +00:00
Edwin
c4d06d6ea6 Add libwvdrmdrmplugin_hal_test for AIDL service am: 5202862e9a am: 9586d34201 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17831572

Change-Id: Ieb328c30bd47b7863b614ed8c451507f60d9b704
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:30:43 +00:00
Edwin
0d86212819 Add libwvdrmdrmplugin_hal_test for AIDL service am: 5202862e9a am: 56594f7018 am: c31ba7f4ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17831572

Change-Id: I3e633b4f8edde38ef56e26999a82f0aae4519b11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:01:03 +00:00
Edwin
9586d34201 Add libwvdrmdrmplugin_hal_test for AIDL service am: 5202862e9a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17831572

Change-Id: Idc534a847bf4d3a592fc0217178b8e1740e9ab21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:55:27 +00:00