widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,283 Commits 2 Branches 0 Tags
20bd476104e77fba10e7be32912409029530da83
Commit Graph

1283 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fred Gylys-Colwell
72b47e5789 Clarify Documentation 
This is a copy of
https://widevine-internal-review.googlesource.com/#/c/11115/

This CL just updates the integration guide.  In particular, the
following clarifiaction is made about usage tables:

The sentence:
  When the session using this key is closed, the entry in the table will
    be marked as inactive.
is replaced by
      After the session using this key is closed, the application will
      request that the entry in the table will be marked as inactive.

This should make it clear that OEMCrypto should not automaically
deactivate usage entries.  This behaviour is already verified by unit
tests.

bug: 17405160

Change-Id: If836c7c76205e6759c1c194a6f31232c52c4f179
 2014-09-05 17:44:42 +00:00
Rahul Frias
04d36ea71f am 29b228a1: Merge "Corrections for license release on fallback to L3" into lmp-dev 
* commit '29b228a10bf50a8546004154716cd81d513e7f82':
  Corrections for license release on fallback to L3
 2014-09-04 18:58:09 +00:00
Rahul Frias
29b228a10b Merge "Corrections for license release on fallback to L3" into lmp-dev 2014-09-04 18:35:03 +00:00
Rahul Frias
9bc13a07a0 Corrections for license release on fallback to L3 
When falling back to L3, release requests were failing. Information
requesting falling back to L3 is passed along when the session is opened.
Licenses however are released using the key set ID and information
requesting fallback to L3(CdmClientPropertySet) at that point is
unavailable. The release was actually attempting to release a license
at the default security level which is incorrect.

In addition, the mac keys were not being setup correctly and the release
message was signed with keys derived from the license request and not the
response.  Both these issues have been addressed and unit tests added
to track release of offline licenses and usage reporting scenarios.

[ Merge of https://widevine-internal-review.googlesource.com/#/c/11062
  from wv cdm repo ]

b/17073910

Change-Id: I5cd95a7dfe58ebae7ae27ece6c92e67755c1d665
 2014-09-04 10:29:10 -07:00
Edwin Wong
9bf29faddd am c6723c56: Remove Widevine Classic MediaCodec mode from application. 
* commit 'c6723c564a16f6e948fd06d23e86cfdbfdb2d319':
  Remove Widevine Classic MediaCodec mode from application.
 2014-09-04 03:38:33 +00:00
Edwin Wong
c6723c564a Remove Widevine Classic MediaCodec mode from application. 
bug: 17303948
Change-Id: Ia0db7be1d99f8fab968641cbf57438ee1dd364ab
 2014-09-03 18:06:00 -07:00
Fred Gylys-Colwell
da75841efa am eb4b7cdc: Merge "Catch null pst in OEMCrypto" into lmp-dev 
* commit 'eb4b7cdc473ef8fe00f246c4e56f5ab8af0f2f1b':
  Catch null pst in OEMCrypto
 2014-09-04 00:15:59 +00:00
Edwin Wong
6d573f40bc am 96721d71: Update Widevine Classic Library to 4.5.0.10127. 
* commit '96721d7145a4b38beee9fa6028534b452829f04f':
  Update Widevine Classic Library to 4.5.0.10127.
 2014-09-04 00:15:58 +00:00
Fred Gylys-Colwell
eb4b7cdc47 Merge "Catch null pst in OEMCrypto" into lmp-dev 2014-09-03 23:03:03 +00:00
Edwin Wong
96721d7145 Update Widevine Classic Library to 4.5.0.10127. 
Add openssl-0.9.8za.
https://widevine-internal-review.googlesource.com/#/c/10828/

Update openssl lib to 0.9.8za.
https://widevine-internal-review.googlesource.com/#/c/10862/

Update Version string to 601_AndroidOS_L.
https://widevine-internal-review.googlesource.com/#/c/10950/

Fix Build On lmp-dev.
https://widevine-internal-review.googlesource.com/#/c/10837/

Translate widevine:// Protocol In getConstrains() and checkRightsStatus().
https://widevine-internal-review.googlesource.com/#/c/10838/

Convert "widevine:" prefix for lm->Register() as well.
https://widevine-internal-review.googlesource.com/#/c/11080/

bug: 9835684
bug: 15932110

Change-Id: I1f996355cf13ffca8d0b6ed464aa7b59b5fe4458
 2014-09-03 20:55:34 +00:00
Rahul Frias
cf9d589fad am 7c7f1f5d: Merge "Address CDM request license unit test failures" into lmp-dev 
* commit '7c7f1f5d55caf4c1772876227fb716edc85a96b1':
  Address CDM request license unit test failures
 2014-09-03 19:25:30 +00:00
Fred Gylys-Colwell
e51f8ba7a1 Catch null pst in OEMCrypto 
This is a copy of
https://widevine-internal-review.googlesource.com/#/c/11030

It is an error for the key control block to have a nonzero replay
control flag and a null pst.  This CL adds unit tests to
oemcrypto_test to verify that oemcrypto checkes this.  A unit test is
also added for verifying that an offline license has a valid nonce the
first time it is loaded.

It also updates the reference implementation (mock) to check that the
pst is not empty when the replay control flag is nonzero.

It also updates the level 3 implementation to check that the pst is
not empty when the replay control flag is nonzero.

This change is compiled into the arm library, but because of
compilation errors, is not included in x86 or mips.

    Current Library Version:
    arm:  Level3 Library Aug 27 2014 18:42:40

bug: 16525204 OEMCrypto unit test for reloading offline license
bug: 16844305 Mock OEMCrypto does not catch null pst
Change-Id: Icdb090e80fc92522c187b26f30e5ba082f26363b
 2014-09-03 11:46:10 -07:00
Rahul Frias
7c7f1f5d55 Merge "Address CDM request license unit test failures" into lmp-dev 2014-09-03 18:15:13 +00:00
Edwin Wong
b11446f859 am 5800ecc1: Revert "Remove Widevine Classic MediaCodec mode from application." 
* commit '5800ecc15e8d26b080bc50d7a79a3b739038115c':
  Revert "Remove Widevine Classic MediaCodec mode from application."
 2014-09-02 07:09:38 +00:00
Rahul Frias
d2ad6d7f13 Address CDM request license unit test failures 
UAT issues fixed PSTs for each piece of content. This requires the usage
table to be cleared (or usage records released) between tests. If not
PST collisions occur and OEMCrypto fails with
OEMCrypto_ERROR_INVALID_CONTEXT (0x29).

b/17318063

[ Merge of https://widevine-internal-review.googlesource.com/#/c/11061/
  from wv cdm repo ]

Change-Id: I7758e5444637583a171edafcd4fb18315bfa8395
 2014-08-29 11:14:29 -07:00
Edwin Wong
5800ecc15e Revert "Remove Widevine Classic MediaCodec mode from application." 
This reverts commit a9071cd4bd.

Change-Id: Ibbfc30579bb665a18fa98cc453df956ea7c4e558
 2014-08-29 13:29:40 +00:00
Jeff Tinker
8d4124e199 am fa3098ad: Merge "Workaround WVv9 netflix license issue on fugu" into lmp-dev 
* commit 'fa3098ad0781747fb9c1c60f71aa372c1a26018e':
  Workaround WVv9 netflix license issue on fugu
 2014-08-28 23:18:33 +00:00
Jeff Tinker
fa3098ad07 Merge "Workaround WVv9 netflix license issue on fugu" into lmp-dev 2014-08-28 22:35:28 +00:00
Jeff Tinker
14460bd66e Workaround WVv9 netflix license issue on fugu 
Change-Id: Ib4335d1dd0fea88b23c1b7ce675ae3863b86bc42
related-to-bug: 16994418
 2014-08-28 15:28:42 -07:00
Edwin Wong
2d7f7bebc4 am a9071cd4: Remove Widevine Classic MediaCodec mode from application. 
* commit 'a9071cd4bd71341db53b67ac983f75e42cc565b3':
  Remove Widevine Classic MediaCodec mode from application.
 2014-08-28 16:34:03 +00:00
Edwin Wong
a9071cd4bd Remove Widevine Classic MediaCodec mode from application. 
Hide MediaCodec mode for Build.VERSION_CODES.L and forward.

bug: 17303948
Change-Id: Iae8381ee67950a3f0c1bb9e273e3e45be24a3352
 2014-08-27 18:39:06 -07:00
Jeff Tinker
279e301311 am b445a1fe: Workaround for casting and playback failures 
* commit 'b445a1fef24659c209e35e351ab8b7d297c35ee7':
  Workaround for casting and playback failures
 2014-08-21 04:19:53 +00:00
Jeff Tinker
b445a1fef2 Workaround for casting and playback failures 
Change-Id: I45add76d7941d4942368d10e5893ff8f89a8bf82
related-to-bug: 16994418
 2014-08-20 16:06:41 -07:00
Jeff Tinker
81ff3f3c6a am 907ca911: Merge "Fix MediaDrmAPITest install command in test script" into lmp-dev 
* commit '907ca911d6850cabcdf24dcea5c63a61860f7f70':
  Fix MediaDrmAPITest install command in test script
 2014-08-20 19:08:04 +00:00
Jeff Tinker
d6ae058c36 am 0a21d9ee: Merge "Fix widevine unit test builds on 64-bit devices" into lmp-dev 
* commit '0a21d9ee686c829409add54bcaa93d30e823eaf4':
  Fix widevine unit test builds on 64-bit devices
 2014-08-18 19:47:02 +00:00
Jeff Tinker
907ca911d6 Merge "Fix MediaDrmAPITest install command in test script" into lmp-dev 2014-08-16 04:03:42 +00:00
Jeff Tinker
773ddd3864 Fix MediaDrmAPITest install command in test script 
Change-Id: Ibf062788e26e75838875460718c665ea56a773aa
related-to-bug: 17080975
 2014-08-20 11:21:56 -07:00
Jeff Tinker
fbe0994902 Fix widevine unit test builds on 64-bit devices 
bug: 17080975
Change-Id: Ic54d484e18fe0416855264ca073474f3d597e1a3
 2014-08-16 12:11:05 -07:00
Jeff Tinker
0a21d9ee68 Merge "Fix widevine unit test builds on 64-bit devices" into lmp-dev 2014-08-16 03:56:00 +00:00
Edwin Wong
f13d00768a am bd4bfa1f: (-s ours) am 4135a57f: (-s ours) am e024bb54: am 5b57acc1: am f22b9807: am 7fd92342: (-s ours) am abee817f: (-s ours) am bf68c586: am 15ef647c: Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE **** 
* commit 'bd4bfa1fd4aa157da53e49bade2983f10fd9501a':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
 2014-08-15 13:39:17 +00:00
Edwin Wong
bd4bfa1fd4 am 4135a57f: (-s ours) am e024bb54: am 5b57acc1: am f22b9807: am 7fd92342: (-s ours) am abee817f: (-s ours) am bf68c586: am 15ef647c: Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE **** 
* commit '4135a57feb85223cc3adc58e53f74672c8b30d99':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
 2014-08-14 22:24:22 +00:00
Edwin Wong
4135a57feb am e024bb54: am 5b57acc1: am f22b9807: am 7fd92342: (-s ours) am abee817f: (-s ours) am bf68c586: am 15ef647c: Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE **** 
* commit 'e024bb545b0a0f06b6cbac6c14c16f596cae8493':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
 2014-08-14 22:19:42 +00:00
Edwin Wong
e024bb545b am 5b57acc1: am f22b9807: am 7fd92342: (-s ours) am abee817f: (-s ours) am bf68c586: am 15ef647c: Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE **** 
* commit '5b57acc12a7cef04666ed19ac6e96d2921813c85':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
 2014-08-14 22:15:26 +00:00
Edwin Wong
5b57acc12a am f22b9807: am 7fd92342: (-s ours) am abee817f: (-s ours) am bf68c586: am 15ef647c: Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE **** 
* commit 'f22b980716b187db673c0265acd73a1f315a374d':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
 2014-08-14 22:10:59 +00:00
Edwin Wong
f22b980716 am 7fd92342: (-s ours) am abee817f: (-s ours) am bf68c586: am 15ef647c: Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE **** 
* commit '7fd923422615646d94f1fa7a6dbf5a8749531258':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
 2014-08-14 22:06:19 +00:00
Edwin Wong
7fd9234226 am abee817f: (-s ours) am bf68c586: am 15ef647c: Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE **** 
* commit 'abee817fbffe335ddda3ecf7ef019ef2ef75c3f2':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
 2014-08-14 21:52:37 +00:00
Edwin Wong
abee817fbf am bf68c586: am 15ef647c: Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE **** 
* commit 'bf68c58666e1cab7f6ed384baaaf310c7db15800':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
 2014-08-14 21:48:21 +00:00
Edwin Wong
bf68c58666 am 15ef647c: Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE **** 
* commit '15ef647c317cabe84c73b1f05c7f5fc45f383462':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
 2014-08-14 21:44:07 +00:00
Fred Gylys-Colwell
bdc1a487c9 am 157afc62: Merge "Integers encoded with PKCS#8 binary DER should have sign bit" into lmp-dev 
* commit '157afc627a4ccf55643159139b7a698b4a30edcc':
  Integers encoded with PKCS#8 binary DER should have sign bit
 2014-08-13 05:20:28 +00:00
Fred Gylys-Colwell
62906b6774 am 90988792: OEMCrypto_DeleteUsageTable now returns OEMCrypto_SUCCESS 
* commit '909887923d395f23c0356607da32ac93b73d6e5a':
  OEMCrypto_DeleteUsageTable now returns OEMCrypto_SUCCESS
 2014-08-13 05:20:27 +00:00
Fred Gylys-Colwell
157afc627a Merge "Integers encoded with PKCS#8 binary DER should have sign bit" into lmp-dev 2014-08-12 23:14:33 +00:00
Fred Gylys-Colwell
909887923d OEMCrypto_DeleteUsageTable now returns OEMCrypto_SUCCESS 
Copy of widevine change:
https://widevine-internal-review.googlesource.com/#/c/10911/

OEMCrypto_DeleteUsageTable used to return an error on every call
because UsageTable::Clear always returned false.  Since there is no
error checking that Clear can do, its return type has been changed to
void, and DeleteUsageTable now returns OEMCrypto_SUCCESS for all
calls.

bug: 16799906
Change-Id: Iaa2f572e4b0feb554877579596a7f43a64d20954
 2014-08-12 14:14:46 -07:00
Fred Gylys-Colwell
24c2ca2f9b Integers encoded with PKCS#8 binary DER should have sign bit 
Copy of widevine change:
https://widevine-internal-review.googlesource.com/#/c/10910/

This CL adds a leading 0 to integers in the RSA test key in
oemcrypt_test.cpp.  Before this CL, versions of OEMCrypto that
correctly interpret the encoding were treating some large
integers as negative.

bug: 16876126
Change-Id: I1990fdb09509c15566d12d4cfcd055e9d200e08a
 2014-08-12 14:12:23 -07:00
Edwin Wong
79c20ebd52 am 50c78216: (-s ours) am dbcacddb: (-s ours) am 5cf6ceea: am 778f0d81: am 91a5fce4: am 9b787415: (-s ours) Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE **** 
* commit '50c78216020d73011d92b24e808e2b354d07aab4':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
 2014-08-11 19:06:04 +00:00
Edwin Wong
1a2b7aff6f am 26eb410b: (-s ours) am 2732fb7f: (-s ours) am 93df2f3e: am b79dfd6f: am 00b7d578: Update Widevine Classic Library to 4.5.0.10124 **** DO NOT MERGE **** 
* commit '26eb410b1edf0b607c568b6342df30c0afa922ae':
  Update Widevine Classic Library to 4.5.0.10124 **** DO NOT MERGE ****
 2014-08-11 19:06:03 +00:00
Edwin Wong
50c7821602 am dbcacddb: (-s ours) am 5cf6ceea: am 778f0d81: am 91a5fce4: am 9b787415: (-s ours) Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE **** 
* commit 'dbcacddb15ff8a16766f3019fb309c4cf400560b':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
 2014-08-11 18:51:25 +00:00
Edwin Wong
26eb410b1e am 2732fb7f: (-s ours) am 93df2f3e: am b79dfd6f: am 00b7d578: Update Widevine Classic Library to 4.5.0.10124 **** DO NOT MERGE **** 
* commit '2732fb7f3c10f66b89aabaa46519cf22c970fc3d':
  Update Widevine Classic Library to 4.5.0.10124 **** DO NOT MERGE ****
 2014-08-11 18:51:24 +00:00
Edwin Wong
dbcacddb15 am 5cf6ceea: am 778f0d81: am 91a5fce4: am 9b787415: (-s ours) Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE **** 
* commit '5cf6ceea61f693cc31699dc5a680abd898efa48f':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
 2014-08-09 00:20:39 +00:00
Edwin Wong
5cf6ceea61 am 778f0d81: am 91a5fce4: am 9b787415: (-s ours) Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE **** 
* commit '778f0d814724da5fda04353a38cc879cf56c503a':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
 2014-08-09 00:17:40 +00:00
Edwin Wong
778f0d8147 am 91a5fce4: am 9b787415: (-s ours) Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE **** 
* commit '91a5fce49a212cb8b11f6d6bff8e812390135e57':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
 2014-08-09 00:14:41 +00:00