Turn on ODK tests in CE CDM test and fix test helper

Merge from Widevine repo of http://go/wvgerrit/122223

This adds the ODK unit tests to the CE CDM tests so that they run as
part of the presubmit tests.

The test helper had some pointer problems converting a bool to a
uint32, so it has been updated to handle this correctly.

Some other tests failed comparing signed to unsigned, to these have
also been fixed.

test: ran odk_test
bug: 118657876
Change-Id: I744a1e89f4e4729c31d3f53e729984ffac1d96fd

libwvdrmengine/oemcrypto/odk/src/odk_structs_priv.h

@@ -74,26 +74,26 @@ typedef struct {
 // without any padding added by the compiler. Make sure they get updated when
 // request structs change. Refer to test suite OdkSizeTest in
 // ../test/odk_test.cpp for validations of each of the defined request sizes.
-#define ODK_LICENSE_REQUEST_SIZE 20
-#define ODK_RENEWAL_REQUEST_SIZE 28
-#define ODK_PROVISIONING_REQUEST_SIZE 88
+#define ODK_LICENSE_REQUEST_SIZE 20u
+#define ODK_RENEWAL_REQUEST_SIZE 28u
+#define ODK_PROVISIONING_REQUEST_SIZE 88u
 
 // These are the possible timer status values.
-#define ODK_CLOCK_TIMER_STATUS_UNDEFINED 0  // Should not happen.
+#define ODK_CLOCK_TIMER_STATUS_UNDEFINED 0u  // Should not happen.
 // When the structure has been initialized, but no license is loaded.
-#define ODK_CLOCK_TIMER_STATUS_LICENSE_NOT_LOADED 1
+#define ODK_CLOCK_TIMER_STATUS_LICENSE_NOT_LOADED 1u
 // After the license is loaded, before a successful decrypt.
-#define ODK_CLOCK_TIMER_STATUS_LICENSE_LOADED 2
+#define ODK_CLOCK_TIMER_STATUS_LICENSE_LOADED 2u
 // After the license is loaded, if a renewal has also been loaded.
-#define ODK_CLOCK_TIMER_STATUS_RENEWAL_LOADED 3
+#define ODK_CLOCK_TIMER_STATUS_RENEWAL_LOADED 3u
 // The first decrypt has occurred and the timer is active.
-#define ODK_CLOCK_TIMER_STATUS_ACTIVE 4
+#define ODK_CLOCK_TIMER_STATUS_ACTIVE 4u
 // The first decrypt has occurred and the timer is unlimited.
-#define ODK_CLOCK_TIMER_STATUS_UNLIMITED 5
+#define ODK_CLOCK_TIMER_STATUS_UNLIMITED 5u
 // The timer has transitioned from active to expired.
-#define ODK_CLOCK_TIMER_STATUS_EXPIRED 6
+#define ODK_CLOCK_TIMER_STATUS_EXPIRED 6u
 // The license has been marked as inactive.
-#define ODK_CLOCK_TIMER_STATUS_LICENSE_INACTIVE 7
+#define ODK_CLOCK_TIMER_STATUS_LICENSE_INACTIVE 7u
 
 // A helper function for computing timer limits when a renewal is loaded.
 OEMCryptoResult ODK_ComputeRenewalDuration(const ODK_TimerLimits* timer_limits,

libwvdrmengine/oemcrypto/odk/test/odk_test.cpp

@@ -176,15 +176,15 @@ TEST(OdkTest, SerializeFieldsStress) {
   std::srand(0);
   size_t total_size = 0;
   for (int i = 0; i < n; i++) {
-    fields[i].type = static_cast<ODK_FieldType>(std::rand() %
-                                                static_cast<int>(ODK_NUMTYPES));
+    fields[i].type = static_cast<ODK_FieldType>(
+        std::rand() % static_cast<int>(ODK_LAST_STRESSABLE_TYPE));
     fields[i].value = malloc(ODK_AllocSize(fields[i].type));
     fields[i].name = "stress";
     total_size += ODK_FieldLength(fields[i].type);
   }
 
   uint8_t* buf = new uint8_t[total_size]{};
-  for (int i = 0; i < total_size; i++) {
+  for (size_t i = 0; i < total_size; i++) {
     buf[i] = std::rand() & 0xff;
   }
 
@@ -701,7 +701,7 @@ TEST(OdkSizeTest, ReleaseRequest) {
                                           &core_message_length, &nonce_values,
                                           &clock_values, system_time_seconds));
   // Release requests do not have a core message.
-  EXPECT_GE(core_message_length, 0);
+  EXPECT_GE(core_message_length, 0u);
 }
 
 TEST(OdkSizeTest, ProvisioningRequest) {

libwvdrmengine/oemcrypto/odk/test/odk_test_helper.cpp

@@ -86,10 +86,10 @@ void ODK_SetDefaultLicenseResponseParams(ODK_LicenseResponseParams* params) {
        ".srm_restriction_data"},
       {ODK_UINT32, &(params->parsed_license.license_type), ".license_type"},
       {ODK_UINT32, &(params->parsed_license.nonce_required), ".nonce_required"},
-      {ODK_UINT32,
+      {ODK_BOOL,
        &(params->parsed_license.timer_limits.soft_enforce_rental_duration),
        ".soft_enforce_rental_duration"},
-      {ODK_UINT32,
+      {ODK_BOOL,
        &(params->parsed_license.timer_limits.soft_enforce_playback_duration),
        ".soft_enforce_playback_duration"},
       {ODK_UINT64,
@@ -201,6 +201,8 @@ size_t ODK_FieldLength(ODK_FieldType type) {
       return sizeof(uint32_t);
     case ODK_UINT64:
       return sizeof(uint64_t);
+    case ODK_BOOL:  // Booleans are stored in the message as 32 bit ints.
+      return sizeof(uint32_t);
     case ODK_SUBSTRING:
       return sizeof(uint32_t) + sizeof(uint32_t);
     case ODK_DEVICEID:
@@ -242,6 +244,12 @@ OEMCryptoResult ODK_WriteSingleField(uint8_t* buf, const ODK_Field* field) {
       memcpy(buf, &u64, sizeof(u64));
       break;
     }
+    case ODK_BOOL: {
+      const bool value = *static_cast<bool*>(field->value);
+      const uint32_t u32 = oemcrypto_htobe32(value ? 1 : 0);
+      memcpy(buf, &u32, sizeof(u32));
+      break;
+    }
     case ODK_SUBSTRING: {
       OEMCrypto_Substring* s = static_cast<OEMCrypto_Substring*>(field->value);
       const uint32_t off = oemcrypto_htobe32(s->offset);
@@ -288,6 +296,13 @@ OEMCryptoResult ODK_ReadSingleField(const uint8_t* buf,
       *u64p = oemcrypto_be64toh(*u64p);
       break;
     }
+    case ODK_BOOL: {
+      uint32_t value;
+      memcpy(&value, buf, sizeof(uint32_t));
+      value = oemcrypto_be32toh(value);
+      *static_cast<bool*>(field->value) = (value != 0);
+      break;
+    }
     case ODK_SUBSTRING: {
       OEMCrypto_Substring* s = static_cast<OEMCrypto_Substring*>(field->value);
       uint32_t off = 0;
@@ -325,6 +340,7 @@ OEMCryptoResult ODK_DumpSingleField(const uint8_t* buf,
                 << "\n";
       break;
     }
+    case ODK_BOOL:
     case ODK_UINT32: {
       uint32_t val;
       memcpy(&val, buf, sizeof(uint32_t));

libwvdrmengine/oemcrypto/odk/test/odk_test_helper.h

@@ -21,7 +21,12 @@ enum ODK_FieldType {
   ODK_SUBSTRING,
   ODK_DEVICEID,
   ODK_HASH,
-  ODK_NUMTYPES,
+  // The "stressable" types are the ones we can put in a stress test that packs
+  // and unpacks random data and can expect to get back the same thing.
+  ODK_LAST_STRESSABLE_TYPE,
+  // Put boolean after ODK_LAST_STRESSABLE_TYPE, so that we skip boolean type in
+  // SerializeFieldsStress because we unpack any nonzero to 'true'.
+  ODK_BOOL,
 };
 
 enum ODK_FieldMode {