File util, generic crypto, and key query

This CL merges several CLs from the widevine repo:

http://go/wvgerrit/18012 Add support for querying allowed usage for key.
http://go/wvgerrit/17971 Add per-origin storage.
http://go/wvgerrit/18152 Add OEMCrypto's generic crypto operations to CDM.
http://go/wvgerrit/17911 QueryKeyControlInfo => QueryOemCryptoSessionId

Note: numbering in wv_cdm_types.h was added in this CL and will be
back ported to wvgerrit in a future CL.

Change-Id: Idb9e9a67e94f62f25dc16c5307f75a08b3430b64

libwvdrmengine/cdm/core/include/cdm_session.h

@@ -8,6 +8,7 @@
 
 #include "crypto_session.h"
 #include "device_files.h"
+#include "file_store.h"
 #include "initialization_data.h"
 #include "license.h"
 #include "oemcrypto_adapter.h"
@@ -22,24 +23,7 @@ class WvCdmEventListener;
 
 class CdmSession {
  public:
-  CdmSession(const std::string& origin)
-      : initialized_(false),
-        origin_(origin),
-        crypto_session_(new CryptoSession),
-        file_handle_(new DeviceFiles),
-        license_received_(false),
-        is_offline_(false),
-        is_release_(false),
-        is_temporary_(false),
-        security_level_(kSecurityLevelUninitialized),
-        requested_security_level_(kLevelDefault),
-        is_initial_decryption_(true),
-        has_decrypted_since_last_report_(false),
-        is_initial_usage_update_(true),
-        is_usage_update_needed_(false),
-        mock_license_parser_in_use_(false),
-        mock_policy_engine_in_use_(false) {}
-
+  CdmSession(FileSystem* file_system);
   virtual ~CdmSession();
 
   virtual CdmResponseType Init(CdmClientPropertySet* cdm_client_property_set);
@@ -63,13 +47,17 @@ class CdmSession {
   virtual CdmResponseType AddKey(const CdmKeyResponse& key_response);
 
   // Query session status
-  virtual CdmResponseType QueryStatus(CdmQueryMap* key_info);
+  virtual CdmResponseType QueryStatus(CdmQueryMap* query_response);
 
   // Query license information
-  virtual CdmResponseType QueryKeyStatus(CdmQueryMap* key_info);
+  virtual CdmResponseType QueryKeyStatus(CdmQueryMap* query_response);
 
-  // Query session control info
-  virtual CdmResponseType QueryKeyControlInfo(CdmQueryMap* key_info);
+  // Query allowed usages for key
+  virtual CdmResponseType QueryKeyAllowedUsage(const std::string& key_id,
+                                               CdmKeyAllowedUsage* key_usage);
+
+  // Query OEMCrypto session ID
+  virtual CdmResponseType QueryOemCryptoSessionId(CdmQueryMap* query_response);
 
   // Decrypt() - Accept encrypted buffer and return decrypted data.
   virtual CdmResponseType Decrypt(const CdmDecryptionParameters& parameters);
@@ -131,11 +119,41 @@ class CdmSession {
 
   bool DeleteLicense();
 
+  // Generate unique ID for each new session.
+  CdmSessionId GenerateSessionId();
+
+  // Generic crypto operations - provides basic crypto operations that an
+  // application can use outside of content stream processing
+
+  // Encrypts a buffer of app-level data.
+  virtual CdmResponseType GenericEncrypt(const std::string& in_buffer,
+                                         const std::string& key_id,
+                                         const std::string& iv,
+                                         CdmEncryptionAlgorithm algorithm,
+                                         std::string* out_buffer);
+
+  // Decrypts a buffer of app-level data.
+  virtual CdmResponseType GenericDecrypt(const std::string& in_buffer,
+                                         const std::string& key_id,
+                                         const std::string& iv,
+                                         CdmEncryptionAlgorithm algorithm,
+                                         std::string* out_buffer);
+
+  // Computes the signature for a message.
+  virtual CdmResponseType GenericSign(const std::string& message,
+                                      const std::string& key_id,
+                                      CdmSigningAlgorithm algorithm,
+                                      std::string* signature);
+
+  // Verifies the signature on a buffer of app-level data.
+  virtual CdmResponseType GenericVerify(const std::string& message,
+                                        const std::string& key_id,
+                                        CdmSigningAlgorithm algorithm,
+                                        const std::string& signature);
+
  private:
   friend class CdmSessionTest;
 
-  // Generate unique ID for each new session.
-  CdmSessionId GenerateSessionId();
   bool GenerateKeySetId(CdmKeySetId* key_set_id);
 
   CdmResponseType StoreLicense();
@@ -150,7 +168,6 @@ class CdmSession {
   // instance variables
   bool initialized_;
   CdmSessionId session_id_;
-  const std::string origin_;
   scoped_ptr<CdmLicense> license_parser_;
   scoped_ptr<CryptoSession> crypto_session_;
   scoped_ptr<PolicyEngine> policy_engine_;