summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Tinker <jtinker@google.com>2014-03-04 13:23:56 -0800
committerJeff Tinker <jtinker@google.com>2014-03-29 08:41:39 -0700
commitc2f10f20ec9be98f363d6739ba1552955efe6532 (patch)
tree1188ff60095ac9325c0287574e14a4c14596cd9a
parenta0da27d546865d075322c410121e9c3101cec449 (diff)
downloadframeworks_native-c2f10f20ec9be98f363d6739ba1552955efe6532.zip
frameworks_native-c2f10f20ec9be98f363d6739ba1552955efe6532.tar.gz
frameworks_native-c2f10f20ec9be98f363d6739ba1552955efe6532.tar.bz2
Support CAST V2 Authentication in MediaDrm
Update frameworks to enable support for CAST V2 Authentication in the DRM Plugin. Change-Id: Ic38f0e1484b1388dd87f4591c74984cb724d50e2 related-to-bug: 12702350
-rw-r--r--include/media/drm/DrmAPI.h17
1 files changed, 15 insertions, 2 deletions
diff --git a/include/media/drm/DrmAPI.h b/include/media/drm/DrmAPI.h
index 95bdf77..fc6b49c 100644
--- a/include/media/drm/DrmAPI.h
+++ b/include/media/drm/DrmAPI.h
@@ -178,12 +178,16 @@ namespace android {
// provisioning server.
//
// If successful, the opaque provision request blob is returned to the caller.
- virtual status_t getProvisionRequest(Vector<uint8_t> &request,
+ virtual status_t getProvisionRequest(String8 const &cert_type,
+ String8 const &cert_authority,
+ Vector<uint8_t> &request,
String8 &defaultUrl) = 0;
// After a provision response is received by the app, it is provided to the
// Drm plugin using provideProvisionResponse.
- virtual status_t provideProvisionResponse(Vector<uint8_t> const &response) = 0;
+ virtual status_t provideProvisionResponse(Vector<uint8_t> const &response,
+ Vector<uint8_t> &certificate,
+ Vector<uint8_t> &wrapped_key) = 0;
// A means of enforcing the contractual requirement for a concurrent stream
// limit per subscriber across devices is provided via SecureStop. SecureStop
@@ -290,6 +294,15 @@ namespace android {
bool &match) = 0;
+ // Compute an RSA signature on the provided message using the algorithm
+ // specified by algorithm.
+ virtual status_t signRSA(Vector<uint8_t> const &sessionId,
+ String8 const &algorithm,
+ Vector<uint8_t> const &message,
+ Vector<uint8_t> const &wrapped_key,
+ Vector<uint8_t> &signature) = 0;
+
+
status_t setListener(const sp<DrmPluginListener>& listener) {
Mutex::Autolock lock(mEventLock);
mListener = listener;