Fred Gylys-Colwell
3b4e1d80bb
Update oemcrypto_test.cpp
...
This is a merge from the Widevine repo of these three CLs:
http://go/wvgerrit/18008 Update OEMCrypto Performance Unit Test
http://go/wvgerrit/17901 Remove static initialization for member variable
http://go/wvgerrit/17214 Lengthen allowed time for simultaneous decrypt
There's also some code cleanup from http://go/wvgerrit/17971 .
Change-Id: I81e1366594e1dbe65260aad96d9c8f77a116f508
2016-10-07 13:09:52 -07:00
Fred Gylys-Colwell
41c20425a8
Merge "Extract Session class from oemcrypto_test."
2016-09-08 18:01:57 +00:00
Fred Gylys-Colwell
626a416e5f
Extract Session class from oemcrypto_test.
...
This allows the OEMCrypto session state to be accessed by
tests in other modules. For example, keys can be added for testing
encryption and decryption operations in CDM-level tests.
Merge from Widevine repo of http://go/wvgerrit/18127 ,
http://go/wvgerrit/18591 , http://go/wvgerrit/18581 and
http://go/wvgerrit/20802 .
Change-Id: Ie0d071a2da610c0856ae6356a0abf054013a1b87
2016-09-07 17:10:09 -07:00
Fred Gylys-Colwell
ed3d0807bc
Don't Increment IV for Partial Blocks in Unit Tests am: 3f040e0a9d am: 4b380dfb1b
...
am: dfd6df5cf9
2016-09-07 18:48:00 +00:00
Fred Gylys-Colwell
dfd6df5cf9
Don't Increment IV for Partial Blocks in Unit Tests am: 3f040e0a9d
...
am: 4b380dfb1b
2016-09-07 18:42:50 +00:00
Fred Gylys-Colwell
4b380dfb1b
Don't Increment IV for Partial Blocks in Unit Tests
...
am: 3f040e0a9d
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
2016-09-02 20:50:23 +00:00
John "Juce" Bruce
38eb094433
Widevine Version Number for NYC-MR1 am: 15ca8148a8 am: 08a706f1b0
...
am: 3778d8218a
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
2016-09-02 20:18:02 +00:00
John "Juce" Bruce
3778d8218a
Widevine Version Number for NYC-MR1 am: 15ca8148a8
...
am: 08a706f1b0
2016-09-02 20:18:02 +00:00
John Bruce
d649905cd6
Merge "Widevine Version Number for NYC-MR1" into nyc-mr1-dev
...
am: 3fbc2106d8
2016-09-02 20:15:01 +00:00
John "Juce" Bruce
08a706f1b0
Widevine Version Number for NYC-MR1
...
am: 15ca8148a8
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
2016-08-30 05:06:49 +00:00
John "Juce" Bruce
eb153e78fc
Fix cens Mode in Android CDM am: e0f4942b8f am: 442099fb15
...
am: 67682ddf1a
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
2016-08-29 21:31:34 +00:00
John "Juce" Bruce
67682ddf1a
Fix cens Mode in Android CDM am: e0f4942b8f
...
am: 442099fb15
2016-08-29 21:31:34 +00:00
John Bruce
73a39a6551
Merge "Fix cens Mode in Android CDM" into nyc-mr1-dev
...
am: bf53608a4e
2016-08-29 21:24:27 +00:00
John "Juce" Bruce
442099fb15
Fix cens Mode in Android CDM
...
am: e0f4942b8f
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
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
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
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
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
2016-08-23 22:06:56 +00:00
Rahul Frias
fa55cf181b
Do not convert the protection scheme to network byte order
...
am: 6a206191f0
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
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
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
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
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
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
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
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
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
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
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
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
2016-06-20 20:05:43 +00:00
Rahul Frias
eeb6606784
Merge \"Upgrade TLS version in integration tests\" into nyc-dev
...
am: 1ebaf6ad82
2016-06-20 20:02:53 +00:00
Rahul Frias
6cd9b50064
Merge \"Upgrade TLS version in integration tests\" into nyc-dev
...
am: 1ebaf6ad82
2016-06-20 20:02:42 +00:00
