Commit Graph

1760 Commits

Author SHA1 Message Date
Jeff Tinker
eb9ea09db6 DO NOT MERGE Move legacy widevine classic global lock from framework to
vendor/widevine implementation.

This prevents a hang on contention for the lock if the datasource
read blocks during sniffing.

bug:28888414
Change-Id: I3568a36b9de10b7e977b19f2f6c66106ff784d01
2017-01-07 14:56:36 -08:00
John W. Bruce
1b298c6ec7 NYC-MR2 Widevine Version Number Bump
(This is a merge of go/wvgerrit/22897)

Bumps the Widevine version to 4.2.0 for NYC-MR2 and also updates the
test to expect the NYC-MR2 OS version number.

Bug: 32955300
Test: request_license_test
Change-Id: I2f186928f20e0848cbeef5fef2182045ad27140a
2017-01-05 15:50:31 -08:00
Fred Gylys-Colwell
cc8d6942d6 Merge "Level 3: Throw out keybox with wrong system id *DO NOT MERGE*" into nyc-mr2-dev 2017-01-05 00:55:39 +00:00
Aaron Vaage
37fc42c5b8 Merge "[ OEMCrypto Profiler ] Removed Call Table" into nyc-mr2-dev 2016-12-13 17:41:19 +00:00
Rahul Frias
f77df16bd5 Merge "Address test network issues" into nyc-mr2-dev 2016-12-13 09:18:10 +00:00
Fred Gylys-Colwell
7e7ef2bb58 Level 3: Throw out keybox with wrong system id *DO NOT MERGE*
This CL modifies the haystack code to throw out the keybox if the
system id is wrong.  This should help prevent b/33344450 from
persisting.

Part of this code change was to backport some updates to the haystack
tools on master.

arm/libwvlevel3.a  Level3 Library 4445 Dec  6 2016 16:58:47
x86/libwvlevel3.a  Level3 Library 4464 Dec  6 2016 17:06:21
mips/libwvlevel3.a  Level3 Library 4465 Dec  7 2016 13:36:32

b/33556871

Change-Id: I8dadf4bc7981af6afb970533df61d34b80d133a7
2016-12-12 16:11:08 -08:00
Aaron Vaage
4ad500d878 [ OEMCrypto Profiler ] Removed Call Table
This is a merge of go/wvgerrit/22627

The call table was meant to be a long-term way to track
the performance of all OEMCrypto function calls.

This feature does not get used. Apps that call into the
profiler can generate this from the history.

This change was designed to go into Android O
(go/wvgerrit/22503) but since the Call Table is causing problems
on specific chip sets its being removed in NYC MR2.

Bug: 33550032
Bug: 33459261
Change-Id: I2af417a32452e7d0d0a1ada8794efd849c497dc8
2016-12-12 15:05:07 -08:00
Rahul Frias
dab8aab4a8 Merge "Correct subsample flags in request_license_test" into nyc-mr2-dev 2016-12-05 22:58:51 +00:00
Rahul Frias
9a55ca3249 Release offline release sessions -- DO NOT MERGE
[ Merge of http://go/wvgerrit/21960 ]

When an offline release message is generated, a session is created
internally to generate the release and handle the release response.
If the response is never provided (network, server errors),
or there is an error when the response is being processed, the
session may not be closed. This change introduces a time to live for
release sessions of 60 seconds and will be reclaimed after this period.

b/32223945

Change-Id: I3bd4637733ddf6c343956ed9f97c68d84dc7d4e4
2016-12-02 14:43:53 -08:00
Rahul Frias
e7782c1e27 Correct subsample flags in request_license_test
[ Merge of  http://go/wvgerrit/21980 ]

b/32487750

Change-Id: I5a3c3a768f3d1a81af4e8d897f68cfdbeb3526da
2016-12-01 11:17:59 -08:00
Rahul Frias
3380679886 Address test network issues
[ Merge of http://go/wvgerrit/22140 ]

There are occasional issues when trying to connect to
http://widevine-proxy.appspot.com/proxy . This changes introduces upto
3 retry attempts. The UAT server on appspot is being replaced by UAT on borg
and so it is not worth our while to debug these issues furthur.

b/30022298

Change-Id: I76c1421e93c7c14b5d2bcd7ad07119a705245922
2016-11-10 18:40:10 -08:00
John "Juce" Bruce
2cbe56b613 Update Expected Version Number in Canary
am: 2201d52b4c

Change-Id: I237cf5e36eca0da53ea6507d4e8e1f070884b61d
2016-10-19 23:30:37 +00:00
John "Juce" Bruce
2201d52b4c Update Expected Version Number in Canary
(This is a merge of go/wvgerrit/21580)

The version number for N-MR1 has been increased to 7.1.1, which
triggered our version number canary. Since this is still N-MR1, no
Widevine version number update is necessary as we already updated it for
N-MR1, but the canary needs to be updated.

Bug: 32018966
Change-Id: Ia1d673f837d9c6a5935f26beec7372b25ea3a6b9
2016-10-19 13:36:01 -07:00
Edwin Wong
8c259382b8 DO NOT MERGE Update Classic Widevine libs to 4.5.0.10142. am: 0d1787e5a1 am: 5d4184e85e am: 428a960884 am: 5b8ce1cd64 -s ours am: 2ea811a508 am: 2f58b776ff
am: c71446e166

Change-Id: I386bd00bf5e0aa5151ab9b9f001d01d1e94a9ee8
2016-09-22 23:40:12 +00:00
Edwin Wong
c71446e166 DO NOT MERGE Update Classic Widevine libs to 4.5.0.10142. am: 0d1787e5a1 am: 5d4184e85e am: 428a960884 am: 5b8ce1cd64 -s ours am: 2ea811a508
am: 2f58b776ff

Change-Id: Ifa52d677cb2245f91e45108801a735f7e1b3f481
2016-09-22 21:58:14 +00:00
Edwin Wong
2f58b776ff DO NOT MERGE Update Classic Widevine libs to 4.5.0.10142. am: 0d1787e5a1 am: 5d4184e85e am: 428a960884 am: 5b8ce1cd64 -s ours
am: 2ea811a508

Change-Id: If3714615668b5cad40782f5bff25e5e728633269
2016-09-22 18:09:03 +00:00
Edwin Wong
2ea811a508 DO NOT MERGE Update Classic Widevine libs to 4.5.0.10142. am: 0d1787e5a1 am: 5d4184e85e am: 428a960884
am: 5b8ce1cd64  -s ours

Change-Id: Iffe795854a4cd89f5793746bb84d86ec3b38f2fc
2016-09-22 12:00:46 +00:00
Edwin Wong
5b8ce1cd64 DO NOT MERGE Update Classic Widevine libs to 4.5.0.10142. am: 0d1787e5a1 am: 5d4184e85e
am: 428a960884

Change-Id: If7ecda8b5c07d27da0bf66eb928da5a321890d6d
2016-09-22 11:58:03 +00:00
Edwin Wong
428a960884 DO NOT MERGE Update Classic Widevine libs to 4.5.0.10142. am: 0d1787e5a1
am: 5d4184e85e

Change-Id: I3788141d668dbfd0d3ede873f15589f08fd261bb
2016-09-22 08:14:08 +00:00
Edwin Wong
5d4184e85e DO NOT MERGE Update Classic Widevine libs to 4.5.0.10142.
am: 0d1787e5a1

Change-Id: Ieb5d758c6061dc1d2fbaf78b6ab629064da0f5c7
2016-09-22 00:30:50 +00:00
Edwin Wong
0d1787e5a1 DO NOT MERGE Update Classic Widevine libs to 4.5.0.10142.
Remove openssl external symbols from libssl.a and libcrypto.a.

Widevine repo reference:
https://widevine-internal-review.googlesource.com/#/c/17990/
https://widevine-internal-review.googlesource.com/#/c/18004/

bug: 28013024
Change-Id: I8a6dd5a17f896a65da8209680ef200a953b21e80
2016-09-19 15:17:46 -07:00
Fred Gylys-Colwell
6304a242ae Pull cache flush out of Haystack
am: 84d7185e5f

Change-Id: I1e477c7ed114b97a5fa3d9cccb0bbb427cce2a56
2016-09-12 17:13:32 +00:00
Fred Gylys-Colwell
84d7185e5f Pull cache flush out of Haystack
Merge of http://go/wvgerrit/20924

This CL pulls the cache flush code out of the haystack code and into
the adapter level.  This is so it will be built with processor
specific compiler flags instead of as part of the precompiled binary.

level3/mips/libwvlevel3.a  Level3 Library 4465 Sep 10 2016 21:44:37
level3/arm/libwvlevel3.a  Level3 Library 4445 Sep 10 2016 21:30:01
level3/x86/libwvlevel3.a  Level3 Library 4464 Sep 10 2016 21:49:53

b/30550782 Battery Problems

Change-Id: I8967da498a43cabe82e78345162705dc2fcdb859
2016-09-10 21:55:52 -07:00
Fred Gylys-Colwell
4b380dfb1b Don't Increment IV for Partial Blocks in Unit Tests
am: 3f040e0a9d

Change-Id: I394b1a905ef15ab1f2160d9340d6b92f4d377fdc
2016-09-07 18:39:50 +00:00
Fred Gylys-Colwell
3f040e0a9d Don't Increment IV for Partial Blocks in Unit Tests
Merge from widevine repo of http://go/wvgerrit/20660

For CTR encryption mode, when a subsample ends with partial block that
is continued on the next subsample, both blocks should have the same
IV.  This allows an implementation of OEMCrypto to optimize their
decryption algorithm.

b/31114392

Change-Id: I29a998b00f3bfb12c4bbbcb1fa1ebc371473fefd
2016-09-02 15:51:05 -07:00
John Bruce
d649905cd6 Merge "Widevine Version Number for NYC-MR1" into nyc-mr1-dev
am: 3fbc2106d8

Change-Id: I910b131db94dd9764bda98019fe37c4569172900
2016-09-02 20:15:01 +00:00
John "Juce" Bruce
08a706f1b0 Widevine Version Number for NYC-MR1
am: 15ca8148a8

Change-Id: I6faba922cc7b02cf4e2a7a274cdd554bc294deb1
2016-09-02 20:15:01 +00:00
John Bruce
3fbc2106d8 Merge "Widevine Version Number for NYC-MR1" into nyc-mr1-dev 2016-09-02 20:09:55 +00:00
John Bruce
73a39a6551 Merge "Fix cens Mode in Android CDM" into nyc-mr1-dev
am: bf53608a4e

Change-Id: Icc3ec03853cbb4472d3894e2e339fcfcbb37051b
2016-08-29 21:24:27 +00:00
John "Juce" Bruce
442099fb15 Fix cens Mode in Android CDM
am: e0f4942b8f

Change-Id: Ie043c99a62c6f04c6b5733b47767d8873111a43c
2016-08-29 21:24:27 +00:00
John Bruce
bf53608a4e Merge "Fix cens Mode in Android CDM" into nyc-mr1-dev 2016-08-29 21:19:13 +00:00
John "Juce" Bruce
e0f4942b8f Fix cens Mode in Android CDM
(This is a merge of go/wvgerrit/20500)

This patch removes the logic that calculates the "pattern offset" from
the Android glue layer. There is no such thing as a pattern offset, and
setting this value to anything other than zero may break cens mode on
some devices.

To reduce the risk of setting this value to anything other than zero,
the offset_blocks parameter has been removed from the pattern descriptor
in the CDM Core. It will have to remain part of OEMCrypto v11,
unfortunately, but the code to set it to zero is now centralized in
CryptoSession.

Bug: 28726863
Change-Id: I9c5bfe470fe251c7a57901dc2e998f4dab7fe7d7
2016-08-26 16:02:21 -07:00
John "Juce" Bruce
15ca8148a8 Widevine Version Number for NYC-MR1
(This is a merge of go/wvgerrit/20402)

This updates the version number to v4.1.0 for the NYC-MR1 release. It
also updates the canary to pass on the nyc-mr1-dev branch.

Bug: 30813903
Change-Id: I05de038ff52e9f7633efff7011052b48b59d90fa
2016-08-23 15:34:39 -07:00
Rahul Frias
2b6f90c631 Merge "Do not convert the protection scheme to network byte order" into nyc-mr1-dev
am: 4b8b1e0e98

Change-Id: I59c5c41d5c41686240652e3801195361153a3073
2016-08-23 22:06:56 +00:00
Rahul Frias
fa55cf181b Do not convert the protection scheme to network byte order
am: 6a206191f0

Change-Id: Ic006ef7db422ee164ccd03ec15c79a790513e8bb
2016-08-23 22:06:55 +00:00
Rahul Frias
4b8b1e0e98 Merge "Do not convert the protection scheme to network byte order" into nyc-mr1-dev 2016-08-23 21:55:11 +00:00
Rahul Frias
6a206191f0 Do not convert the protection scheme to network byte order
[ Merge of http://go/wvgerrit/19960 ]

Protections schemes are specified using a 4CC code {"cbc1", "cbcs",
"cenc", "cens"}. A host to network conversion was performed when the
PSSH was created and inserted into the license request. A reverse
conversion was performed when the code was extracted from the
license response.

These conversions are problematic if the PSSH is created externally and
passed into mediaDrm. To address this, the conversions have been removed
and allow protobuf to handle byte ordering. For backward compatibility
we allow codes in either ordering.

b/30713238

Change-Id: I25f01ecc621549fd3c13b443e4c8b89168463249
2016-08-23 12:51:12 -07:00
Rahul Frias
65fe794386 Do not convert the protection scheme to network byte order [DO NOT MERGE ANYWHERE] am: 13a4fe8e4c -s ours am: ae61d10476 -s ours
am: 9ed5a46808  -s ours

Change-Id: I00384796db577b3c8cf6aff6963c7eec5e1ecee4
2016-08-22 22:54:13 +00:00
Rahul Frias
9ed5a46808 Do not convert the protection scheme to network byte order [DO NOT MERGE ANYWHERE] am: 13a4fe8e4c -s ours
am: ae61d10476  -s ours

Change-Id: I32cacb23a6e59bc1db65198f0c441cdeb7491661
2016-08-22 22:06:40 +00:00
Rahul Frias
ae61d10476 Do not convert the protection scheme to network byte order [DO NOT MERGE ANYWHERE]
am: 13a4fe8e4c  -s ours

Change-Id: I42dbfbcb84d2f66fdfbc30c6a1122a5966055ddb
2016-08-22 21:46:02 +00:00
Rahul Frias
13a4fe8e4c Do not convert the protection scheme to network byte order [DO NOT MERGE ANYWHERE]
[ Merge of http://go/wvgerrit/19901 ]

Protections schemes are specified using a 4CC code {"cbc1", "cbcs",
"cenc", "cens"}. A host to network conversion was performed when the
PSSH was created and inserted into the license request. A reverse
conversion was performed when the code was extracted from the
license response.

These conversions are problematic if the PSSH is created externally and
passed into mediaDrm. To address this, the conversions have been removed
and allow protobuf to handle byte ordering. For backward compatibility
we allow codes in either ordering.

b/30713238

Change-Id: I721b375e446526e544856759cada76a1fa6c7be5
2016-08-22 20:49:24 +00:00
Rahul Frias
eeb6606784 Merge \"Upgrade TLS version in integration tests\" into nyc-dev
am: 1ebaf6ad82

Change-Id: I87127e320f65c48c95496815a634c6ad854af58a
2016-06-20 20:02:53 +00:00
Rahul Frias
1ebaf6ad82 Merge "Upgrade TLS version in integration tests" into nyc-dev 2016-06-20 19:55:27 +00:00
Rahul Frias
b552a133c2 Upgrade TLS version in integration tests
[ Merge of http://go/wvgerrit/18295 ]

SSL v3 is being disabled across Google infrastructure. Networking
code in integration tests used SSL v3 during HTTPS protocol negotiation.
Once this is disabled, it will cause integration test failures at
staging and UAT license servers.

With this change the client will use TLS 1.2. Insecure cipher suites
(TLS_RSA_WITH_RC4_128_MD5, TLS_RSA_WITH_RC4_128_SHA,
 TLS_ECDHE_ECDSA_WITH_RC4_128_SHA, TLS_ECDHE_RSA_WITH_RC4_128_SHA)
have been disabled as well.

b/29356581

Change-Id: I98a04d345fe83c48132b9d79986a21cc84827dc8
2016-06-17 22:28:56 -07:00
Jeff Tinker
9b8c6286b6 Merge \"Rework WidevineSamplePlayer to use fragments\" into nyc-dev
am: 02d8671882

Change-Id: I5846eabc3774e616d4334e5f03080ca9e6ed6aaa
2016-06-18 02:01:31 +00:00
Jeff Tinker
02d8671882 Merge "Rework WidevineSamplePlayer to use fragments" into nyc-dev 2016-06-17 21:24:47 +00:00
Jeff Tinker
cb9fc66a34 Update the expected android build version for NYC release
am: 2bd6131162

Change-Id: I27f76c54e3192151ad6d4857dd9ed59bf265760d
2016-06-17 18:25:51 +00:00
Jeff Tinker
2bd6131162 Update the expected android build version for NYC release
bug: 29270537
Change-Id: I2f85dd95e1a2b9eaa79299441b48716599211eea
2016-06-17 00:39:33 +00:00
Jeff Tinker
9f735d298a Rework WidevineSamplePlayer to use fragments
Previously it used TabActivity which has been deprecated
and no longer works.

bug: 29045104

Change-Id: I207f0208b6dba47adfa0ffe7485800d1561af617
2016-06-13 11:27:03 -07:00
Rahul Frias
ce5475169b Report OEMCrypto security patch level
am: e33895f5de

* commit 'e33895f5deccdbb15d3ba028190e07864f326ab2':
  Report OEMCrypto security patch level

Change-Id: Ica7691a9001b29adb55e173ce2876e5a955a0415
2016-05-24 00:38:59 +00:00