Commit Graph

1819 Commits

Author SHA1 Message Date
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
8316c02ba2 Merge "Do not convert the protection scheme to network byte order" into nyc-mr1-dev am: 4b8b1e0e98
am: 2b6f90c631

Change-Id: Id1829115413284254d5fd2dd0bf87a63666dac52
2016-08-23 22:11:38 +00:00
Rahul Frias
1ca2348287 Do not convert the protection scheme to network byte order am: 6a206191f0
am: fa55cf181b

Change-Id: I8f4f3dc5d8614931a23316840a1c8aaef9621e03
2016-08-23 22:11:37 +00: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
9139a68d2b 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
am: 65fe794386  -s ours

Change-Id: Ifd3449ea64a2b392533a2e157273ce35dd3547f3
2016-08-22 22:58:37 +00: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
0a4e27fd16 Do not convert the protection scheme to network byte order [DO NOT MERGE ANYWHERE] am: 13a4fe8e4c -s ours
am: e5865ae3bc  -s ours

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

Change-Id: I44db5d8401ba1f11624bc4b42fe7ded3d5586cb1
2016-08-22 21:50:02 +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
dcf60776bd Merge \\"Upgrade TLS version in integration tests\\" into nyc-dev am: 1ebaf6ad82
am: eeb6606784

Change-Id: I701cc75fda74a09c84a85a00395b2c875908ad5c
2016-06-20 20:06:46 +00:00
Rahul Frias
88a9525513 Merge \\"Upgrade TLS version in integration tests\\" into nyc-dev am: 1ebaf6ad82
am: 6cd9b50064

Change-Id: I19d7dc49c9bd696031eb1832435a8bd63a8ffff0
2016-06-20 20:05:43 +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
6cd9b50064 Merge \"Upgrade TLS version in integration tests\" into nyc-dev
am: 1ebaf6ad82

Change-Id: Ibcfe029d50fefeb6e00ca6b5ac2d704838a51604
2016-06-20 20:02:42 +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
a0fcdbc8f0 Merge \\"Rework WidevineSamplePlayer to use fragments\\" into nyc-dev am: 02d8671882
am: 9b8c6286b6

Change-Id: I0427fe538ffcb3f70f012662cf41c2303d80efbb
2016-06-18 02:04:09 +00: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
907e26c842 Merge \\"Rework WidevineSamplePlayer to use fragments\\" into nyc-dev am: 02d8671882
am: 98d0e9b614

Change-Id: Ie5c49fef6b19331adb23c85c8cd814b08d0e5141
2016-06-17 21:43:00 +00:00
Jeff Tinker
98d0e9b614 Merge \"Rework WidevineSamplePlayer to use fragments\" into nyc-dev
am: 02d8671882

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

Change-Id: I142852d904617207e79d56af0b144a82352f9a6c
2016-06-17 18:28:57 +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
4818bca635 Update the expected android build version for NYC release am: 2bd6131162
am: 3c5ca90637

Change-Id: I425a01afdee4d9cfeb74d0e2f5b9025326a133d0
2016-06-17 18:23:25 +00:00
Jeff Tinker
3c5ca90637 Update the expected android build version for NYC release
am: 2bd6131162

Change-Id: Ia5006b4f1c54896dfb3c0753d6139dc10f20c208
2016-06-17 18:19:57 +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
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
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
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