ODK and Shared Libraries

In this code drop we introduce the ODK dependency. The reference
implementation has been updated to make use of the ODK and the related
tests have been included.

In addition, we have included an example of how a shared libraries can
be created. This will allow make it easier to test and verify different
implementations of the API.

Most other changes introduce by this code drop were made to clean-up the
reference implementation and limit dependencies.

api/license_whitebox_process_license_response_test.cc

@@ -14,7 +14,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace widevine {
-
 class LicenseWhiteboxProcessLicenseResponseTest
     : public LicenseWhiteboxTestBase {
  protected:
@@ -37,36 +36,42 @@ class LicenseWhiteboxProcessLicenseResponseTest
 TEST_F(LicenseWhiteboxProcessLicenseResponseTest, SuccessWithoutSigningKey) {
   UseLicenseWithoutSigningKey();
 
-  ASSERT_EQ(WB_License_ProcessLicenseResponse(
-                whitebox_, license_.message.data(), license_.message.size(),
-                license_.signature.data(), license_.signature.size(),
-                license_.session_key.data(), license_.session_key.size(),
-                license_.request.data(), license_.request.size()),
-            WB_RESULT_OK);
+  ASSERT_EQ(
+      WB_License_ProcessLicenseResponse(
+          whitebox_, license_.core_message.data(), license_.core_message.size(),
+          license_.message.data(), license_.message.size(),
+          license_.signature.data(), license_.signature.size(),
+          license_.session_key.data(), license_.session_key.size(),
+          license_.request.data(), license_.request.size()),
+      WB_RESULT_OK);
 }
 
 TEST_F(LicenseWhiteboxProcessLicenseResponseTest,
        SuccessWithSigningKeyNoPadding) {
   UseLicenseWithSigningKey(TestLicenseBuilder::NoPadding());
 
-  ASSERT_EQ(WB_License_ProcessLicenseResponse(
-                whitebox_, license_.message.data(), license_.message.size(),
-                license_.signature.data(), license_.signature.size(),
-                license_.session_key.data(), license_.session_key.size(),
-                license_.request.data(), license_.request.size()),
-            WB_RESULT_OK);
+  ASSERT_EQ(
+      WB_License_ProcessLicenseResponse(
+          whitebox_, license_.core_message.data(), license_.core_message.size(),
+          license_.message.data(), license_.message.size(),
+          license_.signature.data(), license_.signature.size(),
+          license_.session_key.data(), license_.session_key.size(),
+          license_.request.data(), license_.request.size()),
+      WB_RESULT_OK);
 }
 
 TEST_F(LicenseWhiteboxProcessLicenseResponseTest,
        SuccessWithSigningKeyPKSC8Padding) {
   UseLicenseWithSigningKey(TestLicenseBuilder::PKSC8Padding());
 
-  ASSERT_EQ(WB_License_ProcessLicenseResponse(
-                whitebox_, license_.message.data(), license_.message.size(),
-                license_.signature.data(), license_.signature.size(),
-                license_.session_key.data(), license_.session_key.size(),
-                license_.request.data(), license_.request.size()),
-            WB_RESULT_OK);
+  ASSERT_EQ(
+      WB_License_ProcessLicenseResponse(
+          whitebox_, license_.core_message.data(), license_.core_message.size(),
+          license_.message.data(), license_.message.size(),
+          license_.signature.data(), license_.signature.size(),
+          license_.session_key.data(), license_.session_key.size(),
+          license_.request.data(), license_.request.size()),
+      WB_RESULT_OK);
 }
 
 class LicenseWhiteboxProcessLicenseResponseErrorTest
@@ -85,24 +90,28 @@ TEST_F(LicenseWhiteboxProcessLicenseResponseErrorTest,
        InvalidSignatureForModifedMessage) {
   Modify(&license_.message);
 
-  ASSERT_EQ(WB_License_ProcessLicenseResponse(
-                whitebox_, license_.message.data(), license_.message.size(),
-                license_.signature.data(), license_.signature.size(),
-                license_.session_key.data(), license_.session_key.size(),
-                license_.request.data(), license_.request.size()),
-            WB_RESULT_INVALID_SIGNATURE);
+  ASSERT_EQ(
+      WB_License_ProcessLicenseResponse(
+          whitebox_, license_.core_message.data(), license_.core_message.size(),
+          license_.message.data(), license_.message.size(),
+          license_.signature.data(), license_.signature.size(),
+          license_.session_key.data(), license_.session_key.size(),
+          license_.request.data(), license_.request.size()),
+      WB_RESULT_INVALID_SIGNATURE);
 }
 
 TEST_F(LicenseWhiteboxProcessLicenseResponseErrorTest,
        InvalidSignatureForModifedSignature) {
   Modify(&license_.signature);
 
-  ASSERT_EQ(WB_License_ProcessLicenseResponse(
-                whitebox_, license_.message.data(), license_.message.size(),
-                license_.signature.data(), license_.signature.size(),
-                license_.session_key.data(), license_.session_key.size(),
-                license_.request.data(), license_.request.size()),
-            WB_RESULT_INVALID_SIGNATURE);
+  ASSERT_EQ(
+      WB_License_ProcessLicenseResponse(
+          whitebox_, license_.core_message.data(), license_.core_message.size(),
+          license_.message.data(), license_.message.size(),
+          license_.signature.data(), license_.signature.size(),
+          license_.session_key.data(), license_.session_key.size(),
+          license_.request.data(), license_.request.size()),
+      WB_RESULT_INVALID_SIGNATURE);
 }
 
 // The license request is used to derive the signing key. If the request was
@@ -111,28 +120,33 @@ TEST_F(LicenseWhiteboxProcessLicenseResponseErrorTest,
        InvalidSignatureForModifedLicenseRequest) {
   Modify(&license_.request);
 
-  ASSERT_EQ(WB_License_ProcessLicenseResponse(
-                whitebox_, license_.message.data(), license_.message.size(),
-                license_.signature.data(), license_.signature.size(),
-                license_.session_key.data(), license_.session_key.size(),
-                license_.request.data(), license_.request.size()),
-            WB_RESULT_INVALID_SIGNATURE);
+  ASSERT_EQ(
+      WB_License_ProcessLicenseResponse(
+          whitebox_, license_.core_message.data(), license_.core_message.size(),
+          license_.message.data(), license_.message.size(),
+          license_.signature.data(), license_.signature.size(),
+          license_.session_key.data(), license_.session_key.size(),
+          license_.request.data(), license_.request.size()),
+      WB_RESULT_INVALID_SIGNATURE);
 }
 
 TEST_F(LicenseWhiteboxProcessLicenseResponseErrorTest,
        InvalidParameterForNullWhitebox) {
-  ASSERT_EQ(WB_License_ProcessLicenseResponse(
-                nullptr, license_.message.data(), license_.message.size(),
-                license_.signature.data(), license_.signature.size(),
-                license_.session_key.data(), license_.session_key.size(),
-                license_.request.data(), license_.request.size()),
-            WB_RESULT_INVALID_PARAMETER);
+  ASSERT_EQ(
+      WB_License_ProcessLicenseResponse(
+          nullptr, license_.core_message.data(), license_.core_message.size(),
+          license_.message.data(), license_.message.size(),
+          license_.signature.data(), license_.signature.size(),
+          license_.session_key.data(), license_.session_key.size(),
+          license_.request.data(), license_.request.size()),
+      WB_RESULT_INVALID_PARAMETER);
 }
 
 TEST_F(LicenseWhiteboxProcessLicenseResponseErrorTest,
        InvalidParameterForNullMessage) {
   ASSERT_EQ(WB_License_ProcessLicenseResponse(
-                whitebox_, nullptr, license_.message.size(),
+                whitebox_, license_.core_message.data(),
+                license_.core_message.size(), nullptr, license_.message.size(),
                 license_.signature.data(), license_.signature.size(),
                 license_.session_key.data(), license_.session_key.size(),
                 license_.request.data(), license_.request.size()),
@@ -142,7 +156,8 @@ TEST_F(LicenseWhiteboxProcessLicenseResponseErrorTest,
 TEST_F(LicenseWhiteboxProcessLicenseResponseErrorTest,
        InvalidParameterForZeroMessageSize) {
   ASSERT_EQ(WB_License_ProcessLicenseResponse(
-                whitebox_, license_.message.data(), 0,
+                whitebox_, license_.core_message.data(),
+                license_.core_message.size(), license_.message.data(), 0,
                 license_.signature.data(), license_.signature.size(),
                 license_.session_key.data(), license_.session_key.size(),
                 license_.request.data(), license_.request.size()),
@@ -152,40 +167,44 @@ TEST_F(LicenseWhiteboxProcessLicenseResponseErrorTest,
 TEST_F(LicenseWhiteboxProcessLicenseResponseErrorTest,
        InvalidParameterForNullSignature) {
   ASSERT_EQ(WB_License_ProcessLicenseResponse(
-                whitebox_, license_.message.data(), license_.message.size(),
-                nullptr, license_.signature.size(), license_.session_key.data(),
-                license_.session_key.size(), license_.request.data(),
-                license_.request.size()),
+                whitebox_, license_.core_message.data(),
+                license_.core_message.size(), license_.message.data(),
+                license_.message.size(), nullptr, license_.signature.size(),
+                license_.session_key.data(), license_.session_key.size(),
+                license_.request.data(), license_.request.size()),
             WB_RESULT_INVALID_PARAMETER);
 }
 
 TEST_F(LicenseWhiteboxProcessLicenseResponseErrorTest,
        InvalidParameterForInvalidSignatureSize) {
   ASSERT_EQ(WB_License_ProcessLicenseResponse(
-                whitebox_, license_.message.data(), license_.message.size(),
-                license_.signature.data(), 5, license_.session_key.data(),
-                license_.session_key.size(), license_.request.data(),
-                license_.request.size()),
+                whitebox_, license_.core_message.data(),
+                license_.core_message.size(), license_.message.data(),
+                license_.message.size(), license_.signature.data(), 5,
+                license_.session_key.data(), license_.session_key.size(),
+                license_.request.data(), license_.request.size()),
             WB_RESULT_INVALID_PARAMETER);
 }
 
 TEST_F(LicenseWhiteboxProcessLicenseResponseErrorTest,
        InvalidParameterForNullSessionKey) {
   ASSERT_EQ(WB_License_ProcessLicenseResponse(
-                whitebox_, license_.message.data(), license_.message.size(),
-                license_.signature.data(), license_.signature.size(), nullptr,
-                license_.session_key.size(), license_.request.data(),
-                license_.request.size()),
+                whitebox_, license_.core_message.data(),
+                license_.core_message.size(), license_.message.data(),
+                license_.message.size(), license_.signature.data(),
+                license_.signature.size(), nullptr, license_.session_key.size(),
+                license_.request.data(), license_.request.size()),
             WB_RESULT_INVALID_PARAMETER);
 }
 
 TEST_F(LicenseWhiteboxProcessLicenseResponseErrorTest,
        InvalidParameterForInvalidSessionKeySize) {
   ASSERT_EQ(WB_License_ProcessLicenseResponse(
-                whitebox_, license_.message.data(), license_.message.size(),
-                license_.signature.data(), license_.signature.size(),
-                license_.session_key.data(), 5, license_.request.data(),
-                license_.request.size()),
+                whitebox_, license_.core_message.data(),
+                license_.core_message.size(), license_.message.data(),
+                license_.message.size(), license_.signature.data(),
+                license_.signature.size(), license_.session_key.data(), 5,
+                license_.request.data(), license_.request.size()),
             WB_RESULT_INVALID_PARAMETER);
 }
 
@@ -195,31 +214,35 @@ TEST_F(LicenseWhiteboxProcessLicenseResponseErrorTest,
        InvalidParameterForModifedSessionKey) {
   Modify(&license_.session_key);
 
-  ASSERT_EQ(WB_License_ProcessLicenseResponse(
-                whitebox_, license_.message.data(), license_.message.size(),
-                license_.signature.data(), license_.signature.size(),
-                license_.session_key.data(), license_.session_key.size(),
-                license_.request.data(), license_.request.size()),
-            WB_RESULT_INVALID_PARAMETER);
+  ASSERT_EQ(
+      WB_License_ProcessLicenseResponse(
+          whitebox_, license_.core_message.data(), license_.core_message.size(),
+          license_.message.data(), license_.message.size(),
+          license_.signature.data(), license_.signature.size(),
+          license_.session_key.data(), license_.session_key.size(),
+          license_.request.data(), license_.request.size()),
+      WB_RESULT_INVALID_PARAMETER);
 }
 
 TEST_F(LicenseWhiteboxProcessLicenseResponseErrorTest,
        InvalidParameterForNullLicenseRequest) {
   ASSERT_EQ(WB_License_ProcessLicenseResponse(
-                whitebox_, license_.message.data(), license_.message.size(),
-                license_.signature.data(), license_.signature.size(),
-                license_.session_key.data(), license_.session_key.size(),
-                nullptr, license_.request.size()),
+                whitebox_, license_.core_message.data(),
+                license_.core_message.size(), license_.message.data(),
+                license_.message.size(), license_.signature.data(),
+                license_.signature.size(), license_.session_key.data(),
+                license_.session_key.size(), nullptr, license_.request.size()),
             WB_RESULT_INVALID_PARAMETER);
 }
 
 TEST_F(LicenseWhiteboxProcessLicenseResponseErrorTest,
        InvalidParameterForZeroLienseRequestSize) {
   ASSERT_EQ(WB_License_ProcessLicenseResponse(
-                whitebox_, license_.message.data(), license_.message.size(),
-                license_.signature.data(), license_.signature.size(),
-                license_.session_key.data(), license_.session_key.size(),
-                license_.request.data(), 0),
+                whitebox_, license_.core_message.data(),
+                license_.core_message.size(), license_.message.data(),
+                license_.message.size(), license_.signature.data(),
+                license_.signature.size(), license_.session_key.data(),
+                license_.session_key.size(), license_.request.data(), 0),
             WB_RESULT_INVALID_PARAMETER);
 }
 
@@ -240,21 +263,25 @@ class LicenseWhiteboxMultiLicenseTest
 TEST_F(LicenseWhiteboxMultiLicenseTest, InvalidState) {
   // Load the first license. This one is expected to succeed as the whitebox has
   // not loaded a license yet.
-  ASSERT_EQ(WB_License_ProcessLicenseResponse(
-                whitebox_, license_.message.data(), license_.message.size(),
-                license_.signature.data(), license_.signature.size(),
-                license_.session_key.data(), license_.session_key.size(),
-                license_.request.data(), license_.request.size()),
-            WB_RESULT_OK);
+  ASSERT_EQ(
+      WB_License_ProcessLicenseResponse(
+          whitebox_, license_.core_message.data(), license_.core_message.size(),
+          license_.message.data(), license_.message.size(),
+          license_.signature.data(), license_.signature.size(),
+          license_.session_key.data(), license_.session_key.size(),
+          license_.request.data(), license_.request.size()),
+      WB_RESULT_OK);
 
   // Attempt to load the same license again. This should fail as it already has
   // a license (even though it is the same license).
-  ASSERT_EQ(WB_License_ProcessLicenseResponse(
-                whitebox_, license_.message.data(), license_.message.size(),
-                license_.signature.data(), license_.signature.size(),
-                license_.session_key.data(), license_.session_key.size(),
-                license_.request.data(), license_.request.size()),
-            WB_RESULT_INVALID_STATE);
+  ASSERT_EQ(
+      WB_License_ProcessLicenseResponse(
+          whitebox_, license_.core_message.data(), license_.core_message.size(),
+          license_.message.data(), license_.message.size(),
+          license_.signature.data(), license_.signature.size(),
+          license_.session_key.data(), license_.session_key.size(),
+          license_.request.data(), license_.request.size()),
+      WB_RESULT_INVALID_STATE);
 }
 
 // Even though a whitebox can only load a license once, if it fails to load a
@@ -264,21 +291,25 @@ TEST_F(LicenseWhiteboxMultiLicenseTest, SuccessAfterFailure) {
   // in key derivation which is a later step of license parsing.
   std::vector<uint8_t> bad_request = license_.request;
   Modify(&bad_request);
-  ASSERT_NE(WB_License_ProcessLicenseResponse(
-                whitebox_, license_.message.data(), license_.message.size(),
-                license_.signature.data(), license_.signature.size(),
-                license_.session_key.data(), license_.session_key.size(),
-                bad_request.data(), bad_request.size()),
-            WB_RESULT_OK);
+  ASSERT_NE(
+      WB_License_ProcessLicenseResponse(
+          whitebox_, license_.core_message.data(), license_.core_message.size(),
+          license_.message.data(), license_.message.size(),
+          license_.signature.data(), license_.signature.size(),
+          license_.session_key.data(), license_.session_key.size(),
+          bad_request.data(), bad_request.size()),
+      WB_RESULT_OK);
 
   // Attempt to load the license again, but use the correct (unmodified)
   // request.
-  ASSERT_EQ(WB_License_ProcessLicenseResponse(
-                whitebox_, license_.message.data(), license_.message.size(),
-                license_.signature.data(), license_.signature.size(),
-                license_.session_key.data(), license_.session_key.size(),
-                license_.request.data(), license_.request.size()),
-            WB_RESULT_OK);
+  ASSERT_EQ(
+      WB_License_ProcessLicenseResponse(
+          whitebox_, license_.core_message.data(), license_.core_message.size(),
+          license_.message.data(), license_.message.size(),
+          license_.signature.data(), license_.signature.size(),
+          license_.session_key.data(), license_.session_key.size(),
+          license_.request.data(), license_.request.size()),
+      WB_RESULT_OK);
 }
 
 }  // namespace widevine