Srujan Gaddam
6d196d8496
Change prov retry test to use prov models
...
Bug: b/133641240
Tests: ProvisioningInterspersedRetryTest L3 & modmock
Merge of http://go/wvgerrit/80164
The ProvisioningInterspersedRetryTest tests that the response tied to
the provisioning request before the latest fails to be handled. This is
only true for provisioning 2.0 where we use derived keys. In
provisioning 3.0, the number of requests allowed to be handled is tied
to the number of nonces, which from OEMCrypto v15.2 onwards, is exactly
4. This CL modifies the test to handle that behavior.
Change-Id: I9f4e555acab145487d6e409779afe7b9b63fd4af
2019-06-07 09:43:15 -07:00
Srujan Gaddam
dcf3f21289
Add query to CDM to get provisioning model
...
Bug: b/133855570
Tests: Android tests/CE CDM tests/Linux tests
Merge of http://go/wvgerrit/80163
Adds a query option to QueryStatus to get the provisioning model of the
OEMCrypto.
Change-Id: I1896984be6294a5ada9a97b63e6d9080297e92b0
2019-06-07 09:40:59 -07:00
Rahul Frias
a178eed57d
Reformat wv core/src files
...
[ Merge of http://go/wvgerrit/80484 ]
Clang-format has been run on files in core/src. clang-format has been turned
off for some blocks but otherwise no other changes have been made.
Bug: 134365840
Test: WV unit/integration tests
Change-Id: I6e509f25136f84d37de3d920084302f0f2c23dc4
2019-06-04 11:26:18 -07:00
Rahul Frias
47c2068d6a
Reformat wv core/include files
...
[ Merge of http://go/wvgerrit/80483 ]
Clang-format has been run on files in core/include
Bug: 134365840
Test: WV unit/integration tests
Change-Id: I890127f23f30f0e63f826d3638521b4cc12fb995
2019-06-03 13:53:31 -07:00
John Bruce
01fbaac6ad
Merge "Take a Global Write Lock Before Calling OEMCrypto_GenerateNonce()"
2019-06-03 17:35:11 +00:00
Rahul Frias
d8f86965e3
[automerger skipped] Merge "Merge "Address request license test failures [ DO NOT MERGE ]" into qt-dev am: 367befa3b7 am: ba5a1aac05" into qt-r1-dev-plus-aosp
...
am: b280f8c717
2019-06-01 18:20:46 -07:00
Rahul Frias
15f5c99494
[automerger skipped] Merge "Address request license test failures [ DO NOT MERGE ]" into qt-dev am: 367befa3b7 am: 3a92c08fa2
...
am: 1a7a1b8df8
2019-06-01 18:20:32 -07:00
Rahul Frias
78ac369748
[automerger skipped] Merge "Address request license test failures [ DO NOT MERGE ] am: b7c6f9b52c am: 11bc2924ab" into qt-r1-dev-plus-aosp
...
am: a998158cd2
2019-06-01 18:20:15 -07:00
Rahul Frias
e5f7001bff
[automerger skipped] Address request license test failures [ DO NOT MERGE ] am: b7c6f9b52c am: 1d05cf8e0d
...
am: 74d7819374
2019-06-01 18:19:57 -07:00
Android Build Merger (Role)
b280f8c717
Merge "Merge "Address request license test failures [ DO NOT MERGE ]" into qt-dev am: 367befa3b7 am: ba5a1aac05" into qt-r1-dev-plus-aosp
2019-06-02 01:14:16 +00:00
Rahul Frias
33b056663b
Merge "Address request license test failures [ DO NOT MERGE ]" into qt-dev am: 367befa3b7
...
am: ba5a1aac05
2019-06-01 18:14:02 -07:00
Rahul Frias
1a7a1b8df8
Merge "Address request license test failures [ DO NOT MERGE ]" into qt-dev am: 367befa3b7
...
am: 3a92c08fa2
2019-06-01 18:14:00 -07:00
Android Build Merger (Role)
a998158cd2
Merge "Address request license test failures [ DO NOT MERGE ] am: b7c6f9b52c am: 11bc2924ab" into qt-r1-dev-plus-aosp
2019-06-02 01:13:56 +00:00
Rahul Frias
74d7819374
Address request license test failures [ DO NOT MERGE ] am: b7c6f9b52c
...
am: 1d05cf8e0d
2019-06-01 18:13:45 -07:00
Rahul Frias
d91d17e538
Address request license test failures [ DO NOT MERGE ] am: b7c6f9b52c
...
am: 11bc2924ab
2019-06-01 18:13:45 -07:00
Rahul Frias
ba5a1aac05
Merge "Address request license test failures [ DO NOT MERGE ]" into qt-dev
...
am: 367befa3b7
2019-06-01 17:56:56 -07:00
Rahul Frias
3a92c08fa2
Merge "Address request license test failures [ DO NOT MERGE ]" into qt-dev
...
am: 367befa3b7
2019-06-01 17:56:56 -07:00
Rahul Frias
1d05cf8e0d
Address request license test failures [ DO NOT MERGE ]
...
am: b7c6f9b52c
2019-06-01 17:56:55 -07:00
Rahul Frias
11bc2924ab
Address request license test failures [ DO NOT MERGE ]
...
am: b7c6f9b52c
2019-06-01 17:56:55 -07:00
Rahul Frias
367befa3b7
Merge "Address request license test failures [ DO NOT MERGE ]" into qt-dev
2019-06-02 00:44:31 +00:00
John W. Bruce
1d5b7cc8fe
Take a Global Write Lock Before Calling OEMCrypto_GenerateNonce()
...
(This is a merge of http://go/wvgerrit/77803 )
In OEMCrypto 15.2, OEMCrypto_GenerateNonce() is a Session Initialization
Function, which means the global OEMCrypto lock must be held before
calling it. There's no harm updating our code to behave this way now,
even before OEMCrypto 15.2 implementations are ready, since it's a
stricter guarantee than the current behavior.
Bug: 131327826
Test: CE CDM Unit Tests
Test: Android Unit Tests
Change-Id: Icb6a86dea7298c99596fa9e3d90cec721ebcb8a6
2019-05-31 19:02:29 -07:00
Rahul Frias
643c574775
Merge "Return key request type none after key rotation" into qt-dev am: 999a466275 am: 4c5cba3597
...
am: d65500fe7f
2019-05-31 09:59:15 -07:00
Rahul Frias
6c9c4697f0
Merge "Return key request type none after key rotation" into qt-dev am: 999a466275 am: 4690da2bcb
...
am: 4c9a3a6f02
2019-05-31 09:55:31 -07:00
Rahul Frias
d65500fe7f
Merge "Return key request type none after key rotation" into qt-dev am: 999a466275
...
am: 4c5cba3597
2019-05-31 09:38:25 -07:00
Rahul Frias
4c9a3a6f02
Merge "Return key request type none after key rotation" into qt-dev am: 999a466275
...
am: 4690da2bcb
2019-05-31 09:33:36 -07:00
Rahul Frias
4c5cba3597
Merge "Return key request type none after key rotation" into qt-dev
...
am: 999a466275
2019-05-31 09:17:27 -07:00
Rahul Frias
4690da2bcb
Merge "Return key request type none after key rotation" into qt-dev
...
am: 999a466275
2019-05-31 09:16:52 -07:00
Rahul Frias
999a466275
Merge "Return key request type none after key rotation" into qt-dev
2019-05-31 15:55:05 +00:00
Rahul Frias
ecf8a96970
Merge "Merge "WvCdmExtendedDurationTest#VerifyLicenseRequestTest fixes" into qt-dev am: e4d432806a am: bb4ffe8bdb" into qt-r1-dev-plus-aosp
...
am: 22c06c5773
2019-05-29 19:31:15 -07:00
Rahul Frias
b271da5139
Merge "WvCdmExtendedDurationTest#VerifyLicenseRequestTest fixes" into qt-dev am: e4d432806a am: 785cd12f3c
...
am: 09e2b6dfa6
2019-05-29 19:30:56 -07:00
Android Build Merger (Role)
22c06c5773
Merge "Merge "WvCdmExtendedDurationTest#VerifyLicenseRequestTest fixes" into qt-dev am: e4d432806a am: bb4ffe8bdb" into qt-r1-dev-plus-aosp
2019-05-30 02:24:43 +00:00
Rahul Frias
09e2b6dfa6
Merge "WvCdmExtendedDurationTest#VerifyLicenseRequestTest fixes" into qt-dev am: e4d432806a
...
am: 785cd12f3c
2019-05-29 19:24:33 -07:00
Rahul Frias
fa5aa2f616
Merge "WvCdmExtendedDurationTest#VerifyLicenseRequestTest fixes" into qt-dev am: e4d432806a
...
am: bb4ffe8bdb
2019-05-29 19:24:32 -07:00
Rahul Frias
bb4ffe8bdb
Merge "WvCdmExtendedDurationTest#VerifyLicenseRequestTest fixes" into qt-dev
...
am: e4d432806a
2019-05-29 19:19:33 -07:00
Rahul Frias
785cd12f3c
Merge "WvCdmExtendedDurationTest#VerifyLicenseRequestTest fixes" into qt-dev
...
am: e4d432806a
2019-05-29 19:19:33 -07:00
Rahul Frias
e4d432806a
Merge "WvCdmExtendedDurationTest#VerifyLicenseRequestTest fixes" into qt-dev
2019-05-30 02:06:42 +00:00
Rahul Frias
b7c6f9b52c
Address request license test failures [ DO NOT MERGE ]
...
[ Merge of http://go/wvgerrit/79883 ]
This corrects test code and undoes CE CDM changes in b/113167010 which
will be resolved in a future release.
The tests failures addressed are
* ProvisioningTestWithServiceCertificate
* ReleaseRetryOfflineKeyTest
* ReleaseRetryL3OfflineKeyTest
* ReleaseRetryL3OfflineKeySessionUsageDisable
ProvisioningInterspersedRetryTest has been disabled and will be
addressed in a post 15.2 OEMCrypto release in 133641240
Bug: 119428680
Test: WV unit/integration tests
Change-Id: I7961b4556a0ac749e4f38d43f1bea8f520d67f20
2019-05-29 19:04:52 -07:00
Rahul Frias
3c9175fec5
Return key request type none after key rotation
...
[ Merge of http://go/wvgerrit/80084 ]
Corrected the key type being returned after entitled keys from
init data are loaded. Made test changes to validate.
Bug: 133903028
Test: WV unit/integration tests
Change-Id: Icb44587f5c3aba3b0facae6d83dc9344d6b60833
2019-05-29 19:03:43 -07:00
Srujan Gaddam
1479632fa7
Merge "Change move_widevine_data.sh to move L3 files" into qt-dev am: f246f028b2 am: 5f5cc2b634
...
am: 670804fb8b
2019-05-25 11:15:00 -07:00
Srujan Gaddam
1423b9261f
Merge "Change move_widevine_data.sh to move L3 files" into qt-dev am: f246f028b2 am: c9ba0981ba
...
am: b4396d0e6e
2019-05-25 10:58:02 -07:00
Srujan Gaddam
18e3cf144a
Reverse LD_LIBRARY_PATH order based on liboemcrypto.so am: 45d02c545c am: 4f63000ad7
...
am: e7ed590fe2
2019-05-25 10:40:17 -07:00
Srujan Gaddam
670804fb8b
Merge "Change move_widevine_data.sh to move L3 files" into qt-dev am: f246f028b2
...
am: 5f5cc2b634
2019-05-25 10:35:07 -07:00
Srujan Gaddam
28696a2125
Reverse LD_LIBRARY_PATH order based on liboemcrypto.so am: 45d02c545c am: 61510bbc8a
...
am: 971aa7d2d4
2019-05-25 10:34:07 -07:00
Srujan Gaddam
b4396d0e6e
Merge "Change move_widevine_data.sh to move L3 files" into qt-dev am: f246f028b2
...
am: c9ba0981ba
2019-05-25 10:23:53 -07:00
Srujan Gaddam
e7ed590fe2
Reverse LD_LIBRARY_PATH order based on liboemcrypto.so am: 45d02c545c
...
am: 4f63000ad7
2019-05-25 10:12:00 -07:00
Srujan Gaddam
971aa7d2d4
Reverse LD_LIBRARY_PATH order based on liboemcrypto.so am: 45d02c545c
...
am: 61510bbc8a
2019-05-25 10:10:31 -07:00
Srujan Gaddam
c9ba0981ba
Merge "Change move_widevine_data.sh to move L3 files" into qt-dev
...
am: f246f028b2
2019-05-25 10:05:10 -07:00
Srujan Gaddam
61510bbc8a
Reverse LD_LIBRARY_PATH order based on liboemcrypto.so
...
am: 45d02c545c
2019-05-25 09:58:50 -07:00
Haibo Huang
1d2ee2d4d7
Merge "Using ::testing::DoAll" into qt-dev-plus-aosp am: f078443fd7
...
am: 0222e219f6
2019-05-24 20:23:12 -07:00
Srujan Gaddam
5f5cc2b634
Merge "Change move_widevine_data.sh to move L3 files" into qt-dev
...
am: f246f028b2
2019-05-24 14:18:22 -07:00
