Source release v3.5.0

core/include/service_certificate.h

@@ -49,8 +49,19 @@ class ServiceCertificate {
       const video_widevine::ClientIdentification* clear_client_id,
       video_widevine::EncryptedClientIdentification* encrypted_client_id);
 
+  // Helper methods
+  static bool GetRequest(CdmKeyMessage* request);
+  static CdmResponseType ParseResponse(const std::string& response,
+                                       std::string* signed_certificate);
  private:
 
+  // Encrypt data using RSA with OAEP padding.
+  // |plaintext| is the data to be encrypted. |ciphertext| is a pointer to a
+  // string to contain the decrypted data on return, and may not be null.
+  // returns NO_ERROR if successful or an appropriate error code otherwise.
+  virtual CdmResponseType EncryptRsaOaep(const std::string& plaintext,
+                                         std::string* ciphertext);
+
   // Track whether object holds valid certificate
   bool has_certificate_;
 
@@ -64,7 +75,7 @@ class ServiceCertificate {
   std::string provider_id_;
 
   // Public key.
-  std::unique_ptr<RsaPublicKey> public_key_;
+  std::auto_ptr<RsaPublicKey> public_key_;
 
   CORE_DISALLOW_COPY_AND_ASSIGN(ServiceCertificate);
 };