Commit Graph

377 Commits

Author SHA1 Message Date
Aaron Vaage
62c80f89ba Updating asset names link in sample player readme DO NOT MERGE
bug: 25673423
Change-Id: I9fc07f9d65237f0906f97eff6bce47672e38dde3
2015-12-09 23:23:21 +00: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
Edwin Wong
e6ea4ff2d0 Change url to test content page to a more accessible Google URL.
Replace "http://pmweb.widevine.net/html/android/oem.html" with a more
accessible Google URL.

bug: 16630664
Change-Id: I90350ceb11bb9f53dc4c265c910e3a8258ff82a7
2015-06-11 15:31:46 -07:00
Edwin Wong
49ef93ccb3 Update Widevine Classic Library to 4.5.0.10136.
Update license request URL references. Replaces URL ending with
.../GetEMMs.cgi with the new url. Update portal to widevine.

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

bug: 16630664
Change-Id: I7b263c239af75ce35e5c7a0b6856d129ee25332c
2015-06-11 14:59:59 -07:00
Adam Langley
4f01ef23d1 widevine: update to work with BoringSSL.
This change:

1) Switches the Makefiles over to using LOCAL_STATIC_LIBRARIES, which I
understand is the new hotness, rather than setting a -I flag directly.

2) Switches to the non-deprecated _ex versions for EVP_EncryptFinal.

3) Uses the EVP_PKEY interface for checking PSS signatures. This is the
only supported interface in OpenSSL: the PSS padding check functions are
only exported in upstream OpenSSL because it's a library from the 90s
and they don't have a concept of "unexported". Also, by using the EVP
functions, OpenSSL/BoringSSL can do a better job of being constant-time.

Since there aren't any obvious tests for checking that the signtaure
verification still works, I tested with the code in the referenced
paste, which includes both the old and new verification functions and
checks that they both work on a sample signature. (And I also checked
that they both fail when a bit in the signature is changed.)

https://paste.googleplex.com/5747976139964416

Change-Id: Iae7409c53eeea9c3892a32c180d7181d72467dcb
2015-04-01 15:46:54 -07:00
Edwin Wong
bcaec72285 Fix "Cannot play downloaded content without WIFI".
Update Widevine Classic Library to 4.5.0.10133, built from
601_AndroidOS_M.
https://widevine-internal-review.googlesource.com/#/c/13060/

bug: 19090240
Change-Id: I2dab56b485e109658230019205b58b1ab8fbb155
2015-02-24 11:07:55 -08:00
Dan Albert
93e1acb958 Remove Widevine Classic Dependency on STLPort
* Move some libraries that were being built with the NDK but
   statically included into platform code off the NDK.
 * Update the prebuilt Widevine Classic binaries to 4.5.0.10131.

Bug: 15193147
Change-Id: I93f356a97c9c92c1f14c00e7420b941b1bb4357e
2015-02-20 14:33:42 -08:00
Narayan Kamath
fc2b694b4f Declare explicit dependency org.apache.http.legacy.
This is required because these makefiles contain a module that's
building agains the "current" SDK and will need to add an explicit
compile time dependency on the apache API.

Note that no runtime dependency is needed because the app targets
SDK version 12 (?!!).

bug: 18027885
Change-Id: I37587b91f9c52f88a8becce0449ac9b24a77fdad
2015-02-05 12:50:05 +00:00
Jeff Tinker
a27ad0329b am d7907f03: am 1a5103c7: Include WV classic L3 libraries for x86 in Lollipop branches
* commit 'd7907f03b40a8a3e74fe6a837af676df486aea18':
  Include WV classic L3 libraries for x86 in Lollipop branches
2015-01-15 01:39:19 +00:00
Jeff Tinker
d7907f03b4 am 1a5103c7: Include WV classic L3 libraries for x86 in Lollipop branches
* commit '1a5103c739ebcac21799406a721cff2974a9852a':
  Include WV classic L3 libraries for x86 in Lollipop branches
2015-01-15 00:45:12 +00:00
Jeff Tinker
1a5103c739 Include WV classic L3 libraries for x86 in Lollipop branches
bug: 18985145
Change-Id: I659c10b33dc79bf44a6da907d168e1ef61df2172
2015-01-14 12:21:51 -08:00
Edwin Wong
7ed523af2b am 61db5926: Update Widevine Classic Library to 4.5.0.10128.
* commit '61db592610f1a59085799e04df418e249038b588':
  Update Widevine Classic Library to 4.5.0.10128.
2014-12-26 20:30:11 +00:00
Edwin Wong
61db592610 Update Widevine Classic Library to 4.5.0.10128.
Fix "cannot play pinned movie after upgrade bug".
https://widevine-internal-review.googlesource.com/#/c/12160/

bug: 18136076
Change-Id: If14273fcb74e234618a2b450cc0affbbeca0d28f
2014-12-22 11:18:47 -08:00
Jeff Tinker
b4cd98c39d am 07478a67: Ensure terminate is called in all error cases
* commit '07478a67cb9e291e60be3dea8eb70b716568ba1f':
  Ensure terminate is called in all error cases
2014-12-12 21:49:17 +00:00
Jeff Tinker
07478a67cb Ensure terminate is called in all error cases
bug: 18203007
Change-Id: I0d74b348982992075ec126a324dabbff8fab9125
2014-12-11 19:27:50 -08:00
Chong Zhang
4e600be65a am 0c752509: Merge "widevine: return -EAGAIN sooner in non-blocking mode" into lmp-mr1-dev
* commit '0c7525090f326a712724f864224323080a4cf026':
  widevine: return -EAGAIN sooner in non-blocking mode
2014-12-08 19:35:08 +00:00
Chong Zhang
35b42afd0f widevine: return -EAGAIN sooner in non-blocking mode
Bug: 18536934

Change-Id: Ib9344851fceb418a2e614e966c981a997c32c466
2014-12-05 11:33:00 -08:00
Dan Albert
670993262f Fix build.
This project is still using stlport (without telling the build system
about it), which was causing (broken) stlport headers to override
libc++ headers, leading to a broken copy of std::enable_if, which in
turn caused <atomic> to fail to compile. Since this project has
prebuilts that will need to be updated before this project can
actually move away from stlport, tell the build system that it is
still using stlport for now.

Bug: 18433002
Change-Id: I38b356428977ed2184eb28a07bd5e7424a4ace8d
(cherry picked from commit de4bc34719)
2014-11-26 03:05:50 +00:00
Alvin Huang
fb651077ba Try to fix the build break caused by WVMExtractorImpl.cpp
Merge of https://partner-android-review.googlesource.com/#/c/186263

bug: 18279011

Change-Id: I6d4482827b17ea671a4bd73ab79486583a83fcbf
2014-11-06 21:59:37 +00:00
Jeff Tinker
b3650a9661 Ensure crypto gets terminated on error.
Change-Id: If5ade69f98eb4511064b649fa5a8544065753d97
related-to-bug: 17062671
2014-10-18 00:48:54 +00:00
Jeff Tinker
e82044e05d Report WOULD_BLOCK if buffer is non-empty instead of ERROR_IO
Bug: 17423087
Change-Id: I4b1c5ead919649be3b820f63a030acac729fb06e
2014-09-25 01:39:29 +00:00
Edwin Wong
7bf1daa432 Update Widevine classic integration guide.
Update "Deliverables" section.

Bug: 17405306
Change-Id: I0532aeee7b634c0a13b930efe2dbe8c7e264e561
2014-09-11 18:29:53 -07:00
Edwin Wong
c6723c564a Remove Widevine Classic MediaCodec mode from application.
bug: 17303948
Change-Id: Ia0db7be1d99f8fab968641cbf57438ee1dd364ab
2014-09-03 18:06:00 -07:00
Edwin Wong
96721d7145 Update Widevine Classic Library to 4.5.0.10127.
Add openssl-0.9.8za.
https://widevine-internal-review.googlesource.com/#/c/10828/

Update openssl lib to 0.9.8za.
https://widevine-internal-review.googlesource.com/#/c/10862/

Update Version string to 601_AndroidOS_L.
https://widevine-internal-review.googlesource.com/#/c/10950/

Fix Build On lmp-dev.
https://widevine-internal-review.googlesource.com/#/c/10837/

Translate widevine:// Protocol In getConstrains() and checkRightsStatus().
https://widevine-internal-review.googlesource.com/#/c/10838/

Convert "widevine:" prefix for lm->Register() as well.
https://widevine-internal-review.googlesource.com/#/c/11080/

bug: 9835684
bug: 15932110

Change-Id: I1f996355cf13ffca8d0b6ed464aa7b59b5fe4458
2014-09-03 20:55:34 +00:00
Edwin Wong
5800ecc15e Revert "Remove Widevine Classic MediaCodec mode from application."
This reverts commit a9071cd4bd.

Change-Id: Ibbfc30579bb665a18fa98cc453df956ea7c4e558
2014-08-29 13:29:40 +00:00
Edwin Wong
a9071cd4bd Remove Widevine Classic MediaCodec mode from application.
Hide MediaCodec mode for Build.VERSION_CODES.L and forward.

bug: 17303948
Change-Id: Iae8381ee67950a3f0c1bb9e273e3e45be24a3352
2014-08-27 18:39:06 -07:00
Lajos Molnar
174a218b30 Support nonblocking reads for secure source (video)
Bug: 15699665
Change-Id: If67c3196b42b24333ace1373711dc3f4eb30f0da
2014-07-17 20:32:28 -07:00
Jeff Tinker
8a8feb747c am ccc0ebc4: am ec3cf9d1: am 54155e3d: am 9a9da0e0: Update license and content server URLs due to server migration.
* commit 'ccc0ebc470f2178339ff7c18a38ff2f763011edc':
  Update license and content server URLs due to server migration.
2014-06-19 00:40:40 +00:00
Jeff Tinker
54155e3d68 am 9a9da0e0: Update license and content server URLs due to server migration.
* commit '9a9da0e040ee73fb38375e0a27be4e021d8887d5':
  Update license and content server URLs due to server migration.
2014-06-19 00:23:09 +00:00
Jeff Tinker
9a9da0e040 Update license and content server URLs due to server migration.
Only affects OEM integration tests, not production code.

bug: 15600077
Change-Id: Id534cec663366f639d934baf8d366615a2d97b64
(cherry picked from commit a53677d27c)
2014-06-17 11:46:37 -07:00
Jeff Tinker
2a5754f338 Revert "Update license and content server URLs due to server migration."
This reverts commit a53677d27c.

Change-Id: I9afbc9aa95cc0cf518ef1fd378dccdc5874afaa4
2014-06-17 17:59:40 +00:00
Jeff Tinker
a53677d27c Update license and content server URLs due to server migration.
Only affects OEM integration tests, not production code.

bug: 15600077
Change-Id: Id534cec663366f639d934baf8d366615a2d97b64
2014-06-13 14:09:31 -07:00
Edwin Wong
0b6b0372c0 am f6dd49f0: am 9ba13504: am cf4cd549: am 1c68225d: am 50bfcfdb: am e8fbb466: am 8daed73e: am 4f962df0: am c1dee5d8: am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test.
* commit 'f6dd49f04a81cde7d4e241c15f8b2b2328bf9d9e':
  Fixed intermittent failure in GTS test.
2014-06-11 22:51:28 +00:00
Edwin Wong
cf4cd54924 am 1c68225d: am 50bfcfdb: am e8fbb466: am 8daed73e: am 4f962df0: am c1dee5d8: am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test.
* commit '1c68225dac88b0fe75b11a651613dc776f471ea8':
  Fixed intermittent failure in GTS test.
2014-06-11 22:35:46 +00:00
Edwin Wong
1c68225dac am 50bfcfdb: am e8fbb466: am 8daed73e: am 4f962df0: am c1dee5d8: am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test.
* commit '50bfcfdbf8218fe878d5c135a27879d8977c5092':
  Fixed intermittent failure in GTS test.
2014-06-11 22:25:08 +00:00
Edwin Wong
8daed73ef7 am 4f962df0: am c1dee5d8: am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test.
* commit '4f962df0b93564d3dbf62855279e2ea2ac4f1191':
  Fixed intermittent failure in GTS test.
2014-06-11 22:15:56 +00:00
Edwin Wong
4f962df0b9 am c1dee5d8: am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test.
* commit 'c1dee5d84735b41dfd92f956418b833e1842a2be':
  Fixed intermittent failure in GTS test.
2014-06-11 22:12:24 +00:00
Edwin Wong
c1dee5d847 am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test.
* commit '35ebeec71f3f0d0b763f1ef8cf3b98bae2aeee2e':
  Fixed intermittent failure in GTS test.
2014-06-11 22:08:36 +00:00
Edwin Wong
35ebeec71f am f6ffee47: Fixed intermittent failure in GTS test.
* commit 'f6ffee472c33b85d21c820862c398406e1c964b5':
  Fixed intermittent failure in GTS test.
2014-06-11 22:05:25 +00:00
Edwin Wong
f6ffee472c Fixed intermittent failure in GTS test.
Need to clear mEncKey in constructor, otherwise, decrypted data is wrong.

bug: 15540382
Change-Id: I0e2d4d6edd8a5800fa2a36e9f258782edc493e13
2014-06-11 11:39:28 -07:00
Jeff Tinker
8611de4ead Fix AUPT: Native crash in /system/bin/mediaserver
Protect against invalid memcpy to NULL

bug: 15163357
Change-Id: Ifab17714473f45cb714a0ee765638733b3236ec8
2014-05-30 17:06:13 -07:00
Jeff Tinker
6f35b0b86c Fix multilib issues
Change-Id: I069c8681d2b25221e8767db9437dbfded5618283
2014-05-21 22:25:02 +00:00
Colin Cross
ad27688791 cryptoPlugin: only build libwvdecryptcommon for 32-bit
WVCryptoPlugin::decrypt stores a pointer in a uint32, so it cannot
be built for 64-bit until the api is changed.  Force it to only
build for 32-bit for now.

Also set -Wno-unused-parameter to silence unnecessary warnings
so I can see the build error.

Change-Id: I7cc13cc1d8a06b17468fab6f3b28886f9af02e24
2014-05-05 18:48:18 -07:00
Edwin Wong
e17c61edb1 am ebce9a58: am 7eb1a295: am 77fcf29b: am 35c8fc94: am 15d45e0c: am 8ca56c3f: am 01403eff: am c9c20cc6: am 62d84540: am 1825fda8: am 96449440: Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
* commit 'ebce9a58de23c0883fb4f5d02bc4c699d697e87a':
  Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 18:37:20 +00:00
Edwin Wong
77fcf29b15 am 35c8fc94: am 15d45e0c: am 8ca56c3f: am 01403eff: am c9c20cc6: am 62d84540: am 1825fda8: am 96449440: Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
* commit '35c8fc94708ea1a476014035b66d372051d509db':
  Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 18:23:11 +00:00
Edwin Wong
35c8fc9470 am 15d45e0c: am 8ca56c3f: am 01403eff: am c9c20cc6: am 62d84540: am 1825fda8: am 96449440: Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
* commit '15d45e0c77c6bd6f7f6931957b254b01339d69ea':
  Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 18:13:18 +00:00
Edwin Wong
01403eff12 am c9c20cc6: am 62d84540: am 1825fda8: am 96449440: Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
* commit 'c9c20cc64803bf885746b3c9ebe6b8f19bff9bfd':
  Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 18:05:17 +00:00
Edwin Wong
c9c20cc648 am 62d84540: am 1825fda8: am 96449440: Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
* commit '62d845404c0b5cfb5bb0e0e3f4fcd12970a5ba72':
  Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 18:01:34 +00:00
Edwin Wong
62d845404c am 1825fda8: am 96449440: Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
* commit '1825fda8fda9c5037cacc175f3d2ef1579fd7cb0':
  Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 17:59:32 +00:00
Edwin Wong
1825fda8fd am 96449440: Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
* commit '964494409f2ce720557eb617ef44caf9ac10c05d':
  Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 17:56:16 +00:00