Aaron Vaage
032652fa0f
Updating asset names link in sample player readme DO NOT MERGE
...
am: ba25949152
2015-12-16 22:06:33 +00:00
Aaron Vaage
ba25949152
Updating asset names link in sample player readme DO NOT MERGE
...
bug: 25673423
Change-Id: Ic394701da976371bbd2cb68074c3473f803624e6
2015-12-09 23:24:07 +00:00
Edwin Wong
c37606b47b
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68 am: 1afb1066cc am: 2253f6c392 am: 10b2b36a1e am: de6d223b82 am: 3b3b609173
...
am: 3efbeb28d7
2015-10-20 04:57:44 +00:00
Edwin Wong
fdc1ab381d
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d am: 2ee45a97b0 am: ac1854b989 am: fc1240bdc2 am: 4c2eb98d09
...
am: a69baa961a
2015-10-20 04:57:41 +00:00
Edwin Wong
3efbeb28d7
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68 am: 1afb1066cc am: 2253f6c392 am: 10b2b36a1e am: de6d223b82
...
am: 3b3b609173
2015-10-20 04:31:52 +00:00
Edwin Wong
a69baa961a
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d am: 2ee45a97b0 am: ac1854b989 am: fc1240bdc2
...
am: 4c2eb98d09
2015-10-20 04:30:09 +00:00
Edwin Wong
3b3b609173
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68 am: 1afb1066cc am: 2253f6c392 am: 10b2b36a1e
...
am: de6d223b82
2015-10-20 04:28:23 +00:00
Edwin Wong
4c2eb98d09
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d am: 2ee45a97b0 am: ac1854b989
...
am: fc1240bdc2
2015-10-20 04:26:43 +00:00
Edwin Wong
de6d223b82
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68 am: 1afb1066cc am: 2253f6c392
...
am: 10b2b36a1e
2015-10-20 04:26:42 +00:00
Edwin Wong
fc1240bdc2
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d am: 2ee45a97b0
...
am: ac1854b989
2015-10-20 04:24:53 +00:00
Edwin Wong
10b2b36a1e
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68 am: 1afb1066cc
...
am: 2253f6c392
2015-10-20 04:24:53 +00:00
Edwin Wong
ac1854b989
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d
...
am: 2ee45a97b0
2015-10-20 04:23:06 +00:00
Edwin Wong
2253f6c392
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68
...
am: 1afb1066cc
2015-10-20 04:23:06 +00:00
Edwin Wong
2ee45a97b0
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1
...
am: d5a1d5d58d
2015-10-20 04:21:24 +00:00
Edwin Wong
1afb1066cc
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905
...
am: ee415b7b68
2015-10-20 04:14:58 +00:00
Edwin Wong
d5a1d5d58d
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71
...
am: 5754438dc1
2015-10-20 04:13:17 +00:00
Edwin Wong
ee415b7b68
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968
...
am: 94dab9e905
2015-10-20 04:13:17 +00:00
Edwin Wong
5754438dc1
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e
...
am: 9617db4d71
2015-10-20 04:11:35 +00:00
Edwin Wong
94dab9e905
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03
...
am: 655574d968
2015-10-20 04:11:35 +00:00
Edwin Wong
655574d968
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d
...
am: 27133e7a03
2015-10-20 04:08:24 +00:00
Edwin Wong
9617db4d71
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev.
...
am: f78b0e780e
2015-10-20 04:08:23 +00:00
Edwin Wong
f78b0e780e
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev.
...
Change-Id: I3a89161de0bf84fc6257338a3e932b90feba3f82
2015-10-19 20:59:36 -07:00
Edwin Wong
27133e7a03
resolve merge conflicts of fea63b4062 to jb-mr1-dev.
...
am: f7c043f32d
2015-10-20 02:59:35 +00:00
Edwin Wong
c0b8030851
resolve merge conflicts of 769288d009 to jb-mr1.1-docs.
...
Change-Id: I26df84f2907bcd18a2646bec0fbe53d9624e5a9b
2015-10-19 18:32:07 -07:00
Edwin Wong
f7c043f32d
resolve merge conflicts of fea63b4062 to jb-mr1-dev.
...
Change-Id: Ia5dd0316bb057dbc2e185f720d194548d2a370a6
2015-10-19 18:22:48 -07:00
Fred Gylys-Colwell
a57b5cf88b
am 4d34e02b: Clarify HDCP Type (lmp-mr1-dev branch) DO NOT MERGE
...
* commit '4d34e02b86a37aaf3c1630618d4a0b91ff1fc709':
Clarify HDCP Type (lmp-mr1-dev branch) DO NOT MERGE
2015-10-03 15:28:19 +00:00
Fred Gylys-Colwell
4d34e02b86
Clarify HDCP Type (lmp-mr1-dev branch) DO NOT MERGE
...
This is a documentation change only.
Merged from widevine repo of http://go/wvgerrit/15737
This CL updates the docs for OEMCrypto to clarify that HDCP v2.2
should be type 1. The document version number is rolled to 9.1.
See Version 9 copy of original document for version history:
https://docs.google.com/document/d/1hiZ7wsZ_IkL5GvmjaUx3wffs8mI0xsfHZ6f9J-BOaC8/edit#
bug: 24098055
Change-Id: I084d86e44c60a5810fa448364003f7464e30bfb2
2015-10-01 20:27:10 +00:00
Jeff Tinker
c48fedc14c
am af90b037: am 1827f14b: am c1447241: (-s ours) am 693f0813: am 87922237: DO NOT MERGE Part of fix for libmedia OOB write anywhere
...
* commit 'af90b037a4baa6e12ee2399c85c7e3d4b592498e':
DO NOT MERGE Part of fix for libmedia OOB write anywhere
2015-08-21 16:55:19 +00:00
Jeff Tinker
af90b037a4
am 1827f14b: am c1447241: (-s ours) am 693f0813: am 87922237: DO NOT MERGE Part of fix for libmedia OOB write anywhere
...
* commit '1827f14b689c909973d8e859c8a7a00db7044bd7':
DO NOT MERGE Part of fix for libmedia OOB write anywhere
2015-08-21 16:40:47 +00:00
Jeff Tinker
1827f14b68
am c1447241: (-s ours) am 693f0813: am 87922237: DO NOT MERGE Part of fix for libmedia OOB write anywhere
...
* commit 'c14472413260a6b233282a6ff3acb58b6571ab5c':
DO NOT MERGE Part of fix for libmedia OOB write anywhere
2015-08-21 16:27:34 +00:00
Jeff Tinker
cee546e501
am bcf3a11f: am e5d4a0be: DO NOT MERGE Part of fix for libmedia OOB write anywhere
...
* commit 'bcf3a11f0fe87ef7b56c374ed89b91ed8a17f44b':
DO NOT MERGE Part of fix for libmedia OOB write anywhere
2015-08-21 15:46:33 +00:00
Jeff Tinker
c144724132
am 693f0813: am 87922237: DO NOT MERGE Part of fix for libmedia OOB write anywhere
...
* commit '693f0813814b10bfd23bea578fa258255477b207':
DO NOT MERGE Part of fix for libmedia OOB write anywhere
2015-08-21 15:36:22 +00:00
Jeff Tinker
bcf3a11f0f
am e5d4a0be: DO NOT MERGE Part of fix for libmedia OOB write anywhere
...
* commit 'e5d4a0be30bac8fdba7194841084dcf61be6e8a2':
DO NOT MERGE Part of fix for libmedia OOB write anywhere
2015-08-21 15:34:51 +00:00
Jeff Tinker
693f081381
am 87922237: DO NOT MERGE Part of fix for libmedia OOB write anywhere
...
* commit '87922237de893b92c7b4d252999dd91d04470bd0':
DO NOT MERGE Part of fix for libmedia OOB write anywhere
2015-08-21 15:28:57 +00:00
Jeff Tinker
e5d4a0be30
DO NOT MERGE Part of fix for libmedia OOB write anywhere
...
Prevent usage of client provided address on
non-secure devices spoofed as being secure.
b/23223325
merge of go/wvgerrit/15420 from widevine repo
Change-Id: I1d4f3a652b3d5e78fca508f92005cfa8df5ec6db
2015-08-20 21:56:50 +00:00
Jeff Tinker
87922237de
DO NOT MERGE Part of fix for libmedia OOB write anywhere
...
Prevent usage of client provided address on
non-secure devices spoofed as being secure.
b/23223325
merge of go/wvgerrit/15420 from widevine repo
Change-Id: I1d4f3a652b3d5e78fca508f92005cfa8df5ec6db
2015-08-20 14:49:43 -07:00
Adam Langley
f934d6fb41
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
(cherry picked from commit 4f01ef23d1
2015-04-18 09:46:53 -07:00
Fred Gylys-Colwell
7416795401
am 802fe3b3: Lock session list in CdmEngine OnTimerEvent
...
* commit '802fe3b35c42975cad30b947903e002500f2a6c7':
Lock session list in CdmEngine OnTimerEvent
2015-02-11 20:04:44 +00:00
Fred Gylys-Colwell
802fe3b35c
Lock session list in CdmEngine OnTimerEvent
...
This is a copy of the widevine CL:
https://widevine-internal-review.googlesource.com/#/c/12742/
If a session is closed at the same time as an OnTimerEvent is
processing an event, there could be a race condition between the two
threads. This CL adds a lock that prevents a session from being
removed from the list while the timer is currently processing an
event.
If CloseSession is called while the OnTimerEvent method is active, the
session will be added to a dead list, and deleted when the timer event
has finished.
This CL does not address the main problem in bug 19252886, but
one bugreport, netflix_log_3.txt, indicates there may have been
a problem with the CDM timer.
bug: 19252886
Change-Id: I17190edaeb3eef1295d4d204232cc4262cb5fa9b
2015-02-10 20:11:57 -08:00
Fred Gylys-Colwell
6a61416822
am 6408ce05: am 1514ae0d: Terminate Level 1 OEMCrypto on Initialization Error
...
* commit '6408ce05d4121ec526b6e9ddcce4a26dc850324c':
Terminate Level 1 OEMCrypto on Initialization Error
2015-01-23 08:45:40 +00:00
Jeff Tinker
173e6031f3
am 8961cd24: Fix for zero-sized corrupted license files
...
* commit '8961cd2404b7064d69288b5572ffd0d454004280':
Fix for zero-sized corrupted license files
2015-01-23 08:45:27 +00:00
Fred Gylys-Colwell
6408ce05d4
am 1514ae0d: Terminate Level 1 OEMCrypto on Initialization Error
...
* commit '1514ae0dfb1f2e5fdfea2ef022f727f76d43e68f':
Terminate Level 1 OEMCrypto on Initialization Error
2015-01-23 02:11:59 +00:00
Jeff Tinker
8961cd2404
Fix for zero-sized corrupted license files
...
Netflix reported that after pulling power while their app is active,
the app isn't able to restart. This is because the license file for
session keys isn't getting synched to disk, so the data is still in
the buffer cache when the device shuts down. Calling fflush and fsync
on the file ensures the data is persisted to disk. fclose alone
doesn't do fsync.
In testing, I also noticed that the license file was being rewritten
every second which is hard on the flash filesystem. The timer thread
was modified to avoid these frequent writes.
Merge of https://widevine-internal-review.googlesource.com/#/c/12431/
from the widevine cdm repo.
bug: 19108207
Change-Id: Ibe81e40a3c1f5d25563523da43fefdccdaa6ddcf
2015-01-22 16:20:31 -08:00
Fred Gylys-Colwell
1514ae0dfb
Terminate Level 1 OEMCrypto on Initialization Error
...
Cherry pick of the widevine change
https://widevine-internal-review.googlesource.com/#/c/12082/
If the level 1 oemcrypto library loads and initializes, but has the
wrong version or does not have a valid keybox, then the level 3
fallback is used. However, in those cases, the level 1 was not
terminated properly. This caused a resource leak on some platforms.
With this CL, in OEMCrypto_Initialize, the level 1 library Terminate
is called if its Initialize was called and the level 1 library will
not be used.
bug: 18755226
Change-Id: I56e7d3349eeebd94f3fa8c4a1f4b21781cc7428b
(cherry picked from commit 62a9cf3cbe
2015-01-23 00:08:10 +00:00
Rahul Frias
ab3ffa9a55
am 6e4896e8: Merge "Corrections to license policy handling and reporting" into lmp-mr1-dev
...
* commit '6e4896e8ba52192a731eab19f454a1f51544dbab':
Corrections to license policy handling and reporting
2015-01-17 11:46:40 +00:00
Rahul Frias
6e4896e8ba
Merge "Corrections to license policy handling and reporting" into lmp-mr1-dev
2015-01-17 11:35:22 +00:00
Rahul Frias
db1382e0a3
Corrections to license policy handling and reporting
...
If a key query occurred before a license was received an UNKNOWN_ERROR was
returned. This now succeeds but returns no information (an empty container).
Also licenses that were already expired when received were not marked as such.
This did not cause violations in playback rules but caused an exception when
they were queried.
[ Merge of https://widevine-internal-review.googlesource.com/#/c/12300
from wv git repo ]
b/18843625
Change-Id: I6990765c15e519ddf203a2fd8f0a130306f090a6
2015-01-16 14:48:57 -08:00
Jeff Davidson
6eb74fe6a0
Remove references to protobuf 2.3.0.
...
Change-Id: I08b9e6441e26083cf182402916288ae073425f9c
(cherry picked from commit dfab729fd7
2015-01-15 23:32:02 +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
