| 414ff6e202a170c8f6922ac6dc5416dee26bf23b |
06-Jun-2017 |
Jeff Tinker <jtinker@google.com> |
Fix integer overflow in mediadrmserver am: eb21712f81 am: 5250bc1bec am: d1a854a073 am: 7a22df06c3 am: 4e339cbca4 am: 1248e62082 am: fdfb9d206d am: a64aff4551 am: 87e076681b am: 8d214cd0b0 am: 1ce2364aa0
am: 83cf30ec83
Change-Id: I4954f32655f51392a85d60e95e7837f64deee05d
|
| 83cf30ec83bccc27ca1204dc2afed54e2ca401cc |
06-Jun-2017 |
Jeff Tinker <jtinker@google.com> |
Fix integer overflow in mediadrmserver am: eb21712f81 am: 5250bc1bec am: d1a854a073 am: 7a22df06c3 am: 4e339cbca4 am: 1248e62082 am: fdfb9d206d am: a64aff4551 am: 87e076681b am: 8d214cd0b0
am: 1ce2364aa0
Change-Id: I408469564b54bb9dc393ab955236406c1c01f22e
|
| 8d214cd0b0b667b30b3f0f6021fcb5d7d95553d0 |
06-Jun-2017 |
Jeff Tinker <jtinker@google.com> |
Fix integer overflow in mediadrmserver am: eb21712f81 am: 5250bc1bec am: d1a854a073 am: 7a22df06c3 am: 4e339cbca4 am: 1248e62082 am: fdfb9d206d am: a64aff4551
am: 87e076681b
Change-Id: I2d9124f3aa6a0ed072708c4c6a7e37f061a0a089
|
| a64aff4551184706e379c14346c263df06b640e9 |
06-Jun-2017 |
Jeff Tinker <jtinker@google.com> |
Fix integer overflow in mediadrmserver am: eb21712f81 am: 5250bc1bec am: d1a854a073 am: 7a22df06c3 am: 4e339cbca4 am: 1248e62082
am: fdfb9d206d
Change-Id: I09b988c8906ccbabd7bc970d6a0be117e8b4b1df
|
| 7a22df06c3aea406dee1b8f31842001d89f2e6d6 |
06-Jun-2017 |
Jeff Tinker <jtinker@google.com> |
Fix integer overflow in mediadrmserver am: eb21712f81 am: 5250bc1bec
am: d1a854a073
Change-Id: I212669c64a748fed506b8b4a90a568aa91d01787
|
| 5250bc1becd741d06c534fdabb19227090e6523e |
06-Jun-2017 |
Jeff Tinker <jtinker@google.com> |
Fix integer overflow in mediadrmserver
am: eb21712f81
Change-Id: I0caf94590f85f444a4705f62792c27a447fa8b69
|
| eb21712f81aa9f6d5b055113595220ee1506f35c |
05-Jun-2017 |
Jeff Tinker <jtinker@google.com> |
Fix integer overflow in mediadrmserver
bug:37710346
Change-Id: If18cfb5bb1d1f1b2997d2a0e1685590d674181f4
nitDataParser.cpp
|
| 46da191f228293adacbba447233e7e6e2dcdbcca |
06-Apr-2017 |
TreeHugger Robot <treehugger-gerrit@google.com> |
Merge "Add additional checks for invalid parameters" into oc-dev
|
| 7268713681d6bb79f6aacff68a0630833278f2f2 |
05-Apr-2017 |
Jeff Tinker <jtinker@google.com> |
Add additional checks for invalid parameters
The clearkey plugin didn't handle some cases of
invalid parameters, which was found the drm VTS test.
Test: drm vts test passes
bug:34178477
Change-Id: I4643e099f052169d6950db8002b13711b56f30f5
rmPlugin.h
|
| ffbe644a25052c7ccd394486c557d2130335ee45 |
30-Mar-2017 |
Jeff Tinker <jtinker@google.com> |
Clearkey plugin didn't handle negative test cases
Part of VTS tests for drm
Change-Id: Ia89aa51ec9018e633fd8b04bfeceb5fe4e631daa
related-to-bug: 32815560
rmPlugin.cpp
rmPlugin.h
|
| d76b8b5877a9c29bcf2385a1f7bfdf4043e398a0 |
07-Mar-2017 |
Jeff Tinker <jtinker@google.com> |
Prevent findSession from creating new sessions
findSession in the SessionLibrary wasn't detecting
the case of a sessionId not found. Since
DefaultKeyedVector was used, a new session id would
get created instead of returning a null sp.
Test: drm hidl hal vts test
bug:36006836
Change-Id: Iff00d8b84188d2bf9f26bceccf645bb730076378
rmPlugin.cpp
essionLibrary.cpp
essionLibrary.h
|
| 68b3d9f49e68a11af5225175dc9e60ce88819e84 |
07-Jan-2017 |
Edwin Wong <edwinwong@google.com> |
Pass application packagename to drm plugin.
Pass application package name to createPlugin and createDrmPlugin.
The application packagename will be used as part of a unique
identifier for drm plugin.
Test: Play Movies.
Test: ANDROID_BUILD_TOP= ./android-gts/tools/gts-tradefed run gts -m
GtsMediaTestCases --test
com.google.android.media.gts.WidevineH264PlaybackTests#testL1With480P60
Verify the application's packagename is reachable in the drm plugin's
debug log.
bug: 27101531
Change-Id: I84fb09b591a7af63f6e20004e910112a4ce6ebac
rmFactory.cpp
rmFactory.h
|
| 8a0470a12759dd77b73346c7caf11de8318c6d3c |
10-Dec-2016 |
Edwin Wong <edwinwong@google.com> |
provideKeyResponse to send an event to test AMediaDrm_setOnEventListener.
am: 58a795ba81
Change-Id: I36549dfe68546f0db60e841caa6c49c861095d9f
|
| 58a795ba810a929eb8d5f81502041f101c263bd2 |
16-Nov-2016 |
Edwin Wong <edwinwong@google.com> |
provideKeyResponse to send an event to test AMediaDrm_setOnEventListener.
The drm plugin provides a listener, we send a kDrmPluginEventVendorDefined
if provideKeyResponse succeeds.
The reason for sending kDrmPluginEventVendorDefined is because
kDrmPluginEventKeysChange currently does not have ndk api support.
This addition is intended for testing AMediaDrm_setOnEventListener only.
Test: cherrypick go/ag/1598039 and go/ag/1630324
ANDROID_BUILD_TOP= ./android-cts/tools/cts-tradefed run cts -m CtsMediaTestCases --test android.media.cts.NativeClearKeySystemTest#testClearKeyPlaybackCenc
Test passes and look for "EVENT_VENDOR_DEFINED received" in the debug log.
bug: 32648208
Change-Id: Iec98b856e8d4ce888f8a1cd2568a3dee871effc5
rmPlugin.cpp
|
| 95ec4e074264966eac7ca04fc638a867d41b490d |
14-Sep-2016 |
Edwin Wong <edwinwong@google.com> |
Fix AMediaDrm_getKeyRequest which fails clearkey InitDataParser::parse test. am: 01a977aa75
am: af786a3f97
Change-Id: I2b4ac15bfaa5edf69c9ca12eccfb64df761e63fd
|
| 01a977aa75c296c5467024a7beac50cbd4ed0335 |
11-Aug-2016 |
Edwin Wong <edwinwong@google.com> |
Fix AMediaDrm_getKeyRequest which fails clearkey InitDataParser::parse test.
AMediaDrm_getKeyRequest() passes mimeType to drm plugin's getKeyRequest()
based on the UUID. If the drm scheme is clearkey UUID, clearkey plugin will
return ERROR_DRM_CANNOT_HANDLE because it is expecting initDataType
(e.g. "cenc") instead of mimeType (e.g. "video/mp4").
Replace initDataType parameter in clearkey DrmPlugin::getKeyRequest() with
mimeType.
bug: 30790899
Change-Id: I60c77c458d8d836d3eb2f9f52296a86efa73a4eb
rmFactory.cpp
rmFactory.h
rmPlugin.cpp
rmPlugin.h
nitDataParser.cpp
nitDataParser.h
imeType.h
ession.cpp
ession.h
ests/InitDataParserUnittest.cpp
|
| aee0669a7bdc1502a5e3d0752aaf84b0354a005e |
10-Aug-2016 |
Chih-Hung Hsieh <chh@google.com> |
Merge "Fix clang-tidy warnings in drm."
am: e055519839
Change-Id: I99159fb0391af796445ea24265d088d20d178077
|
| 8c0164ca98bcc76f3656fb1078033bffd4a387de |
09-Aug-2016 |
Chih-Hung Hsieh <chh@google.com> |
Fix clang-tidy warnings in drm.
* Add explicit keyword to conversion constructors.
Bug: 28341362
* Use const reference type for read-only parameters.
Bug: 30407689
* Use const reference type to avoid unnecessary copy.
Bug: 30413862
Test: build with WITH_TIDY=1
Change-Id: Idf1c48d7bfe3f0da20401cb3ff1983ec00be170d
ryptoPlugin.h
rmPlugin.h
|
| b2231171d83c196dbb97aaa2563fa142e33a91c6 |
13-Feb-2016 |
Aurimas Liutikas <aurimas@google.com> |
Fix more unused parameter warnings in frameworks/av/drm.
Bug: 27151704
Change-Id: Id153f12623b5d9d447f3f0605c30caf8743c367c
ryptoPlugin.cpp
|
| 18cb1eca504817b5b144a023ae2792d90e74c9a5 |
18-Dec-2015 |
Jeff Tinker <jtinker@google.com> |
Support AES-CBC sample encryption in MediaDrm
bug:23719082
Change-Id: I3028452f315122b65296881aed1fbf66c3ceeebc
ryptoPlugin.cpp
ryptoPlugin.h
|
| 6ca0256a1dcd85e1fa0a535347a9f0ecc57e284d |
09-Dec-2015 |
Jeff Tinker <jtinker@google.com> |
Remove unused MediaDrm.unprovisionDevice
bug:25726218
Change-Id: I6eb0ceb488c66c191897b3c190f5da1d71880c77
rmPlugin.h
|
| 9472e5f3ab44f04c92e44ad0f3e94c0ee508ec11 |
30-May-2015 |
Jeff Tinker <jtinker@google.com> |
Implement MediaCrypto.setMediaDrmSession in clearkey plugin
To support adding cts tests for new APIs in M, the
clearkey DRM plugin needs to be updated.
Change-Id: If672ecec8f570d1dd5130e8e4419d37bd931a9e2
related-to-bug: 21527003
ryptoFactory.cpp
ryptoPlugin.cpp
ryptoPlugin.h
rmPlugin.cpp
essionLibrary.cpp
essionLibrary.h
|
| d072c909d87f8150433860f6de4c11df6e09e2f9 |
16-Mar-2015 |
Jeff Tinker <jtinker@google.com> |
Report key request message type for unprefixed EME
bug: 19771299
Change-Id: I02f0a4532b5ea8a7e680d71f45ac0da06879f3d6
rmPlugin.cpp
rmPlugin.h
|
| b7909adcef247c627fbe8026624b9ecbeba47655 |
26-Jan-2015 |
Kenny Root <kroot@google.com> |
am 64b08d23: am cbb803a5: Merge "Remove superfluous OpenSSL include paths."
* commit '64b08d230c94872e014831bdb7b8a323c4b584ec':
Remove superfluous OpenSSL include paths.
|
| 683202e1d42d2642f7471272b4a3b5d64525a7bf |
23-Jan-2015 |
Adam Langley <agl@google.com> |
Remove superfluous OpenSSL include paths.
The libcrypto and libssl modules (and their respective static and host
versions) use LOCAL_EXPORT_C_INCLUDE_DIRS thus just including the module
is sufficient.
Change-Id: If9df76e6fefb7419cbb2fb33a0264626c748561e
ndroid.mk
ests/Android.mk
|
| 9226e7c5eba914e6917bf59e1b26417aedf1436a |
11-Nov-2014 |
Dan Albert <danalbert@google.com> |
am 2f702c9b: am 43e10bb7: Merge "Move to libc++."
* commit '2f702c9bc0d07f5d48f6f50586b1e11d9ac59381':
Move to libc++.
|
| effaa7832a095c11acedbe488ebbeff296f35ab8 |
10-Nov-2014 |
Dan Albert <danalbert@google.com> |
Move to libc++.
This also cleans up some makefile cruft.
Bug: 15193147
Change-Id: Ia53ca4f6fb2153f4e77e6f696eb27dcaae73a78e
ndroid.mk
ests/Android.mk
|
| 3c1285e8f86bd497e14c14fb6df7b42072ef52bd |
31-Oct-2014 |
Jeff Tinker <jtinker@google.com> |
Add missing secure stop methods
b/18053197
b/18076411
Change-Id: I923dc893d48c70bf17980007b32f0ac5dfd22896
rmPlugin.h
|
| 68b15554f6dca3b056eac517fe5fa2fd4ee80a33 |
30-Apr-2014 |
Jeff Tinker <jtinker@google.com> |
Allow device to be unprovisioned
bug: 12247651
Change-Id: I564ac8de3da2430342a028f4058e2c5ac2d85d5e
rmPlugin.h
|
| 4ebf92c0418584f1bb5ab3e83e8398351f4c05e5 |
01-Jul-2014 |
Edwin Wong <edwinwong@google.com> |
Create a single test binary.
To run individual test suite, follow the example shown below:
adb shell LD_LIBRARY_PATH=/system/vendor/lib/mediadrm /system/bin/ClearKeyDrmUnitTest
--gtest_filter=JsonWebKeyTest.*
Change-Id: I8ecc944a734cde351505a7cd8c3997976d74553b
ests/Android.mk
ests/unit-test.mk
|
| 2421a4ba309f082a83be9b8e385c00cd8e0043f6 |
01-Jul-2014 |
Edwin Wong <edwinwong@google.com> |
Fix build target path.
Change-Id: I45ee7efb13ffaff8c15ce6b2aea3076db713c73e
ndroid.mk
ests/unit-test.mk
|
| 8d0bc4a8ea2a5d0d6aba036f15b185d60e18778f |
23-Jun-2014 |
John "Juce" Bruce <juce@google.com> |
Add Unit Tests for ClearKey Plugin
Change-Id: I0008a01d29ade169df9a0fd30ca0303adf9ecad3
ndroid.mk
ests/AesCtrDecryptorUnittest.cpp
ests/Android.mk
ests/InitDataParserUnittest.cpp
ests/unit-test.mk
|
| 1fe11a5d1b7932a8a4a4e6e8cf1aedd21fcdb3aa |
14-May-2014 |
John "Juce" Bruce <juce@google.com> |
ClearKey Implementation of DRM Plugin APIs
Adds shared-object entry points and interface implementations that
implement the Android ClearKey DRM Plugin API.
Change-Id: Ie889747492cf85efe883149833105538faaa4cfe
ndroid.mk
learKeyUUID.cpp
learKeyUUID.h
reatePluginFactories.cpp
reatePluginFactories.h
ryptoFactory.cpp
ryptoFactory.h
ryptoPlugin.cpp
ryptoPlugin.h
rmFactory.cpp
rmFactory.h
rmPlugin.cpp
rmPlugin.h
ession.cpp
ession.h
essionLibrary.cpp
essionLibrary.h
|
| 7bdf28d2b83e527f474e96b0984d6a3f5eb457f7 |
16-May-2014 |
Edwin Wong <edwinwong@google.com> |
JsonWebKey support.
Parses JSON Web Key Set in the response data; extracts and base64 decode
key id(s) and key(s).
bug: 12035506
Change-Id: Ib71bce942d6eca1e569dfad0a9adb6dee1cdf75e
sonWebKey.cpp
sonWebKey.h
ests/Android.mk
ests/JsonWebKeyUnittest.cpp
ests/unit-test.mk
|
| 6b3c1473199927264691bb50445cf0b35c2f8892 |
11-Jun-2014 |
John "Juce" Bruce <juce@google.com> |
Implement ClearKey Init Data Parser
Implements an object that can convert ISO-CENC or WebM initialization
data into a ClearKey license request.
Change-Id: Ib95012afcf40fc9e3f45510a468c305fb7bc216e
ndroid.mk
nitDataParser.cpp
nitDataParser.h
|
| 16dfdcff6e4bb025220b88d5fc132ae48e7cb437 |
11-Jun-2014 |
John "Juce" Bruce <juce@google.com> |
Implement OpenSSL-Based Decryptor
Implements an object that does AES-CTR-128 by invoking OpenSSL.
Change-Id: I8457899ec8b69bd8f0d727029985c9580911cf99
esCtrDecryptor.cpp
esCtrDecryptor.h
ndroid.mk
learKeyTypes.h
|
| 47a86fb32803a37f03a40e4ea13e1f7db6cd728d |
16-May-2014 |
John "Juce" Bruce <juce@google.com> |
Add ClearKey Utilities
Adds some utility functionality that is shared by multiple parts of
the ClearKey code.
Change-Id: I33a896eb68b2937918f145c9bd27174a119294b9
ndroid.mk
learKeyTypes.h
tils.cpp
tils.h
|