Merges to android Pi release (part 6)

These are a set of CLs merged from the wv cdm repo to the android repo.

* Enable Cast for Android Things build.

  Author: Thoren Paulson <thoren@google.com>

  [ Merge of http://go/wvgerrit/29941 ]

  Added a path to make_cast_libwvlevel3 for Android Things. Added the new
  system id to the preprocessor guards in android_keybox.cpp. Guarded the
  references to stderr in page_allocator.cpp because for some reason they
  don't get resolved when we link against the resulting library.

  BUG: 63443584

* Resolve memory leaks in use of OpenSSL.

  Author: Gene Morgan <gmorgan@google.com>

  [ Merge of http://go/wvgerrit/32700 ]

  Use of EVP_CIPHER_CTX requires a call to EVP_CIPHER_CTX_cleanup().

* Memory leak in OpenSSL RSA key handling.

  Author: Gene Morgan <gmorgan@google.com>

  [ Merge of http://go/wvgerrit/32621 ]

  This fixes a range of tests. --gtest_filter="CdmDecrypt*" runs
  five tests and still loses 5 objects totalling 1320 bytes (down
  from 6200 bytes).

* Unit test and mock OEMCrypto memory leaks.

  Author: Gene Morgan <gmorgan@google.com>

  [ Merge of http://go/wvgerrit/32640 ]

  More memory leak cleanup. All remaining leaks are due
  to calls to CRYPTO_malloc() without the matching free
  (i.e., calls into openssl).

* Clean up memory leaks in tests.

  Author: Gene Morgan <gmorgan@google.com>

  [ Merge of http://go/wvgerrit/32600 ]

  This is the first pass at cleaning up memory leaks. These leaks
  were affecting a lot of tests, making it hard to identify more
  serious leaks.

  Switch to unique_ptr<> pointers for CdmEngine in
  generic_crypto_unittest tests for FileSystem object in
  mock OEMCrypto's CryptoEngine object.

* Fix broken tests - linux-only & address sanitizer failures.

  Author: Gene Morgan <gmorgan@google.com>

  [ Merge of http://go/wvgerrit/32460 ]

  Fix broken test:
    WvCdmEnginePreProvTestStaging.ServiceCertificateInitialNoneTest

  Fix failures found by address sanitizer:
    DeviceFilesUsageInfoTest.RetrieveByProviderSessionToken
    DeviceFilesUsageInfoTest.UpdateUsageInfo

  NOTE: address sanitizer cannot handle EXPECT_CALL macros containing
  a call with a Contains matcher as an argument, e.g.:

  EXPECT_CALL(file,
              Write(Contains(certificate, wrapped_private_key, 0),
                    Gt(certificate.size() + wrapped_private_key.size())))

  The address sanitizer reports a crash, issues a report, and stops. A
  temporary fix is to replace the "Contains()" argument with "_".

* Usage license handling corrections

  Author: Rahul Frias <rfrias@google.com>

  [ Merge of http://go/wvgerrit/28540 ]

  Validate that offline licenses that do not contain a provider session
  token are not handled by the TEE.

  BUG: 38490468

  Test: WV Unit/integration tests, GtsMediaTestCases,
        WvCdmRequestLicenseTest.ReleaseRetryL3OfflineKeySessionUsageDisabledTest

* UsageTableEntry::CopyOldUsageEntry memcpy read out of range.

  Author: Gene Morgan <gmorgan@google.com>

  [ Merge of http://go/wvgerrit/32220 ]

  The function copies the pst from a variable length input vector
  into a 256 byte character array. But the length argument was a
  fixed value - MAC_KEY_SIZE. Depending on the actual PST length this
  can lead to memcpy reading out of bounds or the PST getting truncated.

BUG: 71650075
Test: Not currently passing. Will be addressed in a subsequent
  commit in the chain.

Change-Id: I81a4593d7d04d0ef6069ce48d0601b6fbdd85de9

libwvdrmengine/cdm/src/ami_adapter.cpp

@@ -22,10 +22,6 @@ AmiAdapter::~AmiAdapter() {
   analytics_item_.selfrecord();
 }
 
-metrics::Report* AmiAdapter::NewReport() const {
-  return new AmiAdapter(analytics_item_.getSessionID());
-}
-
 void AmiAdapter::UpdateString(const std::string& metric_id,
                               const std::string& value) {
   analytics_item_.setCString(metric_id.c_str(), value.c_str());

libwvdrmengine/cdm/src/log.cpp

@@ -22,6 +22,9 @@
 #include "log.h"
 #include <utils/Log.h>
 
+#include <stdio.h>
+#include <stdarg.h>
+
 /*
  * Uncomment the line below if you want to have the LOGV messages to print
  * IMPORTANT : this will affect all of CDM

libwvdrmengine/cdm/src/properties_android.cpp

@@ -19,7 +19,7 @@ const char kL2Dir[] = "/L2/";
 const char kL3Dir[] = "/L3/";
 const char kFactoryKeyboxPath[] = "/factory/wv.keys";
 
-const char kWVCdmVersion[] = "v5.0.0-android";
+const char kWVCdmVersion[] = "v5.1.0-android";
 
 bool GetAndroidProperty(const char* key, std::string* value) {
   char val[PROPERTY_VALUE_MAX];

libwvdrmengine/cdm/src/wv_content_decryption_module.cpp

@@ -7,7 +7,7 @@
 #include "initialization_data.h"
 #include "license.h"
 #include "log.h"
-#include "metrics_front_end.h"
+#include "metrics.pb.h"
 #include "properties.h"
 #include "service_certificate.h"
 #include "wv_cdm_constants.h"
@@ -21,22 +21,10 @@ namespace wvcdm {
 
 Lock WvContentDecryptionModule::session_sharing_id_generation_lock_;
 
-WvContentDecryptionModule::WvContentDecryptionModule() {
-  // TODO (b/36497276)
-  // replace call to new AmiAdapter() and remove ami_apdater.*
-  report_root_ = NULL; // new AmiAdapter();
-  front_end_ = new metrics::MetricsFrontEnd(report_root_);
-  metrics::MetricsFrontEnd::OverrideInstance(front_end_);
-}
+WvContentDecryptionModule::WvContentDecryptionModule() {}
 
 WvContentDecryptionModule::~WvContentDecryptionModule() {
   DisablePolicyTimer(true);
-
-  metrics::MetricsFrontEnd::OverrideInstance(NULL);
-  delete front_end_;
-  delete report_root_;
-  front_end_ = NULL;
-  report_root_ = NULL;
 }
 
 bool WvContentDecryptionModule::IsSupported(const std::string& init_data_type) {
@@ -414,6 +402,25 @@ bool WvContentDecryptionModule::IsValidServiceCertificate(
   return cert.has_certificate();
 }
 
+void WvContentDecryptionModule::GetSerializedMetrics(
+    std::string* serialized_metrics) {
+  drm_metrics::MetricsGroup metric_group;
+  {
+    AutoLock auto_lock(cdms_lock_);
+    for (auto it = cdms_.begin(); it != cdms_.end(); it++) {
+      metrics::EngineMetrics* engine_metrics =
+          it->second.cdm_engine->GetMetrics();
+      if (engine_metrics) {
+        // Serialize the metrics from the engine and any completed sessions.
+        // Clear the metrics from any completed sessions.
+        engine_metrics->Serialize(
+            metric_group.add_metric_sub_group(), true, true);
+      }
+    }
+  }
+  metric_group.SerializeToString(serialized_metrics);
+}
+
 WvContentDecryptionModule::CdmInfo::CdmInfo()
   : cdm_engine(new CdmEngine(&file_system)) {}