Rahul Frias
3380679886
Address test network issues
...
[ Merge of http://go/wvgerrit/22140 ]
There are occasional issues when trying to connect to
http://widevine-proxy.appspot.com/proxy . This changes introduces upto
3 retry attempts. The UAT server on appspot is being replaced by UAT on borg
and so it is not worth our while to debug these issues furthur.
b/30022298
Change-Id: I76c1421e93c7c14b5d2bcd7ad07119a705245922
2016-11-10 18:40:10 -08:00
Fred Gylys-Colwell
f248bbb9ee
Merge "File util, generic crypto, and key query"
2016-10-25 17:40:54 +00:00
John "Juce" Bruce
a7c4880777
Update Expected Version Number in Canary am: 2201d52b4c am: 2cbe56b613
...
am: ef03c6795e
2016-10-19 23:53:06 +00:00
John "Juce" Bruce
ef03c6795e
Update Expected Version Number in Canary am: 2201d52b4c
...
am: 2cbe56b613
2016-10-19 23:47:17 +00:00
John "Juce" Bruce
2cbe56b613
Update Expected Version Number in Canary
...
am: 2201d52b4c
2016-10-19 23:30:37 +00:00
John "Juce" Bruce
2201d52b4c
Update Expected Version Number in Canary
...
(This is a merge of go/wvgerrit/21580)
The version number for N-MR1 has been increased to 7.1.1, which
triggered our version number canary. Since this is still N-MR1, no
Widevine version number update is necessary as we already updated it for
N-MR1, but the canary needs to be updated.
Bug: 32018966
Change-Id: Ia1d673f837d9c6a5935f26beec7372b25ea3a6b9
2016-10-19 13:36:01 -07:00
Fred Gylys-Colwell
69ea0b7ed2
Merge "Update oemcrypto_test.cpp"
2016-10-11 00:13:33 +00:00
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
Edwin Wong
37b82101ec
DO NOT MERGE Update Classic Widevine libs to 4.5.0.10142. am: 0d1787e5a1 am: 5d4184e85e am: 428a960884 am: 5b8ce1cd64 -s ours am: 2ea811a508 am: 2f58b776ff am: c71446e166 am: 8c259382b8
...
am: 6c23b47497
2016-09-23 02:16:53 +00:00
Edwin Wong
0de98c73b4
DO NOT MERGE Update Classic Widevine libs to 4.5.0.10142. am: 0d1787e5a1 am: 5d4184e85e am: 428a960884 am: 5b8ce1cd64 -s ours am: 2ea811a508 am: a46fb6b378
...
am: 01b2534aec
2016-09-23 02:16:39 +00:00
Edwin Wong
6c23b47497
DO NOT MERGE Update Classic Widevine libs to 4.5.0.10142. am: 0d1787e5a1 am: 5d4184e85e am: 428a960884 am: 5b8ce1cd64 -s ours am: 2ea811a508 am: 2f58b776ff am: c71446e166
...
am: 8c259382b8
2016-09-23 00:42:54 +00:00
Edwin Wong
8c259382b8
DO NOT MERGE Update Classic Widevine libs to 4.5.0.10142. am: 0d1787e5a1 am: 5d4184e85e am: 428a960884 am: 5b8ce1cd64 -s ours am: 2ea811a508 am: 2f58b776ff
...
am: c71446e166
2016-09-22 23:40:12 +00:00
Edwin Wong
01b2534aec
DO NOT MERGE Update Classic Widevine libs to 4.5.0.10142. am: 0d1787e5a1 am: 5d4184e85e am: 428a960884 am: 5b8ce1cd64 -s ours am: 2ea811a508
...
am: a46fb6b378
2016-09-22 23:20:16 +00:00
Edwin Wong
c71446e166
DO NOT MERGE Update Classic Widevine libs to 4.5.0.10142. am: 0d1787e5a1 am: 5d4184e85e am: 428a960884 am: 5b8ce1cd64 -s ours am: 2ea811a508
...
am: 2f58b776ff
2016-09-22 21:58:14 +00:00
Edwin Wong
2f58b776ff
DO NOT MERGE Update Classic Widevine libs to 4.5.0.10142. am: 0d1787e5a1 am: 5d4184e85e am: 428a960884 am: 5b8ce1cd64 -s ours
...
am: 2ea811a508
2016-09-22 18:09:03 +00:00
Edwin Wong
a46fb6b378
DO NOT MERGE Update Classic Widevine libs to 4.5.0.10142. am: 0d1787e5a1 am: 5d4184e85e am: 428a960884 am: 5b8ce1cd64 -s ours
...
am: 2ea811a508
2016-09-22 13:14:16 +00:00
Edwin Wong
2ea811a508
DO NOT MERGE Update Classic Widevine libs to 4.5.0.10142. am: 0d1787e5a1 am: 5d4184e85e am: 428a960884
...
am: 5b8ce1cd64
2016-09-22 12:00:46 +00:00
Edwin Wong
5b8ce1cd64
DO NOT MERGE Update Classic Widevine libs to 4.5.0.10142. am: 0d1787e5a1 am: 5d4184e85e
...
am: 428a960884
2016-09-22 11:58:03 +00:00
Edwin Wong
428a960884
DO NOT MERGE Update Classic Widevine libs to 4.5.0.10142. am: 0d1787e5a1
...
am: 5d4184e85e
2016-09-22 08:14:08 +00:00
Edwin Wong
5d4184e85e
DO NOT MERGE Update Classic Widevine libs to 4.5.0.10142.
...
am: 0d1787e5a1
2016-09-22 00:30:50 +00:00
Edwin Wong
0d1787e5a1
DO NOT MERGE Update Classic Widevine libs to 4.5.0.10142.
...
Remove openssl external symbols from libssl.a and libcrypto.a.
Widevine repo reference:
https://widevine-internal-review.googlesource.com/#/c/17990/
https://widevine-internal-review.googlesource.com/#/c/18004/
bug: 28013024
Change-Id: I8a6dd5a17f896a65da8209680ef200a953b21e80
2016-09-19 15:17:46 -07:00
Fred Gylys-Colwell
eb3f8b786a
File util, generic crypto, and key query
...
This CL merges several CLs from the widevine repo:
http://go/wvgerrit/18012 Add support for querying allowed usage for key.
http://go/wvgerrit/17971 Add per-origin storage.
http://go/wvgerrit/18152 Add OEMCrypto's generic crypto operations to CDM.
http://go/wvgerrit/17911 QueryKeyControlInfo => QueryOemCryptoSessionId
Note: numbering in wv_cdm_types.h was added in this CL and will be
back ported to wvgerrit in a future CL.
Change-Id: Idb9e9a67e94f62f25dc16c5307f75a08b3430b64
2016-09-14 16:43:07 -07:00
Fred Gylys-Colwell
24124ea6e3
Pull cache flush out of Haystack am: 84d7185e5f am: 6304a242ae
...
am: 4354c9182a
2016-09-12 17:30:52 +00:00
Fred Gylys-Colwell
4354c9182a
Pull cache flush out of Haystack am: 84d7185e5f
...
am: 6304a242ae
2016-09-12 17:17:02 +00:00
Fred Gylys-Colwell
6304a242ae
Pull cache flush out of Haystack
...
am: 84d7185e5f
2016-09-12 17:13:32 +00:00
Fred Gylys-Colwell
84d7185e5f
Pull cache flush out of Haystack
...
Merge of http://go/wvgerrit/20924
This CL pulls the cache flush code out of the haystack code and into
the adapter level. This is so it will be built with processor
specific compiler flags instead of as part of the precompiled binary.
level3/mips/libwvlevel3.a Level3 Library 4465 Sep 10 2016 21:44:37
level3/arm/libwvlevel3.a Level3 Library 4445 Sep 10 2016 21:30:01
level3/x86/libwvlevel3.a Level3 Library 4464 Sep 10 2016 21:49:53
b/30550782 Battery Problems
Change-Id: I8967da498a43cabe82e78345162705dc2fcdb859
2016-09-10 21:55: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
