Remove Stale Licenses on Reprovisioning

Merges change 267713c (Remove stale licenses on reprovisioning) from
the Widevine CDM repository.  This change removes licenses belonging
to the previous provisioning when provisioning changes.

Bug: 9761923
Change-Id: I473816dd11dd950f4fb009b5b004630bd2d2b579

libwvdrmengine/cdm/core/include/crypto_session.h

@@ -22,17 +22,9 @@ class CryptoSession {
   CryptoSession();
   ~CryptoSession();
 
-  typedef enum {
-    kSecurityLevelUninitialized,
-    kSecurityLevelL1,
-    kSecurityLevelL2,
-    kSecurityLevelL3,
-    kSecurityLevelUnknown
-  } SecurityLevel;
-
   bool ValidateKeybox();
   bool GetToken(std::string* token);
-  SecurityLevel GetSecurityLevel();
+  CdmSecurityLevel GetSecurityLevel();
   bool GetDeviceUniqueId(std::string* device_id);
   bool GetSystemId(uint32_t* system_id);
   bool GetProvisioningId(std::string* provisioning_id);
@@ -96,6 +88,7 @@ class CryptoSession {
 
   OEMCryptoBufferType destination_buffer_type_;
   bool is_destination_buffer_type_valid_;
+  CdmSecurityLevel security_level_;
 
   CORE_DISALLOW_COPY_AND_ASSIGN(CryptoSession);
 };

libwvdrmengine/cdm/core/include/device_files.h

@@ -17,10 +17,11 @@ class DeviceFiles {
     kLicenseStateUnknown,
   } LicenseState;
 
-  DeviceFiles() {}
+  DeviceFiles(): file_(NULL), security_level_(kSecurityLevelUninitialized),
+                 initialized_(false) {}
   virtual ~DeviceFiles() {}
 
-  virtual bool Init(File* handle);
+  virtual bool Init(const File* handle, CdmSecurityLevel security_level);
 
   virtual bool StoreCertificate(const std::string& certificate,
                                 const std::string& wrapped_private_key);
@@ -44,6 +45,7 @@ class DeviceFiles {
                                CdmKeyResponse* key_renewal_response,
                                std::string* release_server_url);
   virtual bool DeleteLicense(const std::string& key_set_id);
+  virtual bool DeleteAllLicenses();
   virtual bool LicenseExists(const std::string& key_set_id);
 
   // For testing only
@@ -57,6 +59,8 @@ class DeviceFiles {
 
  private:
   File* file_;
+  CdmSecurityLevel security_level_;
+  bool initialized_;
 
   CORE_DISALLOW_COPY_AND_ASSIGN(DeviceFiles);
 };

libwvdrmengine/cdm/core/include/properties.h

@@ -46,7 +46,8 @@ class Properties {
   static bool GetDeviceName(std::string* device_name);
   static bool GetProductName(std::string* product_name);
   static bool GetBuildInfo(std::string* build_info);
-  static bool GetDeviceFilesBasePath(std::string* base_path);
+  static bool GetDeviceFilesBasePath(CdmSecurityLevel security_level,
+                                     std::string* base_path);
   static bool GetFactoryKeyboxPath(std::string* keybox);
 
  private:

libwvdrmengine/cdm/core/include/wv_cdm_types.h

@@ -56,6 +56,14 @@ enum CdmLicenseType {
   kLicenseTypeRelease
 };
 
+enum CdmSecurityLevel {
+  kSecurityLevelUninitialized,
+  kSecurityLevelL1,
+  kSecurityLevelL2,
+  kSecurityLevelL3,
+  kSecurityLevelUnknown
+};
+
 struct CdmDecryptionParameters {
   bool is_encrypted;
   bool is_secure;