summaryrefslogtreecommitdiffstats
path: root/media/libmedia/ICrypto.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r13' into HEADJessica Wagantall2016-02-011-1/+3
|\ | | | | | | | | | | | | Android 6.0.1 release 13 Ticket: CYNGNOS-1522 Change-Id: Ie9d7be6df3e63138bafb892a3181446e3c7d844e
| * Fix security vulnerability in ICrypto DO NOT MERGEJeff Tinker2015-12-101-1/+3
| | | | | | | | | | | | b/25800375 Change-Id: I03c9395f7c7de4ac5813a1207452aac57aa39484
* | Merge tag 'android-6.0.0_r26' into cm-13.0Ricardo Cerqueira2015-11-051-2/+1
|\ \ | |/ | | | | | | | | Android 6.0.0 release 26 Change-Id: I8a57007bf6efcd8b95c3cebf5e0444345bdd4cda
| * DO NOT MERGE Fix vulnerability in mediaserverJeff Tinker2015-09-161-1/+1
| | | | | | | | | | | | | | ICrypto.cpp: ASLR bypass using DECRYPT IPC bug: 24074485 Change-Id: I61cd77f0894140547f666a80526ebfe1ec3d2db6
| * Fix for security vulnerability in media serverJeff Tinker2015-08-271-1/+19
| | | | | | | | | | bug: 23540426 Change-Id: Ifb12ac3350410a49ba7d81d1bde12822c3008cd5
* | Merge tag 'android-6.0.0_r5' into HEADRicardo Cerqueira2015-11-031-1/+19
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 6.0.0 release 5 Conflicts: media/libstagefright/OggExtractor.cpp media/libstagefright/Utils.cpp Change-Id: I2ea44836c5cc3da8ffa2092522293c433bf7538c
| * | Fix for security vulnerability in media serverJeff Tinker2015-09-281-1/+19
| |/ | | | | | | | | bug: 23540426 Change-Id: Ifb12ac3350410a49ba7d81d1bde12822c3008cd5
* | libmedia: close secure buffer file descriptorManikanta Kanamarlapudi2015-10-061-1/+1
| | | | | | | | | | | | | | call closeFileDesciptor for secureBufferId to avoid fd leaks. Change-Id: I8fe8923795f8cfb7f67fc82a1f7d99334940964b
* | Stagefright: Enable custom allocation mode.Shivaprasad Hongal2015-10-061-0/+5
| | | | | | | | | | | | Enable custom allocation mode Change-Id: Idf3f6c0eb9d17d361d2e5b6c36b1fe7586236565
* | Stagefright: Add Checks for allocationsSathishKumar Mani2015-10-061-0/+2
|/ | | | | | | Warn allocation failures explicitly rather than crash trying to access unallocated memory Change-Id: Ie86c3ac130917e1f4030eb8207ac8350cba7711d
* Part of fix for libmedia OOB write anywhereJeff Tinker2015-08-171-3/+3
| | | | | | | | | Clarify that decrypt destination is not a pointer for secure case. b/23223325 Change-Id: I642dcf790a9eb9e32175f3e0d8f040c82228e3ac
* Pass all DRM errors through ICryptoJeff Tinker2015-05-051-3/+2
| | | | | | | | | | Previously only the detailed messages for vendor-defined DRM errors were being passed. This change allows detailed messages to be passed for any DRM error, including the ones defined in the framework. bug: 20857014 Change-Id: I72aa85b31ac852fb1fb6ad0a93f3309100b52c9d
* Add a method to associate MediaDrm session with MediaCryptoJeff Tinker2015-04-101-0/+42
| | | | | | | | | | | | | | Previously, to associate a MediaDrm session with MediaCrypto, the MediaDrm sessionId was passed as initData to the MediaCrypto constructor. This is not ideal for two reasons: it's pretty obscure and you can't change the association without tearing down the MediaCodec/MediaCrypto and starting all over. Use cases like key rotation require being able to update the MediaDrm session post-construction. This CL addresses both of these issues. bug: 19570317 Change-Id: Ieb32d04d61742fc1dee2105dd904690d44c46c7b
* Pass crypto source data using a shared bufferJeff Tinker2015-04-081-9/+15
| | | | | | | | | | | | | MediaCodec was using a binder transaction buffer to pass encryption source data for protected content. On some 4K content, the max binder transaction buffer size was being exceeded. This change uses a shared buffer for the encryption source data instead of a binder transaction buffer, which avoids the problem and may be more efficient. bug: 20027687 Change-Id: I36a24ebf600d7e1064b78e48b167fdc29b2c65e9
* Pass resolution to Crypto plugin on format changeJeff Tinker2014-11-031-1/+21
| | | | | Change-Id: I56cd557ce3525fe625db8c312d2557d3c8b51101 related-to-bug: 16034599
* Remove dependency on Parcel::{read,write}IntPtrJeff Tinker2014-06-101-2/+2
| | | | | | | bug: 15424960 bug: 15107693 Change-Id: Ic3bf37f591e620985c37f345f9a5544fd20ec4a1
* Load crypto plugins from additional shared librariesJeff Tinker2013-03-221-1/+1
| | | | | | | | | | | | | | Currently crypto plugins are expected to be in libdrmdecrypt.so. When there are multiple plugins supporting different schemes, this approach requires source code integration across vendors which is unmanagable. Also, for integration with MediaDrm where the crypto keys are obtained from a drm server, the MediaCrypto plugin needs to interoperate with the MediaDrm plugin. This change allows {MediaCrypto, MediaDrm} pairs that are logically related to be implemented in a common shared library. Change-Id: I7f6638f29171f91609fc2d944396365568630b56
* Fixed sample video corrupted in MediaCodec mode.Edwin Wong2012-07-131-17/+12
| | | | | Change-Id: I50c5660072d40f6e297e58fd026ea04c89d6a70a related-to-bug: 6732061
* Allow propagation of error information and description from the CryptoPlugin toAndreas Huber2012-04-191-2/+17
| | | | | | | the higher layers. Change-Id: I9f434ad55cdf575803c208bedf47b607baff2330 related-to-bug: 6365261
* Make it possible to pass empty opaque data as (NULL, 0) to ICrypto.Andreas Huber2012-04-111-5/+15
| | | | | Change-Id: Ifee1744890b645e008c9aff3783625a7bfbcff27 related-to-bug: 6275919
* New API to support submitting encrypted buffers to the decoder.Andreas Huber2012-04-061-0/+11
| | | | | Change-Id: I69dd60e43078c4211c6123cf6e0ce90e676bf873 related-to-bug: 6275919
* New Crypto services talking to the new crypto "HAL".Andreas Huber2012-04-031-147/+122
| | | | | Change-Id: I69ed31e7a8b4d69d1209d2d516f94d258f072566 related-to-bug: 6275919
* Provisional support for secure decryption of media streams.Andreas Huber2012-03-261-0/+293
Change-Id: Ib3982a9c960bfdb0cb7e1b174440b141b194cfbe
generated by cgit v1.1 at 2024-05-06 01:21:13 +0000