widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,482 Commits 2 Branches 0 Tags
199cfb8f1968c9be89258c03000feb08e0afaf4f
Commit Graph

1482 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rahul Frias
199cfb8f19 Make OEM Crypto API version available through mediaDrm properties 
[ Merge of http://go/wvgerrit/15540 ]

b/22771529

Change-Id: I8a3d3b3d7a943c531ef0ff2c860442e0690b9175
 2015-09-08 16:33:58 -07:00
Elliott Hughes
8b0a0ff046 am b4abf77e: Remove manual #include "AndroidConfig.h". 
* commit 'b4abf77efc34e2409b122b65ff6be76216254929':
  Remove manual #include "AndroidConfig.h".
 2015-08-28 20:59:53 +00:00
Elliott Hughes
b4abf77efc Remove manual #include "AndroidConfig.h". 
That file (a) was always forced upon you anyway and (b) no longer
exists.

Change-Id: I5964a0420e9114419b62d5b98e7ecef6c5b48296
(cherry picked from commit c2d4ae15fbbb4ebee364449cf9693566e10d07a1)
 2015-08-28 20:53:41 +00:00
Fred Gylys-Colwell
c94912d197 Compile Level 3 OEMCrypto on Emulators 
Merge from Widevine of http://go/wvgerrit/15507

This change recompiles the oemcrypto libraries on the emulators
because those should have the "least common denomintor" of compiler
options.

New Versions:
android/level3/mips/libwvlevel3.a  Level3 Library Aug 27 2015 11:53:29
android/level3/arm/libwvlevel3.a  Level3 Library Aug 27 2015 11:43:45
android/level3/x86/libwvlevel3.a  Level3 Library Aug 27 2015 11:48:16

bug: 21766765
Change-Id: Ic69bacd71af835df940af1c21166b0ade57abf04
 2015-08-27 11:57:08 -07:00
Rahul Frias
265fa9d9b2 am 178cadfc: am 25a6185c: Address releaseAllSecureStops crash 
* commit '178cadfce145b6164d4ff7c693e996bf1536b98b':
  Address releaseAllSecureStops crash
 2015-08-25 19:09:31 +00:00
Rahul Frias
178cadfce1 am 25a6185c: Address releaseAllSecureStops crash 
* commit '25a6185c8434c62af73d2c6c91bda5fc50d20ca7':
  Address releaseAllSecureStops crash
 2015-08-25 19:05:30 +00:00
Rahul Frias
25a6185c84 Address releaseAllSecureStops crash 
[ Merge of http://go/wvgerrit/15474 ]

Changes to releaseAllSecureStops made use of a session that was
initialized only if getSecureStops had been previously called. If it was not,
accessing the session resulted in a segfault. This was uncovered by a change
in how the Netflix app invoked mediaDrm.

b/23498809

Change-Id: Ib426ae1830c3a42c5e0849f1b6e8bbfe0d2c74ff
 2015-08-25 10:40:12 -07:00
Jeff Tinker
5530a792ab am 85f1e34a: (-s ours) am 6a7d526d: am c48fedc1: (-s ours) am af90b037: am 1827f14b: am c1447241: (-s ours) am 693f0813: am 87922237: DO NOT MERGE Part of fix for libmedia OOB write anywhere 
* commit '85f1e34a1cc63b988744e723cb68343b813a25fe':
  DO NOT MERGE Part of fix for libmedia OOB write anywhere
 2015-08-22 01:38:13 +00:00
Jeff Tinker
85f1e34a1c am 6a7d526d: am c48fedc1: (-s ours) am af90b037: am 1827f14b: am c1447241: (-s ours) am 693f0813: am 87922237: DO NOT MERGE Part of fix for libmedia OOB write anywhere 
* commit '6a7d526def295ed39d58562ca02a46c4801b8eed':
  DO NOT MERGE Part of fix for libmedia OOB write anywhere
 2015-08-22 00:41:21 +00:00
Jeff Tinker
cd628c1b90 am 6d19a7b0: (-s ours) am 6bf90ce0: am cee546e5: (-s ours) am bcf3a11f: am e5d4a0be: DO NOT MERGE Part of fix for libmedia OOB write anywhere 
* commit '6d19a7b031848460004d679c076965959f7604ed':
  DO NOT MERGE Part of fix for libmedia OOB write anywhere
 2015-08-21 17:30:09 +00:00
Jeff Tinker
6d19a7b031 am 6bf90ce0: am cee546e5: (-s ours) am bcf3a11f: am e5d4a0be: DO NOT MERGE Part of fix for libmedia OOB write anywhere 
* commit '6bf90ce0aed049ea6c2aec6085417fb6e234d3b6':
  DO NOT MERGE Part of fix for libmedia OOB write anywhere
 2015-08-21 17:23:46 +00:00
Jeff Tinker
6a7d526def am c48fedc1: (-s ours) am af90b037: am 1827f14b: am c1447241: (-s ours) am 693f0813: am 87922237: DO NOT MERGE Part of fix for libmedia OOB write anywhere 
* commit 'c48fedc14cb0a47bc99db89faf9b875525cd5fab':
  DO NOT MERGE Part of fix for libmedia OOB write anywhere
 2015-08-21 17:01:59 +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
6bf90ce0ae am cee546e5: (-s ours) am bcf3a11f: am e5d4a0be: DO NOT MERGE Part of fix for libmedia OOB write anywhere 
* commit 'cee546e501a3e2c0591f259bb25a114130d58eb0':
  DO NOT MERGE Part of fix for libmedia OOB write anywhere
 2015-08-21 15:58:06 +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
John Bruce
da6a221f91 am 67b5d921: am 0e1839ac: Merge "Do Not Clean Up Licenses As Aggressively" into mnc-dev 
* commit '67b5d9216d192025ffe7d3e2e6ba82d76ee6942d':
  Do Not Clean Up Licenses As Aggressively
 2015-08-20 22:22:28 +00:00
John Bruce
67b5d9216d am 0e1839ac: Merge "Do Not Clean Up Licenses As Aggressively" into mnc-dev 
* commit '0e1839ac4d4b540f46db83684b436d400fe4a292':
  Do Not Clean Up Licenses As Aggressively
 2015-08-20 22:13:15 +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
John Bruce
0e1839ac4d Merge "Do Not Clean Up Licenses As Aggressively" into mnc-dev 2015-08-20 21:21:43 +00:00
Jeff Tinker
f0eb4b9045 am d38fc184: am 1319c433: Part of fix for libmedia OOB write anywhere 
* commit 'd38fc184a7dc544d064d8086f5e72092debaa413':
  Part of fix for libmedia OOB write anywhere
 2015-08-19 23:18:19 +00:00
Jeff Tinker
d38fc184a7 am 1319c433: Part of fix for libmedia OOB write anywhere 
* commit '1319c43361cc8fdd3e2ce61db4185e38f128e76b':
  Part of fix for libmedia OOB write anywhere
 2015-08-19 23:13:05 +00:00
John "Juce" Bruce
1d4339d0df Do Not Clean Up Licenses As Aggressively 
(This is a merge of http://go/wvgerrit/15430)

Previously, after provisioning, any existing offline licenses would be
deleted, as they were inevitably tied to the certificate that was just
replaced. However, due to the way per-origin provisioning works on
Android, this is no longer a safe assumption. Licenses from different
origins are all stored together, so this behavior would delete all
offline licenses across all origins every time any origin is
provisioned. And it is not possible to delete only the licenses for
specific origins without changing how licenses are stored. It is too
late to change how licenses are stored in Android M, so we need to
stop proactively cleaning up licenses in this edge case for now. Once
b/23354606 is resolved, we can reinstate this clean-up and properly
only clean up the licenses associated with the origin that was just
provisioned.

Bug: 23324167
Change-Id: Ic21db8c21bdb4243266cd49020ed52287eb21d9a
 2015-08-19 21:21:44 +00:00
Jeff Tinker
1319c43361 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-17 17:56:27 -07:00
Fred Gylys-Colwell
150a6ea02a am c0455244: am 9a714edc: Merge "Fix RSA Key Padding in OEMCrypto Unit Tests" into mnc-dev 
* commit 'c0455244631e8fd2627a5a95c9d956727b6a162c':
  Fix RSA Key Padding in OEMCrypto Unit Tests
 2015-08-16 03:02:11 +00:00
Fred Gylys-Colwell
c045524463 am 9a714edc: Merge "Fix RSA Key Padding in OEMCrypto Unit Tests" into mnc-dev 
* commit '9a714edc6f6accfda151c2d728e316017d21efb4':
  Fix RSA Key Padding in OEMCrypto Unit Tests
 2015-08-16 02:54:29 +00:00
Fred Gylys-Colwell
9a714edc6f Merge "Fix RSA Key Padding in OEMCrypto Unit Tests" into mnc-dev 2015-08-14 22:01:06 +00:00
Fred Gylys-Colwell
2a8fd110e0 am bb3f9edb: (-s ours) am 631d3e7a: Relax test on forbidden signing [DO NOT MERGE] 
* commit 'bb3f9edb25f03ec54c6c0f2ad9a7215ca35eebcb':
  Relax test on forbidden signing  [DO NOT MERGE]
 2015-08-12 01:33:42 +00:00
Fred Gylys-Colwell
bb3f9edb25 am 631d3e7a: Relax test on forbidden signing [DO NOT MERGE] 
* commit '631d3e7a4c509c9a231959f07f58f311dc038579':
  Relax test on forbidden signing  [DO NOT MERGE]
 2015-08-12 01:25:47 +00:00
Fred Gylys-Colwell
631d3e7a4c Relax test on forbidden signing [DO NOT MERGE] 
Copy from widevine repo of http://go/wvgerrit/15390

Because some devices are failing oemcrypto unit tests related to
signing schemes that they do not support, we are relaxing the
requirement that they return the correct error code.

We are still requiring that the device does NOT sign with a forbidden
scheme.  However, it is OK if they do not return an error code from
OEMCrypto_GenerateRSASignature.   They will be required to return the
correct error code in the next release.

bug: 21668896
bug: 21708882

Change-Id: I1b8a410909b364d0086cba38eadca11aceaac5f6
 2015-08-11 17:05:20 -07:00
Fred Gylys-Colwell
29e08f2166 Fix RSA Key Padding in OEMCrypto Unit Tests 
Merge from widevine of http://go/wvgerrit/15371

incorrectly have leading 0x00 bytes added to all integers.  This
leading 0 should only be added to integers that had a leading byte
larger than 0x80 because those would be parsed as negative numbers.

bug: 23105200
Change-Id: I1dd01cc2b83a807bbdb78c079c6ce4e01d41f616
 2015-08-11 13:52:50 -07:00
Rahul Frias
8fa20543d1 am ae28e741: am 496bfc87: Correct android release version number in tests 
* commit 'ae28e74144eca30363925269391ed1261c7d4d87':
  Correct android release version number in tests
 2015-08-05 07:16:35 +00:00
Rahul Frias
ae28e74144 am 496bfc87: Correct android release version number in tests 
* commit '496bfc87b31fc31d4a04542cb1877d7be28ec911':
  Correct android release version number in tests
 2015-08-05 07:11:32 +00:00
Rahul Frias
496bfc87b3 Correct android release version number in tests 
[ Merge of http://go/wv/15293 ]

b/22916797

Change-Id: I120bae5e656c6d766f8ab7a21d578f17ff22d37a
 2015-08-04 14:59:08 -07:00
Jeff Tinker
4f970c721c Merge "Make widevine sample player assets clickable on TVs" 2015-07-24 05:09:25 +00:00
Jeff Tinker
82c10da53a Make widevine sample player assets clickable on TVs 
bug: 22489517

Change-Id: Ibcc9ea222a3ba04ead12b0fd6eb9049ce5be28d1
 2015-07-23 21:52:01 +00:00
Rahul Frias
bd8b7f231a am 93f5f1cd: am bf100619: Merge "Verification of client identification in Secure Stop messages" into mnc-dev 
* commit '93f5f1cda8986f0455d400bcae348ef2cd024b32':
  Verification of client identification in Secure Stop messages
 2015-07-14 16:52:42 +00:00
Rahul Frias
93f5f1cda8 am bf100619: Merge "Verification of client identification in Secure Stop messages" into mnc-dev 
* commit 'bf10061929aebb2ddf088b4daad42458ac8eefa4':
  Verification of client identification in Secure Stop messages
 2015-07-14 16:30:22 +00:00
Rahul Frias
bf10061929 Merge "Verification of client identification in Secure Stop messages" into mnc-dev 2015-07-13 18:45:18 +00:00
Jeff Tinker
a87caa88bd am 59a9f8e3: am 47014df2: Return specific error code when decrypting on invalid session 
* commit '59a9f8e37eb723780d6f463531a07d00a8b753b2':
  Return specific error code when decrypting on invalid session
 2015-07-08 02:07:29 +00:00
Jeff Tinker
59a9f8e37e am 47014df2: Return specific error code when decrypting on invalid session 
* commit '47014df2e8b8a3bc350a170ae3d15230332a505a':
  Return specific error code when decrypting on invalid session
 2015-07-08 01:37:28 +00:00
Jeff Tinker
47014df2e8 Return specific error code when decrypting on invalid session 
bug: 22235465
Change-Id: I7b4d47d86d35270291ced02112a96800ba03ed1a
 2015-07-07 08:55:22 -07:00
Rahul Frias
12ccd847cf Verification of client identification in Secure Stop messages 
[ Merge of http://go/wvgerrit/14993 ]

b/22047007

Change-Id: I8f3de72f0746fad4a2382a826cb301408398a4c4
 2015-07-06 15:23:24 -07:00
Fred Gylys-Colwell
b1ddcf1495 am 03f523ca: am e280ba6c: Merge "Add Short Key ID Test" into mnc-dev 
* commit '03f523cab014cc3169d603d289dd51f9ca9ee71e':
  Add Short Key ID Test
 2015-07-04 08:04:40 +00:00
Kyle Alexander
c6ff29c6c3 am bc14139f: am 86adf4a2: Add secure VP9 content to GTS content list. 
* commit 'bc14139fc02caad4ded8faa4dbbf7697e50924f2':
  Add secure VP9 content to GTS content list.
 2015-07-04 08:04:40 +00:00