Revert "Merge latest oemcrypto-v17 change"

This reverts commit 642965c678.

Reason for revert: Droidfood Blocking Bug: 217145027

Change-Id: I669b72fcd91c62e28883b5f55eb36af274d85806
(cherry picked from commit 8dbea15e5da05b371572297041454569dc166c90)
Merged-In:I669b72fcd91c62e28883b5f55eb36af274d85806

libwvdrmengine/oemcrypto/test/oec_device_features.h

@@ -10,12 +10,9 @@
 namespace wvoec {
 
 // These tests are designed to work for this version:
-constexpr unsigned int kCurrentAPI = 17;
+constexpr unsigned int kCurrentAPI = 16;
 // The API version when Core Messages were introduced.
 constexpr unsigned int kCoreMessagesAPI = 16;
-// The API version when we stopped encrypting key control blocks.
-constexpr unsigned int kClearControlBlockAPIMajor = 16;
-constexpr unsigned int kClearControlBlockAPIMinor = 5;
 
 // An output type for testing. The type field is secure, clear, or direct.  If
 // the type is clear, then decrypt_inplace could be true. Otherwise,
@@ -32,24 +29,23 @@ class DeviceFeatures {
   // There are several possible methods used to derive a set of known session
   // keys.  For example, the test can install a known test keybox, or it can
   // parse the OEM certificate.
-  enum DeriveMethod {   // Method to use derive session keys.
-    NO_METHOD,          // Cannot derive known session keys.
-    LOAD_TEST_KEYBOX,   // Call LoadTestKeybox before deriving keys.
-    LOAD_TEST_RSA_KEY,  // Call LoadTestRSAKey before deriving keys.
-    TEST_PROVISION_30,  // Device has OEM Certificate installed.
-    TEST_PROVISION_40,  // Device has Boot Certificate Chain installed.
+  enum DeriveMethod {      // Method to use derive session keys.
+    NO_METHOD,             // Cannot derive known session keys.
+    LOAD_TEST_KEYBOX,      // Call LoadTestKeybox before deriving keys.
+    LOAD_TEST_RSA_KEY,     // Call LoadTestRSAKey before deriving keys.
+    TEST_PROVISION_30,     // Device has OEM Certificate installed.
   };
 
   enum DeriveMethod derive_key_method;
-  bool uses_keybox;          // Device uses a keybox to derive session keys.
-  bool loads_certificate;    // Device can load a certificate from the server.
-  bool generic_crypto;       // Device supports generic crypto.
-  bool cast_receiver;        // Device supports alternate rsa signature padding.
-  bool usage_table;          // Device saves usage information.
-  bool supports_rsa_3072;    // Device supports 3072 bit RSA keys.
-  bool supports_level_1;     // Device supports Level 1 security.
-  uint32_t resource_rating;  // Device's resource rating tier.
-  bool supports_crc;         // Supported decrypt hash type CRC.
+  bool uses_keybox;        // Device uses a keybox to derive session keys.
+  bool loads_certificate;  // Device can load a certificate from the server.
+  bool generic_crypto;     // Device supports generic crypto.
+  bool cast_receiver;      // Device supports alternate rsa signature padding.
+  bool usage_table;        // Device saves usage information.
+  bool supports_rsa_3072;  // Device supports 3072 bit RSA keys.
+  bool supports_level_1;   // Device supports Level 1 security.
+  uint32_t resource_rating; // Device's resource rating tier.
+  bool supports_crc;        // Supported decrypt hash type CRC.
   bool test_secure_buffers;  // If we can create a secure buffer for testing.
   uint32_t api_version;
   OEMCrypto_ProvisioningMethod provisioning_method;