Below are a set of CLs being merged from the wv cdm repo to the android repo. * Fix handling of OEM Cert public key. Author: Srujan Gaddam <srujzs@google.com> [ Merge of http://go/wvgerrit/27921 ] This is a potential fix for b/36656190. Set aside public key on first call to get the public key, and use it afterwards. This gets rid of extra calls to OEMCrypto_GetOEMPublicCertificate(), which has side-effect of staging the OEM private key. This also fixes a problem where the public cert string was not being trimmed to match the size returned by OEMCrypto_GetOEMPublicCertificate(). * Complete provisioning request/response for Provisioning 3.0 Author: Gene Morgan <gmorgan@google.com> [ Merge of http://go/wvgerrit/27780 ] Fix bug on provisioning request path where GenerateDerivedKeys() was being called when preparing to generate the signature. Add message signature verification, and call correct OEMCrypto routine to rewrap the private key (OEMCrypto_RewrapDeviceRSAKey30). * Implement Cdm::deleteAllUsageRecords() Author: Gene Morgan <gmorgan@google.com> [ Merge of http://go/wvgerrit/27780 ] Delete all usage records for current origin. Removes usage records from file system and retains the PSTs. The deletes any usage entries matching those PSTs held by OEMCrypto. BUG: 35319024 * Remove stringencoders library from third_party. Author: Jacob Trimble <modmaker@google.com> [ Merge of http://go/wvgerrit/27585 ] We have a fork of the stringencoders library that we use for base64 encoding. This reimplements base64 encoding to remove the extra dependency and to reduce the amount of code. * Add Cdm::deleteUsageRecord() based on key_set_id. Author: Gene Morgan <gmorgan@google.com> [ Merge of http://go/wvgerrit/27605 ] Delete specified usage record from file system usage info and from OEMCrypto. BUG: 35319024 * Modifiable OEMCrypto Author: Fred Gylys-Colwell <fredgc@google.com> [ Merge of http://go/wvgerrit/24729 ] This CL adds a new variant of the OEMCrypto mock code that adjusts its behavior based on a configuration file. This is intended for testing. For example, a tester can set current_hdcp to 2 in the options.txt file, push it to the device, and verify that a license is granted for HDCP 2.0. Then the tester can edit the value of current_hdcp to 1 and push the file to the device. Playback should stop because the license is no longer valid. This variant uses a real level 1 liboemcrypto.so to push data to a secure buffer. That means we can test playback for a license that requires secure buffers on an Android device with real secure buffers. BUG: 35141278 BUG: 37353534 BUG: 71650075 Test: Not currently passing. Will be addressed in a subsequent commit in the chain. Change-Id: I58443c510919e992bb455192e70373490a00e2b6
90 lines
3.3 KiB
C++
90 lines
3.3 KiB
C++
// Copyright 2017 Google Inc. All Rights Reserved.
|
|
//
|
|
#ifndef WVCDM_CORE_SERVICE_CERTIFICATE_H_
|
|
#define WVCDM_CORE_SERVICE_CERTIFICATE_H_
|
|
|
|
// Service Certificates are used to encrypt the ClientIdentification message
|
|
// that is part of Device Provisioning, License, Renewal, and Release requests.
|
|
// It also supplies a provider_id setting used in device provisioning.
|
|
// Service Certificates are typically supplied by the application. If one
|
|
// is not supplied and privacy mode is enabled, the CDM will send a Service
|
|
// Certificate Request to the target server to get one. Once the Service
|
|
// Certificate is established for the session, it should not change.
|
|
|
|
#include "license_protocol.pb.h"
|
|
#include "wv_cdm_types.h"
|
|
|
|
namespace video_widevine {
|
|
class SignedMessage;
|
|
class LicenseRequest;
|
|
} // namespace video_widevine
|
|
|
|
namespace wvcdm {
|
|
|
|
class CryptoSession;
|
|
|
|
class ServiceCertificate {
|
|
public:
|
|
ServiceCertificate() {}
|
|
virtual ~ServiceCertificate() {}
|
|
|
|
// Set up a new service certificate.
|
|
// Accept a serialized video_widevine::SignedDrmDeviceCertificate message.
|
|
virtual CdmResponseType Init(const std::string& signed_certificate);
|
|
|
|
// Initialize the service certificate.
|
|
// Set the certificate with no certificate and provider ID.
|
|
virtual void Clear();
|
|
|
|
// Current state of certificate.
|
|
// If !HasCertificate() and privacy mode is enabled, then should call
|
|
// PrepareRequest() and pass the request to the license server.
|
|
virtual bool HasCertificate() { return !certificate_.empty(); }
|
|
virtual bool HasProviderId() { return !provider_id_.empty(); }
|
|
virtual const std::string& provider_id() { return provider_id_; }
|
|
|
|
// Verify the signature for a message.
|
|
virtual CdmResponseType VerifySignedMessage(const std::string& message,
|
|
const std::string& signature);
|
|
|
|
// Encrypt the ClientIdentification message for a provisioning or
|
|
// licensing request. Encryption is performed using the current
|
|
// service certificate. Return a failure if the service certificate is
|
|
// not present, not valid, or if some other error occurs.
|
|
// The routine should not be called if privacy mode is off or if the
|
|
// certificate is empty.
|
|
virtual CdmResponseType EncryptClientId(
|
|
CryptoSession* crypto_session,
|
|
const video_widevine::ClientIdentification* clear_client_id,
|
|
video_widevine::EncryptedClientIdentification* encrypted_client_id);
|
|
|
|
// Construct service certificate request.
|
|
virtual bool PrepareRequest(CdmKeyMessage* signed_request);
|
|
|
|
// Parse service certificate response and make it usable.
|
|
virtual CdmResponseType HandleResponse(
|
|
const std::string& signed_respnse);
|
|
|
|
private:
|
|
// Verify the signature on the signed service certificate.
|
|
// Extract and save the certificate and provider_id.
|
|
// Expected format: serialized video_widevine::SignedDrmDeviceCertificate.
|
|
virtual CdmResponseType VerifyAndExtract(
|
|
const std::string& raw_certificate);
|
|
|
|
// True while waiting for response to service certificate request.
|
|
bool fetch_in_progress_;
|
|
|
|
// Certificate, verified and extracted from signed message.
|
|
std::string certificate_;
|
|
|
|
// Provider ID, extracted from certificate message.
|
|
std::string provider_id_;
|
|
|
|
CORE_DISALLOW_COPY_AND_ASSIGN(ServiceCertificate);
|
|
};
|
|
|
|
} // namespace wvcdm
|
|
|
|
#endif // WVCDM_CORE_SERVICE_CERTIFICATE_H_
|