Commit Graph

1525 Commits

Author SHA1 Message Date
Rahul Frias
fe4288c5d5 am 49022130: am 460d24b1: Merge "Return Client Identification information in Secure Stop" into mnc-dev
* commit '49022130db6ee0b644a90166a1ce4c6f345a4833':
  Return Client Identification information in Secure Stop
2015-06-29 23:39:29 +00:00
Rahul Frias
951c82bd9d am 5bda8071: am 6e2cc1a3: Avoid multiple deletions of a usage entry
* commit '5bda8071614eeffedc743f38586e503effd38d5b':
  Avoid multiple deletions of a usage entry
2015-06-29 23:39:29 +00:00
Rahul Frias
49022130db am 460d24b1: Merge "Return Client Identification information in Secure Stop" into mnc-dev
* commit '460d24b135bc601f712b432ba915bd2009fe230a':
  Return Client Identification information in Secure Stop
2015-06-29 23:26:02 +00:00
Rahul Frias
5bda807161 am 6e2cc1a3: Avoid multiple deletions of a usage entry
* commit '6e2cc1a3ed53d2fed2ad87edbcda4fac37313fb0':
  Avoid multiple deletions of a usage entry
2015-06-29 23:26:01 +00:00
Rahul Frias
460d24b135 Merge "Return Client Identification information in Secure Stop" into mnc-dev 2015-06-29 22:59:47 +00:00
Rahul Frias
6e2cc1a3ed Avoid multiple deletions of a usage entry
[ Merge of http://go/wvgerrit/14900 ]

When releasing a license, usage entries were being released twice with
both OEMCrypto_DeleteUsageEntry and OEMCrypto_ForceDeleteUsageEntry being
called. The second call would always fail because the usage information had
already been released. The CdmSession::DeleteLicense methods will now only
handles deletion of license metadata and leave deletion of usage entries to
the CdmLicense class.
b/22097805

Change-Id: Ic55764d5357043d136e7d88583f709a4ceea3e64
2015-06-29 14:47:24 -07:00
Rahul Frias
d220d41425 Return Client Identification information in Secure Stop
[ Merge of http://go/wvgerrit/14920 ]

The renew_with_client_id field was not being correctly set when licenses
were being restored for usage reporting.

b/22047007

Change-Id: Ib769431b1e49bb498f53d8153a970b6c0a2776d2
2015-06-29 14:06:17 -07:00
Chad Jones
03be1e6f79 am 756fedb6: am 53d9ade2: Merge "Revert "Add XtsMediaTestCases.apk to google-tests.zip"" into mnc-dev
* commit '756fedb6c593e6b83ae2430994ce18b71e99c42a':
  Revert "Add XtsMediaTestCases.apk to google-tests.zip"
2015-06-26 16:11:02 +00:00
Chad Jones
756fedb6c5 am 53d9ade2: Merge "Revert "Add XtsMediaTestCases.apk to google-tests.zip"" into mnc-dev
* commit '53d9ade2ef834a562b191aaf2d291e9dfec94ced':
  Revert "Add XtsMediaTestCases.apk to google-tests.zip"
2015-06-26 15:59:40 +00:00
Chad Jones
53d9ade2ef Merge "Revert "Add XtsMediaTestCases.apk to google-tests.zip"" into mnc-dev 2015-06-26 15:34:45 +00:00
Chad Jones
c72407657a Revert "Add XtsMediaTestCases.apk to google-tests.zip"
This reverts commit fe71d17236.

Change-Id: I8119b307b7fa4dd0a9971e37c6c004de10400233
2015-06-26 15:33:56 +00:00
Kyle Alexander
c32e936f59 am 090bb6f2: am 7c1c5f77: Merge "Add XtsMediaTestCases.apk to google-tests.zip" into mnc-dev
* commit '090bb6f2f6ef6a5a08c4c1b1bd89d1cf07bffcfa':
  Add XtsMediaTestCases.apk to google-tests.zip
2015-06-25 22:29:04 +00:00
Kyle Alexander
090bb6f2f6 am 7c1c5f77: Merge "Add XtsMediaTestCases.apk to google-tests.zip" into mnc-dev
* commit '7c1c5f77cc33b2678919d250733356f1c0796ed4':
  Add XtsMediaTestCases.apk to google-tests.zip
2015-06-25 22:14:55 +00:00
Kyle Alexander
7c1c5f77cc Merge "Add XtsMediaTestCases.apk to google-tests.zip" into mnc-dev 2015-06-25 21:52:57 +00:00
Kyle Alexander
fe71d17236 Add XtsMediaTestCases.apk to google-tests.zip
Need to add our Xts Media tests to the test package, so that we can
execute those tests with our nightly regression.

Bug: 22094009
Change-Id: I7e7ed8bf5f6edb905832495bea6347f97b6c5894
2015-06-25 12:22:36 -07:00
Rahul Frias
1b8049a88a am d58ac809: am 57eb7cb6: Merge "Add unit tests for offline licenses without session usage" into mnc-dev
* commit 'd58ac8094fcc679795efd6e85dee8116d978d8d2':
  Add unit tests for offline licenses without session usage
2015-06-25 15:21:50 +00:00
Rahul Frias
d58ac8094f am 57eb7cb6: Merge "Add unit tests for offline licenses without session usage" into mnc-dev
* commit '57eb7cb6ba415634aa90fbb2d7b63561f1b6416d':
  Add unit tests for offline licenses without session usage
2015-06-25 15:12:30 +00:00
Rahul Frias
57eb7cb6ba Merge "Add unit tests for offline licenses without session usage" into mnc-dev 2015-06-25 06:40:21 +00:00
Fred Gylys-Colwell
18dac6dd6c am 3f34e492: am 66603102: Make MaxSessionsOpenCloseAPI10 More Lenient
* commit '3f34e492b953234f1e2eba9f63f9bf93448154e8':
  Make MaxSessionsOpenCloseAPI10 More Lenient
2015-06-25 05:36:04 +00:00
Fred Gylys-Colwell
3f34e492b9 am 66603102: Make MaxSessionsOpenCloseAPI10 More Lenient
* commit '666031026ca8e85a87b90922e4af1b8b633b3aac':
  Make MaxSessionsOpenCloseAPI10 More Lenient
2015-06-25 05:20:54 +00:00
Fred Gylys-Colwell
666031026c Make MaxSessionsOpenCloseAPI10 More Lenient
Merge from widevine repo of http://go/wvgerrit/14870

OEMCrypto_GetMaxNumberOfSessions is not required to return a hard
limit for the number of sessions.  This CL adjusts the test to verify
we can open within 5% of the maximum number of sessions.

bug: 22029687
Change-Id: I6e72e39338cead8d547cdb194a32fb7e7dc53037
2015-06-24 17:49:06 -07:00
Tim Kilbourn
f41862dd80 am c74222f5: Rename the internal copy of gmock.
* commit 'c74222f52366993e49058b18d2deba1e07218ba7':
  Rename the internal copy of gmock.
2015-06-23 23:18:26 +00:00
Tim Kilbourn
c74222f523 Rename the internal copy of gmock.
The external/gmock project does not include the patches needed for
widevine, so renaming the internal copy allows both to coexist in the
build system.

(cherry-pick of 5b830f19b6 with conflict.)

Change-Id: I77c956db30921afffe31d11e1cd2d99541925f35
2015-06-23 16:00:47 -07:00
Rahul Frias
f5f2e826f2 Add unit tests for offline licenses without session usage
[ Merge of http://go/wvgerrit/14824 ]

OEMCrypto v9 added support for secure usage reporting with the help of
a session usage table. This was enabled through the replay control bits
in the key control block. It was expected that streaming licenses
would enable the nonce required bit, while offline licenses would
enable session usage table entry flag. There are certain cases
where content providers would prefer not to enable the flag for offline
licenses and this test verifies that this scenario works.

b/17514500

Change-Id: Icd1bea8cec2fd52be2be249424891ce1755d5f25
2015-06-22 15:38:33 -07:00
John "Juce" Bruce
91f3e16c22 am 9fcaf2c6: Merge "Update Widevine Classic to 4.5.0.10139" into mnc-dev
* commit '9fcaf2c6ecb6ffc897cc535f6d8c8bd8ede273fa':
  Update Widevine Classic to 4.5.0.10139
2015-06-22 19:36:50 +00:00
John "Juce" Bruce
9fcaf2c6ec Merge "Update Widevine Classic to 4.5.0.10139" into mnc-dev 2015-06-22 19:10:57 +00:00
Rahul Frias
a180715f45 am 9aca14e4: Merge "Allow interspersed provisioning attempts to succeed." into mnc-dev
* commit '9aca14e4fe09d9b70d3801a49c263685d1a7ad06':
  Allow interspersed provisioning attempts to succeed.
2015-06-20 05:43:41 +00:00
John "Juce" Bruce
5bd0e73b3e resolved conflicts for merge of 256dd1a5 to master
Change-Id: Iffef557a3d9d3df321b5ae38e891d5a2a3e88e70
2015-06-19 19:49:36 -07:00
Rahul Frias
9aca14e4fe Merge "Allow interspersed provisioning attempts to succeed." into mnc-dev 2015-06-20 01:06:01 +00:00
John "Juce" Bruce
88c3e74f08 am da8e2beb: Merge "Do Not Use GNU-Style Hashing on MIPS" into mnc-dev
* commit 'da8e2beb28c9f38393b76cbdbd1bd237677f12ce':
  Do Not Use GNU-Style Hashing on MIPS
2015-06-20 01:00:58 +00:00
John "Juce" Bruce
8eee6ab2e2 am 64d9be56: Fix OEMCrypto Tests
* commit '64d9be561502416914040c89912bdb4e6ce34d1e':
  Fix OEMCrypto Tests
2015-06-20 01:00:57 +00:00
John "Juce" Bruce
256dd1a5b4 Merge "Re-Add MIPS to Android CDM Build" into mnc-dev 2015-06-20 00:33:01 +00:00
John "Juce" Bruce
da8e2beb28 Merge "Do Not Use GNU-Style Hashing on MIPS" into mnc-dev 2015-06-20 00:31:50 +00:00
Fred Gylys-Colwell
2ba0ab423f am 20b07afa: Merge "Disable Flaky Key Id Length Tests" into mnc-dev
* commit '20b07afad9f3bd814d8b85d8148db7df6536aff7':
  Disable Flaky Key Id Length Tests
2015-06-20 00:11:55 +00:00
John "Juce" Bruce
64d9be5615 Fix OEMCrypto Tests
(This is a merge of http://go/wvgerrit/14810)

By making this constant unsigned, all calculations in EXPECT_ALMOST
were cast to unsigned, leading to underflow problems when it was
subtracted from zero.

Change-Id: Iefc4e30604c45fec8b203375074b26fb12ec385f
2015-06-19 17:08:56 -07:00
Rahul Frias
a1895e7e2e Allow interspersed provisioning attempts to succeed.
merge of http://go/wvgerrit/14807 from the widevine repo.

The mediaDrm API only allows for a single provisioning attempt at a time.
If concurrent provisioning attempts occur, resources are released from
all but the last request, in order to allow at least that one to be successful.

Any provisioning responses received before one from the last request will
be rejected. A side-effect was that all provisioning resources would
then be released. This caused a provisioning response from the last attempt
to be rejected as well. This CL corrects this behavior and releases resources
only if a provisioning attempt is successful.

The side-effect is that, if the response to the last request is not received
or failure occurs while processing, a crypto session may be held until the
next provisioning attempt.

In other cases of concurrency, provisioning responses to requests other than
the last which are received after the last response will be declared successful.

b/21879484

Change-Id: I3a840ceda1a16ee6adb40c2dbca6c4adf3da12c3
2015-06-19 23:40:05 +00:00
John "Juce" Bruce
8443abc555 Re-Add MIPS to Android CDM Build
(This is a merge of http://go/wvgerrit/14795)

This change restores the ability to build the Widevine CDM for Android
for MIPS devices. It restores the precompiled binaries for MIPS and
re-adds MIPS to all makefiles.

This change includes a new build of the obfuscated binaries for
MIPS32r1 that were built using a MIPS device on the emulator.

level3/mips/libwvlevel3.a  Level3 Library Jun 19 2015 12:32:49

Bug: 19482469
Change-Id: Ifa1c299a5751f3772c42289d8333a2b8cec51f69
2015-06-19 16:34:08 -07:00
John "Juce" Bruce
123c469d3e Do Not Use GNU-Style Hashing on MIPS
(This is a merge of http://go/wvgerrit/14801)

The MIPS compiler does not support GNU hashing, which means this
compiler option needs to be excluded.

Bug: 19482469
Change-Id: I913f666a39eb535a33ebfbc49e5e7531115db5d4
2015-06-19 16:33:11 -07:00
John "Juce" Bruce
303a809cf4 Update Widevine Classic to 4.5.0.10139
This restores the MIPS builds of Widevine Classic. All targets are
also built against their respective mini-emulator targets instead of a
specific device, now.

Contains "Use Local libopenssl"
https://widevine-internal-review.googlesource.com/#/c/14606/

Contains "Fix MIPS Build"
https://widevine-internal-review.googlesource.com/#/c/14701/

Contains "Move Classic ARM and x86 Builds to Emulator By Default"
https://widevine-internal-review.googlesource.com/#/c/14741/

Contains "Re-Add MIPS to Android Build Script"
https://widevine-internal-review.googlesource.com/#/c/14746/

Bug: 19200196
Change-Id: Ib2366543746a688dc7b967dab78547b59c0e6315
2015-06-19 16:02:38 -07:00
Fred Gylys-Colwell
20b07afad9 Merge "Disable Flaky Key Id Length Tests" into mnc-dev 2015-06-19 22:27:26 +00:00
Rahul Frias
e82024e0b8 am dcc5cc1e: Merge "Address compiler warning" into mnc-dev
* commit 'dcc5cc1ee13d7fa3383dd0192087962e30dd6e66':
  Address compiler warning
2015-06-19 20:48:34 +00:00
Fred Gylys-Colwell
592f8ad6db Disable Flaky Key Id Length Tests
Merge from widevine directory of http://go/wvgerrit/14784

These tests are not passing on multiple devices so I will disable them
until I am sure they are giving a clear signal.

bug: 21935358
Change-Id: I1e0cf01e64ea50b02d61d4b8334c0efb55e47d35
2015-06-19 13:29:52 -07:00
Rahul Frias
dcc5cc1ee1 Merge "Address compiler warning" into mnc-dev 2015-06-19 19:40:32 +00:00
John "Juce" Bruce
6fb87d1aa6 am 3efe8758: Merge "Be More Forgiving in EXPECT_ALMOST()" into mnc-dev
* commit '3efe87583d905840d9c0e5a53fbf7846b0e24151':
  Be More Forgiving in EXPECT_ALMOST()
2015-06-19 18:48:25 +00:00
John "Juce" Bruce
098e411673 am b0cfa834: Merge "Fail Test if LoadOfflineLicense() Helper Fails" into mnc-dev
* commit 'b0cfa834f1441352c515f1cc504898c3bb5e5a78':
  Fail Test if LoadOfflineLicense() Helper Fails
2015-06-19 18:48:25 +00:00
John "Juce" Bruce
f0b80ffc64 am 89682556: Fix CanSetServiceCertificate Test
* commit '89682556adb5dd2689ca346e66d924b42d0ff848':
  Fix CanSetServiceCertificate Test
2015-06-19 18:48:24 +00:00
John "Juce" Bruce
3efe87583d Merge "Be More Forgiving in EXPECT_ALMOST()" into mnc-dev 2015-06-19 18:20:30 +00:00
John "Juce" Bruce
b0cfa834f1 Merge "Fail Test if LoadOfflineLicense() Helper Fails" into mnc-dev 2015-06-19 18:17:55 +00:00
Rahul Frias
f08d6fae3a Address compiler warning
[ Merge of http://go/wvgerrit/14788 ]

A retired error code was not being handled when converting from
a WVStatus error code to a ERROR_DRM_VENDOR error code.

b/13976775

Change-Id: Ib4363792e4a5e9a20fc718d169b3e0348413267a
2015-06-19 11:14:21 -07:00
John "Juce" Bruce
e0dca7b54a am 968993cd: Allow Clearing of Privacy Cert
* commit '968993cd05b3c4da324a912a6ca3315bac9fc2b9':
  Allow Clearing of Privacy Cert
2015-06-19 18:01:10 +00:00