Source release 14.2.0

oemcrypto/test/oec_session_util.cpp

@@ -29,9 +29,9 @@
 #include "disallow_copy_and_assign.h"
 #include "log.h"
 #include "oec_device_features.h"
+#include "oec_test_data.h"
 #include "oemcrypto_types.h"
 #include "string_conversions.h"
-#include "test_rsa_key.h"
 
 using namespace std;
 
@@ -221,7 +221,7 @@ void Session::DeriveKeys(const uint8_t* master_key,
 }
 
 void Session::GenerateDerivedKeysFromKeybox(
-    const wvcdm_test_auth::WidevineKeybox& keybox) {
+    const wvoec::WidevineKeybox& keybox) {
   GenerateNonce();
   vector<uint8_t> mac_context;
   vector<uint8_t> enc_context;
@@ -951,8 +951,8 @@ void Session::RewrapRSAKey30(const struct RSAPrivateKeyMessage& encrypted,
 
 void Session::PreparePublicKey(const uint8_t* rsa_key, size_t rsa_key_length) {
   if (rsa_key == NULL) {
-    rsa_key = wvcdm_test_auth::kTestRSAPKCS8PrivateKeyInfo2_2048;
-    rsa_key_length = wvcdm_test_auth::kTestRSAPKCS8PrivateKeyInfo2_2048_Size;
+    rsa_key = kTestRSAPKCS8PrivateKeyInfo2_2048;
+    rsa_key_length = sizeof(kTestRSAPKCS8PrivateKeyInfo2_2048);
   }
   uint8_t* p = const_cast<uint8_t*>(rsa_key);
   boringssl_ptr<BIO, BIO_vfree> bio(BIO_new_mem_buf(p, rsa_key_length));
@@ -1094,9 +1094,14 @@ void Session::InstallRSASessionTestKey(const vector<uint8_t>& wrapped_rsa_key) {
   GenerateDerivedKeysFromSessionKey();
 }
 
-void Session::CreateNewUsageEntry() {
-  ASSERT_EQ(OEMCrypto_SUCCESS,
-            OEMCrypto_CreateNewUsageEntry(session_id(), &usage_entry_number_));
+void Session::CreateNewUsageEntry(OEMCryptoResult* status) {
+  OEMCryptoResult result =
+      OEMCrypto_CreateNewUsageEntry(session_id(), &usage_entry_number_);
+  if (status) {
+    *status = result;
+    return;
+  }
+  ASSERT_EQ(OEMCrypto_SUCCESS, result);
 }
 
 void Session::UpdateUsageEntry(std::vector<uint8_t>* header_buffer) {