Edwin Wong
21f2393af0
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d am: 2ee45a97b0 am: ac1854b989 am: fc1240bdc2 am: 4c2eb98d09 am: a69baa961a am: fdc1ab381d
...
am: 90d6be0170
2015-10-20 05:06:40 +00:00
Edwin Wong
90d6be0170
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d am: 2ee45a97b0 am: ac1854b989 am: fc1240bdc2 am: 4c2eb98d09 am: a69baa961a
...
am: fdc1ab381d
2015-10-20 04:59:28 +00:00
Edwin Wong
fdc1ab381d
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d am: 2ee45a97b0 am: ac1854b989 am: fc1240bdc2 am: 4c2eb98d09
...
am: a69baa961a
2015-10-20 04:57:41 +00:00
Edwin Wong
a69baa961a
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d am: 2ee45a97b0 am: ac1854b989 am: fc1240bdc2
...
am: 4c2eb98d09
2015-10-20 04:30:09 +00:00
Edwin Wong
4c2eb98d09
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d am: 2ee45a97b0 am: ac1854b989
...
am: fc1240bdc2
2015-10-20 04:26:43 +00:00
Edwin Wong
fc1240bdc2
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d am: 2ee45a97b0
...
am: ac1854b989
2015-10-20 04:24:53 +00:00
Edwin Wong
ac1854b989
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d
...
am: 2ee45a97b0
2015-10-20 04:23:06 +00:00
Edwin Wong
2ee45a97b0
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1
...
am: d5a1d5d58d
2015-10-20 04:21:24 +00:00
Edwin Wong
d5a1d5d58d
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71
...
am: 5754438dc1
2015-10-20 04:13:17 +00:00
Edwin Wong
5754438dc1
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e
...
am: 9617db4d71
2015-10-20 04:11:35 +00:00
Edwin Wong
9617db4d71
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev.
...
am: f78b0e780e
2015-10-20 04:08:23 +00:00
Edwin Wong
f78b0e780e
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev.
...
Change-Id: I3a89161de0bf84fc6257338a3e932b90feba3f82
2015-10-19 20:59:36 -07:00
Edwin Wong
c0b8030851
resolve merge conflicts of 769288d009 to jb-mr1.1-docs.
...
Change-Id: I26df84f2907bcd18a2646bec0fbe53d9624e5a9b
2015-10-19 18:32:07 -07:00
Fred Gylys-Colwell
236177d0f0
am 8f47dd62: am a57b5cf8: (-s ours) am 4d34e02b: Clarify HDCP Type (lmp-mr1-dev branch) DO NOT MERGE
...
* commit '8f47dd6215a625d69e3b584a6251a07e07a1eb6e':
Clarify HDCP Type (lmp-mr1-dev branch) DO NOT MERGE
2015-10-03 15:52:12 +00:00
Fred Gylys-Colwell
08198c7bfa
am 78583720: Clarify HDCP Type (mnc-dev branch)
...
* commit '78583720331fc5ff673ec645a26a97f33bb02ebf':
Clarify HDCP Type (mnc-dev branch)
2015-10-03 15:34:47 +00:00
Fred Gylys-Colwell
8f47dd6215
am a57b5cf8: (-s ours) am 4d34e02b: Clarify HDCP Type (lmp-mr1-dev branch) DO NOT MERGE
...
* commit 'a57b5cf88b70a04abe2334a612ddc53e557d6419':
Clarify HDCP Type (lmp-mr1-dev branch) DO NOT MERGE
2015-10-03 15:31:19 +00:00
Fred Gylys-Colwell
a57b5cf88b
am 4d34e02b: Clarify HDCP Type (lmp-mr1-dev branch) DO NOT MERGE
...
* commit '4d34e02b86a37aaf3c1630618d4a0b91ff1fc709':
Clarify HDCP Type (lmp-mr1-dev branch) DO NOT MERGE
2015-10-03 15:28:19 +00:00
Fred Gylys-Colwell
4d34e02b86
Clarify HDCP Type (lmp-mr1-dev branch) DO NOT MERGE
...
This is a documentation change only.
Merged from widevine repo of http://go/wvgerrit/15737
This CL updates the docs for OEMCrypto to clarify that HDCP v2.2
should be type 1. The document version number is rolled to 9.1.
See Version 9 copy of original document for version history:
https://docs.google.com/document/d/1hiZ7wsZ_IkL5GvmjaUx3wffs8mI0xsfHZ6f9J-BOaC8/edit#
bug: 24098055
Change-Id: I084d86e44c60a5810fa448364003f7464e30bfb2
2015-10-01 20:27:10 +00:00
Fred Gylys-Colwell
7858372033
Clarify HDCP Type (mnc-dev branch)
...
Merge from widevine repo of http://go/wvgerrit/15735
This is a documentation only change.
This CL updates the docs for OEMCrypto to clarify that HDCP v2.2
should be type 1. The document version number is rolled to 10.3.
See original document for version history:
https://docs.google.com/document/d/1pHSJ2IKL0axmQz2gmDZ7olxPWb_ZcULaJrYwDZAeS7k/edit#
bug: 24098055
Change-Id: If2dd677cd824482ab18eeed03a335d7b82adbcbe
2015-09-23 17:16:14 -07:00
Elliott Hughes
b4abf77efc
Remove manual #include "AndroidConfig.h".
...
That file (a) was always forced upon you anyway and (b) no longer
exists.
Change-Id: I5964a0420e9114419b62d5b98e7ecef6c5b48296
(cherry picked from commit c2d4ae15fbbb4ebee364449cf9693566e10d07a1)
2015-08-28 20:53:41 +00:00
Rahul Frias
178cadfce1
am 25a6185c: Address releaseAllSecureStops crash
...
* commit '25a6185c8434c62af73d2c6c91bda5fc50d20ca7':
Address releaseAllSecureStops crash
2015-08-25 19:05:30 +00:00
Rahul Frias
25a6185c84
Address releaseAllSecureStops crash
...
[ Merge of http://go/wvgerrit/15474 ]
Changes to releaseAllSecureStops made use of a session that was
initialized only if getSecureStops had been previously called. If it was not,
accessing the session resulted in a segfault. This was uncovered by a change
in how the Netflix app invoked mediaDrm.
b/23498809
Change-Id: Ib426ae1830c3a42c5e0849f1b6e8bbfe0d2c74ff
2015-08-25 10:40:12 -07:00
Jeff Tinker
85f1e34a1c
am 6a7d526d: am c48fedc1: (-s ours) am af90b037: am 1827f14b: am c1447241: (-s ours) am 693f0813: am 87922237: DO NOT MERGE Part of fix for libmedia OOB write anywhere
...
* commit '6a7d526def295ed39d58562ca02a46c4801b8eed':
DO NOT MERGE Part of fix for libmedia OOB write anywhere
2015-08-22 00:41:21 +00:00
Jeff Tinker
6d19a7b031
am 6bf90ce0: am cee546e5: (-s ours) am bcf3a11f: am e5d4a0be: DO NOT MERGE Part of fix for libmedia OOB write anywhere
...
* commit '6bf90ce0aed049ea6c2aec6085417fb6e234d3b6':
DO NOT MERGE Part of fix for libmedia OOB write anywhere
2015-08-21 17:23:46 +00:00
Jeff Tinker
6a7d526def
am c48fedc1: (-s ours) am af90b037: am 1827f14b: am c1447241: (-s ours) am 693f0813: am 87922237: DO NOT MERGE Part of fix for libmedia OOB write anywhere
...
* commit 'c48fedc14cb0a47bc99db89faf9b875525cd5fab':
DO NOT MERGE Part of fix for libmedia OOB write anywhere
2015-08-21 17:01:59 +00:00
Jeff Tinker
c48fedc14c
am af90b037: am 1827f14b: am c1447241: (-s ours) am 693f0813: am 87922237: DO NOT MERGE Part of fix for libmedia OOB write anywhere
...
* commit 'af90b037a4baa6e12ee2399c85c7e3d4b592498e':
DO NOT MERGE Part of fix for libmedia OOB write anywhere
2015-08-21 16:55:19 +00:00
Jeff Tinker
af90b037a4
am 1827f14b: am c1447241: (-s ours) am 693f0813: am 87922237: DO NOT MERGE Part of fix for libmedia OOB write anywhere
...
* commit '1827f14b689c909973d8e859c8a7a00db7044bd7':
DO NOT MERGE Part of fix for libmedia OOB write anywhere
2015-08-21 16:40:47 +00:00
Jeff Tinker
1827f14b68
am c1447241: (-s ours) am 693f0813: am 87922237: DO NOT MERGE Part of fix for libmedia OOB write anywhere
...
* commit 'c14472413260a6b233282a6ff3acb58b6571ab5c':
DO NOT MERGE Part of fix for libmedia OOB write anywhere
2015-08-21 16:27:34 +00:00
Jeff Tinker
6bf90ce0ae
am cee546e5: (-s ours) am bcf3a11f: am e5d4a0be: DO NOT MERGE Part of fix for libmedia OOB write anywhere
...
* commit 'cee546e501a3e2c0591f259bb25a114130d58eb0':
DO NOT MERGE Part of fix for libmedia OOB write anywhere
2015-08-21 15:58:06 +00:00
Jeff Tinker
cee546e501
am bcf3a11f: am e5d4a0be: DO NOT MERGE Part of fix for libmedia OOB write anywhere
...
* commit 'bcf3a11f0fe87ef7b56c374ed89b91ed8a17f44b':
DO NOT MERGE Part of fix for libmedia OOB write anywhere
2015-08-21 15:46:33 +00:00
Jeff Tinker
c144724132
am 693f0813: am 87922237: DO NOT MERGE Part of fix for libmedia OOB write anywhere
...
* commit '693f0813814b10bfd23bea578fa258255477b207':
DO NOT MERGE Part of fix for libmedia OOB write anywhere
2015-08-21 15:36:22 +00:00
Jeff Tinker
bcf3a11f0f
am e5d4a0be: DO NOT MERGE Part of fix for libmedia OOB write anywhere
...
* commit 'e5d4a0be30bac8fdba7194841084dcf61be6e8a2':
DO NOT MERGE Part of fix for libmedia OOB write anywhere
2015-08-21 15:34:51 +00:00
Jeff Tinker
693f081381
am 87922237: DO NOT MERGE Part of fix for libmedia OOB write anywhere
...
* commit '87922237de893b92c7b4d252999dd91d04470bd0':
DO NOT MERGE Part of fix for libmedia OOB write anywhere
2015-08-21 15:28:57 +00:00
John Bruce
67b5d9216d
am 0e1839ac: Merge "Do Not Clean Up Licenses As Aggressively" into mnc-dev
...
* commit '0e1839ac4d4b540f46db83684b436d400fe4a292':
Do Not Clean Up Licenses As Aggressively
2015-08-20 22:13:15 +00:00
Jeff Tinker
e5d4a0be30
DO NOT MERGE Part of fix for libmedia OOB write anywhere
...
Prevent usage of client provided address on
non-secure devices spoofed as being secure.
b/23223325
merge of go/wvgerrit/15420 from widevine repo
Change-Id: I1d4f3a652b3d5e78fca508f92005cfa8df5ec6db
2015-08-20 21:56:50 +00:00
Jeff Tinker
87922237de
DO NOT MERGE Part of fix for libmedia OOB write anywhere
...
Prevent usage of client provided address on
non-secure devices spoofed as being secure.
b/23223325
merge of go/wvgerrit/15420 from widevine repo
Change-Id: I1d4f3a652b3d5e78fca508f92005cfa8df5ec6db
2015-08-20 14:49:43 -07:00
John Bruce
0e1839ac4d
Merge "Do Not Clean Up Licenses As Aggressively" into mnc-dev
2015-08-20 21:21:43 +00:00
Jeff Tinker
d38fc184a7
am 1319c433: Part of fix for libmedia OOB write anywhere
...
* commit '1319c43361cc8fdd3e2ce61db4185e38f128e76b':
Part of fix for libmedia OOB write anywhere
2015-08-19 23:13:05 +00:00
John "Juce" Bruce
1d4339d0df
Do Not Clean Up Licenses As Aggressively
...
(This is a merge of http://go/wvgerrit/15430 )
Previously, after provisioning, any existing offline licenses would be
deleted, as they were inevitably tied to the certificate that was just
replaced. However, due to the way per-origin provisioning works on
Android, this is no longer a safe assumption. Licenses from different
origins are all stored together, so this behavior would delete all
offline licenses across all origins every time any origin is
provisioned. And it is not possible to delete only the licenses for
specific origins without changing how licenses are stored. It is too
late to change how licenses are stored in Android M, so we need to
stop proactively cleaning up licenses in this edge case for now. Once
b/23354606 is resolved, we can reinstate this clean-up and properly
only clean up the licenses associated with the origin that was just
provisioned.
Bug: 23324167
Change-Id: Ic21db8c21bdb4243266cd49020ed52287eb21d9a
2015-08-19 21:21:44 +00:00
Jeff Tinker
1319c43361
Part of fix for libmedia OOB write anywhere
...
Prevent usage of client provided address on
non-secure devices spoofed as being secure.
b/23223325
merge of go/wvgerrit/15420 from widevine repo
Change-Id: I1d4f3a652b3d5e78fca508f92005cfa8df5ec6db
2015-08-17 17:56:27 -07:00
Fred Gylys-Colwell
c045524463
am 9a714edc: Merge "Fix RSA Key Padding in OEMCrypto Unit Tests" into mnc-dev
...
* commit '9a714edc6f6accfda151c2d728e316017d21efb4':
Fix RSA Key Padding in OEMCrypto Unit Tests
2015-08-16 02:54:29 +00:00
Fred Gylys-Colwell
9a714edc6f
Merge "Fix RSA Key Padding in OEMCrypto Unit Tests" into mnc-dev
2015-08-14 22:01:06 +00:00
Fred Gylys-Colwell
bb3f9edb25
am 631d3e7a: Relax test on forbidden signing [DO NOT MERGE]
...
* commit '631d3e7a4c509c9a231959f07f58f311dc038579':
Relax test on forbidden signing [DO NOT MERGE]
2015-08-12 01:25:47 +00:00
Fred Gylys-Colwell
631d3e7a4c
Relax test on forbidden signing [DO NOT MERGE]
...
Copy from widevine repo of http://go/wvgerrit/15390
Because some devices are failing oemcrypto unit tests related to
signing schemes that they do not support, we are relaxing the
requirement that they return the correct error code.
We are still requiring that the device does NOT sign with a forbidden
scheme. However, it is OK if they do not return an error code from
OEMCrypto_GenerateRSASignature. They will be required to return the
correct error code in the next release.
bug: 21668896
bug: 21708882
Change-Id: I1b8a410909b364d0086cba38eadca11aceaac5f6
2015-08-11 17:05:20 -07:00
Fred Gylys-Colwell
29e08f2166
Fix RSA Key Padding in OEMCrypto Unit Tests
...
Merge from widevine of http://go/wvgerrit/15371
incorrectly have leading 0x00 bytes added to all integers. This
leading 0 should only be added to integers that had a leading byte
larger than 0x80 because those would be parsed as negative numbers.
bug: 23105200
Change-Id: I1dd01cc2b83a807bbdb78c079c6ce4e01d41f616
2015-08-11 13:52:50 -07:00
Rahul Frias
ae28e74144
am 496bfc87: Correct android release version number in tests
...
* commit '496bfc87b31fc31d4a04542cb1877d7be28ec911':
Correct android release version number in tests
2015-08-05 07:11:32 +00:00
Rahul Frias
496bfc87b3
Correct android release version number in tests
...
[ Merge of http://go/wv/15293 ]
b/22916797
Change-Id: I120bae5e656c6d766f8ab7a21d578f17ff22d37a
2015-08-04 14:59:08 -07:00
Rahul Frias
93f5f1cda8
am bf100619: Merge "Verification of client identification in Secure Stop messages" into mnc-dev
...
* commit 'bf10061929aebb2ddf088b4daad42458ac8eefa4':
Verification of client identification in Secure Stop messages
2015-07-14 16:30:22 +00:00
Rahul Frias
bf10061929
Merge "Verification of client identification in Secure Stop messages" into mnc-dev
2015-07-13 18:45:18 +00:00
Jeff Tinker
59a9f8e37e
am 47014df2: Return specific error code when decrypting on invalid session
...
* commit '47014df2e8b8a3bc350a170ae3d15230332a505a':
Return specific error code when decrypting on invalid session
2015-07-08 01:37:28 +00:00
