Commit Graph

2048 Commits

Author SHA1 Message Date
Fred Gylys-Colwell
dfd6df5cf9 Don't Increment IV for Partial Blocks in Unit Tests am: 3f040e0a9d
am: 4b380dfb1b

Change-Id: Icd56b2b88a9efda4e5ed6167edc7cfd35472167d
2016-09-07 18:42:50 +00:00
Fred Gylys-Colwell
4b380dfb1b Don't Increment IV for Partial Blocks in Unit Tests
am: 3f040e0a9d

Change-Id: I394b1a905ef15ab1f2160d9340d6b92f4d377fdc
2016-09-07 18:39:50 +00:00
Fred Gylys-Colwell
3f040e0a9d Don't Increment IV for Partial Blocks in Unit Tests
Merge from widevine repo of http://go/wvgerrit/20660

For CTR encryption mode, when a subsample ends with partial block that
is continued on the next subsample, both blocks should have the same
IV.  This allows an implementation of OEMCrypto to optimize their
decryption algorithm.

b/31114392

Change-Id: I29a998b00f3bfb12c4bbbcb1fa1ebc371473fefd
2016-09-02 15:51:05 -07:00
John Bruce
c764294a3b Merge "Widevine Version Number for NYC-MR1" into nyc-mr1-dev am: 3fbc2106d8 am: d649905cd6
am: bfa2f87268

Change-Id: I914f3aaecc5d110eff8e35782eb3f3cc37b73ee8
2016-09-02 20:50:23 +00:00
John "Juce" Bruce
38eb094433 Widevine Version Number for NYC-MR1 am: 15ca8148a8 am: 08a706f1b0
am: 3778d8218a

Change-Id: Ic91ea69f4e7c9e809ba8bba649540d1c04cd2485
2016-09-02 20:50:23 +00:00
John Bruce
bfa2f87268 Merge "Widevine Version Number for NYC-MR1" into nyc-mr1-dev am: 3fbc2106d8
am: d649905cd6

Change-Id: I28ca4e390cf3bc31bea860c8b52ca292f55ca1a1
2016-09-02 20:18:02 +00:00
John "Juce" Bruce
3778d8218a Widevine Version Number for NYC-MR1 am: 15ca8148a8
am: 08a706f1b0

Change-Id: Ifb971fe3afc80865403b1fbed9408c10a14971cb
2016-09-02 20:18:02 +00:00
John Bruce
d649905cd6 Merge "Widevine Version Number for NYC-MR1" into nyc-mr1-dev
am: 3fbc2106d8

Change-Id: I910b131db94dd9764bda98019fe37c4569172900
2016-09-02 20:15:01 +00:00
John "Juce" Bruce
08a706f1b0 Widevine Version Number for NYC-MR1
am: 15ca8148a8

Change-Id: I6faba922cc7b02cf4e2a7a274cdd554bc294deb1
2016-09-02 20:15:01 +00:00
John Bruce
3fbc2106d8 Merge "Widevine Version Number for NYC-MR1" into nyc-mr1-dev 2016-09-02 20:09:55 +00:00
John Bruce
54be950b55 Merge "Fix cens Mode in Android CDM" into nyc-mr1-dev am: bf53608a4e am: 73a39a6551
am: 10236f49fd

Change-Id: I968feb40e6b2e7c78853f92c7b474877490b3c67
2016-08-30 05:06:49 +00:00
John "Juce" Bruce
eb153e78fc Fix cens Mode in Android CDM am: e0f4942b8f am: 442099fb15
am: 67682ddf1a

Change-Id: Idb1f713da3002733152544dd6eae2da06119dbdb
2016-08-30 05:06:47 +00:00
John Bruce
10236f49fd Merge "Fix cens Mode in Android CDM" into nyc-mr1-dev am: bf53608a4e
am: 73a39a6551

Change-Id: I26e2c39509e9c2b4b139da80a4280c72766a54b7
2016-08-29 21:31:34 +00:00
John "Juce" Bruce
67682ddf1a Fix cens Mode in Android CDM am: e0f4942b8f
am: 442099fb15

Change-Id: I978356e4982b83a3f343bb025fbeb5b33daee44f
2016-08-29 21:31:34 +00:00
John Bruce
73a39a6551 Merge "Fix cens Mode in Android CDM" into nyc-mr1-dev
am: bf53608a4e

Change-Id: Icc3ec03853cbb4472d3894e2e339fcfcbb37051b
2016-08-29 21:24:27 +00:00
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
Rahul Frias
4a9c2fa2a1 Merge "Do not convert the protection scheme to network byte order" into nyc-mr1-dev am: 4b8b1e0e98 am: 2b6f90c631
am: 8316c02ba2

Change-Id: I8b9eda8bcce5302adae2403fbd6df2f50ef34664
2016-08-23 23:20:07 +00:00
Rahul Frias
2ec84f7338 Do not convert the protection scheme to network byte order am: 6a206191f0 am: fa55cf181b
am: 1ca2348287

Change-Id: I86b1e333b20b137a4e61604b392f8059f7a42719
2016-08-23 23:20:07 +00: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
70c98c51e1 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
am: 9139a68d2b  -s ours

Change-Id: Iae27922503baef79ef10611616b38a68ff4efa49
2016-08-22 23:02:59 +00: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
TreeHugger Robot
10f7e17522 Merge "Stop hard coding gtest paths." 2016-08-22 22:57:08 +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
8f65d1dd90 Do not convert the protection scheme to network byte order [DO NOT MERGE ANYWHERE] am: 13a4fe8e4c -s ours am: e5865ae3bc -s ours
am: 0a4e27fd16  -s ours

Change-Id: If379b9d3654edc4337426168505b1a4f3a0aef94
2016-08-22 21:58:59 +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
Dan Albert
eadd3689a2 Stop hard coding gtest paths.
These are automatically exported by libgtest.

Change-Id: Ia55222989523ecda7a4a686ef794040515f56224
Test: mma
Bug: None
2016-08-22 13:53:20 -07: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
Dan Albert
7ef26a32b3 Stop hard coding gtest things.
The headers are exported.

Change-Id: If095898ca8d9dfd2a807dcc35bc197e76963fff4
Test: mma
2016-08-17 12:30:17 -07:00
Jeff Tinker
5747f51a98 Annotate CDM error enums with their values
This makes it easier to translate an error code
number to the corresponding enum.

Merge of https://widevine-internal-review.googlesource.com/18793/
from the widevine repo.

Change-Id: I7d07f16e5477decd27fcc5391fc62b1bd254d4a3
2016-08-02 20:56:16 +00:00
Rahul Frias
9f4a7480aa Merge \\\"Upgrade TLS version in integration tests\\\" into nyc-dev am: 1ebaf6ad82 am: eeb6606784
am: dcf60776bd

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

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

Change-Id: I278ffa43430835294c6b379eda518297c20bf0de
2016-06-18 02:15:46 +00: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