Source release 14.2.0

oemcrypto/test/oec_session_util.h

@@ -14,7 +14,6 @@
 #include "oec_device_features.h"
 #include "oemcrypto_types.h"
 #include "pst_report.h"
-#include "test_keybox.h"
 
 using namespace std;
 
@@ -153,8 +152,7 @@ class Session {
                           vector<uint8_t>* enc_context);
   // Generate known mac and enc keys using OEMCrypto_GenerateDerivedKeys and
   // also fill out enc_key_, mac_key_server_, and mac_key_client_.
-  void GenerateDerivedKeysFromKeybox(
-      const wvcdm_test_auth::WidevineKeybox& keybox);
+  void GenerateDerivedKeysFromKeybox(const wvoec::WidevineKeybox& keybox);
   // Generate known mac and enc keys using OEMCrypto_DeriveKeysFromSessionKey
   // and also fill out enc_key_, mac_key_server_, and mac_key_client_.
   void GenerateDerivedKeysFromSessionKey();
@@ -292,7 +290,9 @@ class Session {
   // GenerateDerivedKeysFromSessionKey to install known encryption and mac keys.
   void InstallRSASessionTestKey(const vector<uint8_t>& wrapped_rsa_key);
   // Creates a new usage entry, and keeps track of the index.
-  void CreateNewUsageEntry();
+  // If status is null, we expect success, otherwise status is set to the
+  // return value.
+  void CreateNewUsageEntry(OEMCryptoResult *status = NULL);
   // Copy encrypted usage entry from other session, and then load it.
   // This session must already be open.
   void LoadUsageEntry(uint32_t index, const vector<uint8_t>& buffer);