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

1931 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rahul Frias
b21a992969 Report OEMCrypto security patch level am: e33895f5de am: ce5475169b 
am: a914f6d31f

* commit 'a914f6d31f6bc15be56ea745f5632bcb8425d20a':

Change-Id: Iacfe7fecdfe71d497eeb39e20dbe5db7b0e32120
 2016-05-24 00:55:13 +00:00
Rahul Frias
f3226af44a Report OEMCrypto security patch level am: e33895f5de am: 1f7aa66d54 
am: bdbd5c2d55

* commit 'bdbd5c2d55c9065ebe18e6a0385fb5f309ebd7eb':
  Report OEMCrypto security patch level

Change-Id: Iada6d2e029561b1399f6cd31421fd97a85b6e6e0
 2016-05-24 00:55:12 +00:00
Rahul Frias
a914f6d31f Report OEMCrypto security patch level am: e33895f5de 
am: ce5475169b

* commit 'ce5475169beb3e8b6c997f6bcbdb2c423c815a0c':

Change-Id: I2a320cb952f0e0c953c6e98f7811b0ea0c5f8b4d
 2016-05-24 00:47:14 +00:00
Rahul Frias
bdbd5c2d55 Report OEMCrypto security patch level am: e33895f5de 
am: 1f7aa66d54

* commit '1f7aa66d54272825dc70055154d10c5b46f1daf1':
  Report OEMCrypto security patch level

Change-Id: Icb84ff94201b4dce5aac24ffe22a6ed766352cc2
 2016-05-24 00:47:03 +00: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
Rahul Frias
1f7aa66d54 Report OEMCrypto security patch level 
am: e33895f5de

* commit 'e33895f5deccdbb15d3ba028190e07864f326ab2':
  Report OEMCrypto security patch level

Change-Id: I377b697ebae8beee5679d71cf9233e15d95d65c3
 2016-05-24 00:38:59 +00:00
Rahul Frias
e33895f5de Report OEMCrypto security patch level 
[ Merge of http://go/wvgerrit/17959 ]

This will allow the license server to base licensing decisions on the
devices security module revision.

b/28882058

Change-Id: I574e7686bb305397946d2bfaff504cfae242e628
 2016-05-23 10:50:07 -07:00
Fred Gylys-Colwell
f506faa134 Remove pattern offset tests am: 0b2223018d am: 6db197210f 
am: 9c0a4890e0

* commit '9c0a4890e00eeb397ee4ae06edbaa0ad39dc69e0':

Change-Id: I26b96f442d486d5c77a2e7a20436a8794752ecbe
 2016-05-20 00:27:43 +00:00
Fred Gylys-Colwell
eb0fbee336 Remove pattern offset tests am: 0b2223018d am: b65344398c 
am: eb575aabd4

* commit 'eb575aabd4d9d8e3354bd5202aff8da8675a4770':
  Remove pattern offset tests

Change-Id: I0f242dd727bea454089ad1ff288c05cccd66acab
 2016-05-20 00:27:42 +00:00
Fred Gylys-Colwell
9c0a4890e0 Remove pattern offset tests am: 0b2223018d 
am: 6db197210f

* commit '6db197210f9e654f0512db5a14d2f0b60bec4e33':

Change-Id: I64f81d86dbfbd68505424f5227f3e3a6dbc67ae2
 2016-05-19 21:56:11 +00:00
Fred Gylys-Colwell
eb575aabd4 Remove pattern offset tests am: 0b2223018d 
am: b65344398c

* commit 'b65344398c599d855ac3e518da1c97426ea708e3':
  Remove pattern offset tests

Change-Id: I3715459882fb2146c8f5ecc410f60e72489c937a
 2016-05-19 21:55:33 +00:00
Fred Gylys-Colwell
6db197210f Remove pattern offset tests 
am: 0b2223018d

* commit '0b2223018dd2901e1d5e68d2a5f238bba9ba79ed':
  Remove pattern offset tests

Change-Id: I2e94ef907230119f1e728942a5b8b8537c836e3f
 2016-05-19 21:53:34 +00:00
Fred Gylys-Colwell
b65344398c Remove pattern offset tests 
am: 0b2223018d

* commit '0b2223018dd2901e1d5e68d2a5f238bba9ba79ed':
  Remove pattern offset tests

Change-Id: I1a9709a7dd092d13508fca20f871ab71a43a5af1
 2016-05-19 21:53:04 +00:00
Fred Gylys-Colwell
0b2223018d Remove pattern offset tests 
Merge from widevine repo of http://go/wvgerrit/17877

The final spec for CENC says that partial encrypted blocks are only
allowed for "cenc" mode, and not for "cens" mode.  Also, the
pattern_offset must be 0 for all calls to OEMCrypto_DecryptCENC.

Review doc changes http://go/wvdelta11 and http://go/oemcrypto

Notice that this CL affects documentation and test code only.  No
production code is affected.

b/28718266
b/28817376

Change-Id: I1d6a38a763a2b693ea0c26bc909e1c721b8facaf
 2016-05-17 15:15:18 -07:00
Fred Gylys-Colwell
141efce83d Merge "Merge "Push android unit tests to /data" into nyc-dev am: 1f204c5cfa am: bba11c61a2" into nyc-mr1-dev-plus-aosp 
am: e98708b4db

* commit 'e98708b4db3b61ab337825de95f7352ff1714147':

Change-Id: I7a21858565cd3cee4cdf26ca380187868602d13c
 2016-05-03 15:56:31 +00:00
Fred Gylys-Colwell
1bb7826005 Merge "Push android unit tests to /data" into nyc-dev am: 1f204c5cfa am: 5a16e85da5 
am: d88ed151aa

* commit 'd88ed151aa3c78b62a83d53908199bd8f59eb852':
  Push android unit tests to /data

Change-Id: I2c2f85ac2e22f474519d3a49db52763191a19d7a
 2016-05-03 15:56:31 +00:00
Android Build Merger (Role)
e98708b4db Merge "Merge "Push android unit tests to /data" into nyc-dev am: 1f204c5cfa am: bba11c61a2" into nyc-mr1-dev-plus-aosp 2016-05-03 15:54:02 +00:00
Fred Gylys-Colwell
d88ed151aa Merge "Push android unit tests to /data" into nyc-dev am: 1f204c5cfa 
am: 5a16e85da5

* commit '5a16e85da519bcdf4904af64bb82c7ca59cda5cc':
  Push android unit tests to /data

Change-Id: I1f00e459e3ee4167cee0b46f6c822c1a9958b697
 2016-05-03 15:53:49 +00:00
Fred Gylys-Colwell
de23d0d41a Merge "Push android unit tests to /data" into nyc-dev am: 1f204c5cfa 
am: bba11c61a2

* commit 'bba11c61a23b6a1490e5581d32520246e3995a17':
  Push android unit tests to /data

Change-Id: I1c97f75d37cc3fb0b0f73dd46fa62861846cb67a
 2016-05-03 15:53:49 +00:00
Fred Gylys-Colwell
bba11c61a2 Merge "Push android unit tests to /data" into nyc-dev 
am: 1f204c5cfa

* commit '1f204c5cfa1bf3aee53e9f284a92031c47c31cbd':
  Push android unit tests to /data

Change-Id: I5f537c2741a4504f9c111809bf94457d015e1fc1
 2016-05-03 15:51:32 +00:00
Fred Gylys-Colwell
5a16e85da5 Merge "Push android unit tests to /data" into nyc-dev 
am: 1f204c5cfa

* commit '1f204c5cfa1bf3aee53e9f284a92031c47c31cbd':
  Push android unit tests to /data

Change-Id: Idc020cf557649469bc4b4ddc66963c47211613ea
 2016-05-03 15:51:32 +00:00
Fred Gylys-Colwell
1f204c5cfa Merge "Push android unit tests to /data" into nyc-dev 2016-05-03 15:48:04 +00:00
Fred Gylys-Colwell
a4ebdf80b5 Push android unit tests to /data 
Merge of http://go/wvgerrit/17652

This CL changes the android/build_and_run_all_unit_tests.sh script to
push exectuables to /data if it can't push to /system/bin.

The script run_all_unit_tests.sh will check if test files are in /data
and run those first, if not, it runs the files in /system/bin.

This change is needed to test unit tests on devices where /system/bin
is a read only file system, even after running "adb remount".

This CL will help verify, but will not fix
b/27678092

Change-Id: Ia0fe8c2e68722f58c2626f22113abdbdc8c5e408
 2016-05-02 15:16:14 -07:00
Aurimas Liutikas
b9f1729ab7 Suppress unused-parameter warnings in drmwvmplugin and wvm. 
Bug: 26936282
Change-Id: I6d088e4fbac4192218fa1cf881abd02ba15375f1
 2016-04-29 10:56:18 -07:00
John "Juce" Bruce
a78887166f Don\'t Validate Crypto Mode for Unencrypted Decrypt am: 6d2822f am: 3cd4006 
am: 925fa99

* commit '925fa9936563de8156572fbe1a14da61179b230b':

Change-Id: I3da21deb25f770074ef3cdbb1a81b70f42d8bc6e
 2016-04-28 02:43:08 +00:00
John "Juce" Bruce
925fa99365 Don\'t Validate Crypto Mode for Unencrypted Decrypt am: 6d2822f 
am: 3cd4006

* commit '3cd400644b1918bd006fccc064ab023cf9852812':

Change-Id: I4e3c190057c2d9d2472806d6c9838ce68c3543ea
 2016-04-28 02:32:42 +00:00
John "Juce" Bruce
d8049a4bbd Don\'t Validate Crypto Mode for Unencrypted Decrypt am: 6d2822f am: 31a7567 
am: 828d729

* commit '828d729e243a9c4ccb3c625a1bc232b303cb5910':
  Don't Validate Crypto Mode for Unencrypted Decrypt

Change-Id: Ia8d6711b2f49b9c25698ed7a6c1103fbfeb1a09b
 2016-04-28 01:54:19 +00:00
John "Juce" Bruce
828d729e24 Don\'t Validate Crypto Mode for Unencrypted Decrypt am: 6d2822f 
am: 31a7567

* commit '31a75673b808410cc9236b708eec4b0bd0d0f187':
  Don't Validate Crypto Mode for Unencrypted Decrypt

Change-Id: Ia7cf310df94551888f64facd7988f608349d2fe1
 2016-04-28 00:22:41 +00:00
John "Juce" Bruce
3cd400644b Don\'t Validate Crypto Mode for Unencrypted Decrypt 
am: 6d2822f

* commit '6d2822f6c615e957de2ad0af3fb1009e79a46fcc':
  Don't Validate Crypto Mode for Unencrypted Decrypt

Change-Id: Ie0b8a72fa42e373938c489572519135f2b57c25c
 2016-04-27 23:46:53 +00:00
John "Juce" Bruce
31a75673b8 Don\'t Validate Crypto Mode for Unencrypted Decrypt 
am: 6d2822f

* commit '6d2822f6c615e957de2ad0af3fb1009e79a46fcc':
  Don't Validate Crypto Mode for Unencrypted Decrypt

Change-Id: I225cf7310cd43ac6c7cf0c6082d3220ce4bbbb9b
 2016-04-27 23:18:46 +00:00
John "Juce" Bruce
6d2822f6c6 Don't Validate Crypto Mode for Unencrypted Decrypt 
(This is a merge of http://go/wvgerrit/17661)

Because Widevine core always has a decrypt mode set, even on unencrypted
calls where we potentially do not know the crypto mode, it will reject
unencrypted decrypt calls for sessions that have been flagged as
AES-CBC, since the crypto mode defaults to AES-CTR.

The fix is to not validate the crypto mode on unencrypted decrypt calls,
as the data won't be getting decrypted anyway.

Bug: 28423928
Change-Id: If848834dd498ca96983a2b69d448b8d81d50e0a4
 2016-04-27 12:20:18 -07:00
Rahul Frias
790081fe24 Merge "Modify QueryStatusL3 test to allow for L3 devices" into nyc-dev am: ecfd61e 
am: 850cf0e

* commit '850cf0e08e438738214b056d2ce1a9afd055c197':
  Modify QueryStatusL3 test to allow for L3 devices

Change-Id: Ic24ece21bfea4bad5bc368c294565825953e4b85
 2016-04-15 23:27:14 +00:00
Rahul Frias
850cf0e08e Merge "Modify QueryStatusL3 test to allow for L3 devices" into nyc-dev 
am: ecfd61e

* commit 'ecfd61e803f64e42d32eb000daf136e510f18a2e':
  Modify QueryStatusL3 test to allow for L3 devices

Change-Id: I38e8d9dba45baf91a3ce4886308ad9d01a3bd6e8
 2016-04-15 23:22:19 +00:00
Rahul Frias
ecfd61e803 Merge "Modify QueryStatusL3 test to allow for L3 devices" into nyc-dev 2016-04-15 22:51:56 +00:00
Kyle Alexander
fbc2dcc068 Merge "Add display and logging for validating HDCP levels." into nyc-dev am: 53ad22d 
am: e495647

* commit 'e49564763554d4339888cb367bbdbccba8df97e8':
  Add display and logging for validating HDCP levels.

Change-Id: I796490c61bc21de6a9899ca8429310b50f79ceec
 2016-04-15 02:25:52 +00:00
Kyle Alexander
e495647635 Merge "Add display and logging for validating HDCP levels." into nyc-dev 
am: 53ad22d

* commit '53ad22d970aee93479152aaa5ef294b9ea072025':
  Add display and logging for validating HDCP levels.

Change-Id: I3a547561afc91538837408041216eb7ae1865db3
 2016-04-15 00:36:02 +00:00
Kyle Alexander
53ad22d970 Merge "Add display and logging for validating HDCP levels." into nyc-dev 2016-04-15 00:30:03 +00:00
Fred Gylys-Colwell
4d36504b5a Specify generic encryption buffer sizes am: 2717f29 
am: 2049c6c

* commit '2049c6ca3bc16370531aa033191f9646d0810cef':
  Specify generic encryption buffer sizes

Change-Id: I8c163f542317f86f1cfeb974e303c235df1739c2
 2016-04-15 00:15:54 +00:00
Fred Gylys-Colwell
2049c6ca3b Specify generic encryption buffer sizes 
am: 2717f29

* commit '2717f297079494068c7078ef4fc5723f27457070':
  Specify generic encryption buffer sizes

Change-Id: I61d6f64017bec8fdb453263841ea0c3f71f46ac7
 2016-04-15 00:12:25 +00:00
Fred Gylys-Colwell
2717f29707 Specify generic encryption buffer sizes 
Merge from widevine repo of http://go/wvgerrit/17463

This CL updates the unit tests to verify that
OEMCrypto_Generic_Encrypt and OEMCrypto_Generic_Decrypt can handle a
buffer size of at least 100k.  It also adds code to the
oemcrypto_dynamic_adapter so that buffer sizes that are larger than
100k are broken into chunks of 100k.

All Nexus devices targeted for N pass these tests.

b/27040752

Change-Id: Iaf5c65d2f0b69e60f03cc99732d1ecab60658049
 2016-04-14 15:02:59 -07:00
Rahul Frias
c535436bab Modify QueryStatusL3 test to allow for L3 devices 
[ Merge of http://go/wvgerrit/17501 ]

Widevine request_license_tests were written with the expectation that
devices would by default be enabled for security level 1 and fallback
to level 3 if needed. Some devices such as seed are L3 only and results
in failures in the QueryStatusL3 test. This CL corrects the test's
expectation.

b/26902214

Change-Id: Ie84554337cd3716d120f67e592888af0cde719c7
 2016-04-13 10:30:07 -07:00
Kyle Alexander
27c8c3f150 Add display and logging for validating HDCP levels. 
This adds display and logging values to help with debugging b/28024277.

Matching Widevine cl: go/wvgerrit/17446

Bug: 28024277
Change-Id: Ib25ebf37f885b60ae4ab41851df4af4e75b5aace
 2016-04-11 09:48:27 -07:00
John Bruce
892eef7c4b Merge "Restore WVCryptoPlugin Unit Tests" into nyc-dev am: 91059f1 
am: 0b8b253

* commit '0b8b2530f32be88a42e21acdc5cf8174cad4b253':
  Restore WVCryptoPlugin Unit Tests

Change-Id: Id57621a3aafdf7dfaee621c3ab0095e01edd5d64
 2016-04-09 23:00:54 +00:00
John "Juce" Bruce
0b8b2530f3 Merge "Restore WVCryptoPlugin Unit Tests" into nyc-dev 
am: 91059f1

* commit '91059f1d812e1946d71dd4ce0418609e871af27a':
  Restore WVCryptoPlugin Unit Tests

Change-Id: I064f56545a2aed2225e1fa0c1411dc7baac71c08
 2016-04-09 01:00:53 +00:00
Jeff Tinker
381baebcda Merge "Fix StringIndexOutOfBoundsException in MediaDrmAPITest" into nyc-dev am: 5dd0d2a 
am: ec0c0ff

* commit 'ec0c0ff78ace2d2527e9e864393923ed1000167b':
  Fix StringIndexOutOfBoundsException in MediaDrmAPITest

Change-Id: I0c55db554a54500b8f453212e5492a2b34ba724f
 2016-04-08 18:29:27 +00:00
John Bruce
91059f1d81 Merge "Restore WVCryptoPlugin Unit Tests" into nyc-dev 2016-04-08 18:22:17 +00:00
Jeff Tinker
ec0c0ff78a Merge "Fix StringIndexOutOfBoundsException in MediaDrmAPITest" into nyc-dev 
am: 5dd0d2a

* commit '5dd0d2a5ceb7f72d21ac5e224c5b57c0b438c1f2':
  Fix StringIndexOutOfBoundsException in MediaDrmAPITest

Change-Id: I27ebda8cc4642eb0d44edfd0c31358aa052c1d63
 2016-04-08 18:16:35 +00:00
Jeff Tinker
5dd0d2a5ce Merge "Fix StringIndexOutOfBoundsException in MediaDrmAPITest" into nyc-dev 2016-04-08 18:05:12 +00:00
Rahul Frias
9c84e74e9f Load keys before sending OnKeyStatusChange notifications am: 7cb83eb 
am: 089eb0f

* commit '089eb0f90cc8be269ee088d3a1300aa2f8fa9d67':
  Load keys before sending OnKeyStatusChange notifications

Change-Id: I92f9689c9c2a877a91b073b191e169bbb8aa40e2
 2016-04-08 18:00:30 +00:00
Rahul Frias
089eb0f90c Load keys before sending OnKeyStatusChange notifications 
am: 7cb83eb

* commit '7cb83eb02e92abb41349acf1e89d0d31a35f531f':
  Load keys before sending OnKeyStatusChange notifications

Change-Id: I851689274b2edc60edab4775aa490fa16d72a0c7
 2016-04-08 17:38:01 +00:00