am b2f414fb: am 98e5bf2c: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev

* commit 'b2f414fbd6e3be45bbea28d84db3ce9712ddcd5b':
  Support CAST V2 Authentication in MediaDrm
This commit is contained in:
Jeff Tinker 2014-04-01 22:23:23 +00:00 committed by Android Git Automerger
commit 60a6337de0

View File

@ -178,12 +178,16 @@ namespace android {
// provisioning server. // provisioning server.
// //
// If successful, the opaque provision request blob is returned to the caller. // 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; String8 &defaultUrl) = 0;
// After a provision response is received by the app, it is provided to the // After a provision response is received by the app, it is provided to the
// Drm plugin using provideProvisionResponse. // 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 // A means of enforcing the contractual requirement for a concurrent stream
// limit per subscriber across devices is provided via SecureStop. SecureStop // limit per subscriber across devices is provided via SecureStop. SecureStop
@ -290,6 +294,15 @@ namespace android {
bool &match) = 0; 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) { status_t setListener(const sp<DrmPluginListener>& listener) {
Mutex::Autolock lock(mEventLock); Mutex::Autolock lock(mEventLock);
mListener = listener; mListener = listener;