Source release 15.0.0

core/include/oemcrypto_adapter.h

@@ -14,9 +14,6 @@ namespace wvcdm {
 // If one level is not available, the other will be used instead.
 OEMCryptoResult OEMCrypto_OpenSession(OEMCrypto_SESSION* session,
                                       SecurityLevel level);
-OEMCryptoResult OEMCrypto_CopyBuffer(
-    SecurityLevel level, const uint8_t* data_addr, size_t data_length,
-    OEMCrypto_DestBufferDesc* out_buffer, uint8_t subsample_flags);
 OEMCryptoResult OEMCrypto_InstallKeybox(const uint8_t* keybox,
                                         size_t keyBoxLength,
                                         SecurityLevel level);
@@ -56,6 +53,9 @@ OEMCryptoResult OEMCrypto_CreateOldUsageEntry(SecurityLevel level,
     uint8_t* server_mac_key, uint8_t* client_mac_key, const uint8_t* pst,
     size_t pst_length);
 uint32_t OEMCrypto_GetAnalogOutputFlags(SecurityLevel level);
+const char* OEMCrypto_BuildInformation(SecurityLevel level);
+uint32_t OEMCrypto_ResourceRatingTier(SecurityLevel level);
+uint32_t OEMCrypto_SupportsDecryptHash(SecurityLevel level);
 }  // namespace wvcdm
 
 /* The following functions are deprecated in OEMCrypto v13.  They are defined
@@ -64,7 +64,17 @@ uint32_t OEMCrypto_GetAnalogOutputFlags(SecurityLevel level);
  */
 extern "C" {
 
-struct OEMCrypto_KeyObject_V13 {  // Used for backwards compatibility.
+typedef struct {  // Used for backwards compatibility.
+  const uint8_t* key_id;
+  size_t key_id_length;
+  const uint8_t* key_data_iv;
+  const uint8_t* key_data;
+  size_t key_data_length;
+  const uint8_t* key_control_iv;
+  const uint8_t* key_control;
+} OEMCrypto_KeyObject_V10;
+
+typedef struct {  // Used for backwards compatibility.
   const uint8_t* key_id;
   size_t key_id_length;
   const uint8_t* key_data_iv;
@@ -73,16 +83,26 @@ struct OEMCrypto_KeyObject_V13 {  // Used for backwards compatibility.
   const uint8_t* key_control_iv;
   const uint8_t* key_control;
   OEMCryptoCipherMode cipher_mode;
-};
+} OEMCrypto_KeyObject_V13;
+
+typedef struct {
+  const uint8_t* key_id;
+  size_t key_id_length;
+  const uint8_t* key_data_iv;
+  const uint8_t* key_data;
+  size_t key_data_length;
+  const uint8_t* key_control_iv;
+  const uint8_t* key_control;
+} OEMCrypto_KeyObject_V14;
 
 // Backwards compitiblity between v14 and v13.
 OEMCryptoResult OEMCrypto_LoadKeys_Back_Compat(
     OEMCrypto_SESSION session, const uint8_t* message, size_t message_length,
     const uint8_t* signature, size_t signature_length,
-    const uint8_t* enc_mac_keys_iv, const uint8_t* enc_mac_keys,
-    size_t num_keys, const OEMCrypto_KeyObject_V13* key_array,
-    const uint8_t* pst, size_t pst_length, const uint8_t* srm_requirement,
-    OEMCrypto_LicenseType license_type);
+    OEMCrypto_Substring enc_mac_keys_iv, OEMCrypto_Substring enc_mac_keys,
+    size_t num_keys, const OEMCrypto_KeyObject* key_array,
+    OEMCrypto_Substring pst, OEMCrypto_Substring srm_restriction_data,
+    OEMCrypto_LicenseType license_type, OEMCryptoCipherMode* cipher_modes);
 
 OEMCryptoResult OEMCrypto_UpdateUsageTable();
 
@@ -95,6 +115,46 @@ OEMCryptoResult OEMCrypto_DeleteUsageEntry(
 
 OEMCryptoResult OEMCrypto_ForceDeleteUsageEntry(const uint8_t* pst,
                                                 size_t pst_length);
+
+typedef struct {
+  const uint8_t* entitlement_key_id;
+  size_t entitlement_key_id_length;
+  const uint8_t* content_key_id;
+  size_t content_key_id_length;
+  const uint8_t* content_key_data_iv;
+  const uint8_t* content_key_data;
+  size_t content_key_data_length;
+} OEMCrypto_EntitledContentKeyObject_V14;
+
+typedef struct {
+  const uint8_t* key_id;
+  size_t key_id_length;
+  const uint8_t* key_control_iv;
+  const uint8_t* key_control;
+} OEMCrypto_KeyRefreshObject_V14;
+
+OEMCryptoResult OEMCrypto_LoadKeys_V14(
+    OEMCrypto_SESSION session, const uint8_t* message, size_t message_length,
+    const uint8_t* signature, size_t signature_length,
+    const uint8_t* enc_mac_keys_iv, const uint8_t* enc_mac_keys,
+    size_t num_keys, const OEMCrypto_KeyObject_V14* key_array,
+    const uint8_t* pst, size_t pst_length, const uint8_t* srm_requirement,
+    OEMCrypto_LicenseType license_type);
+
+OEMCryptoResult OEMCrypto_LoadEntitledContentKeys_V14(
+    OEMCrypto_SESSION session, size_t num_keys,
+    const OEMCrypto_EntitledContentKeyObject_V14* key_array);
+
+OEMCryptoResult OEMCrypto_RefreshKeys_V14(
+    OEMCrypto_SESSION session, const uint8_t* message, size_t message_length,
+    const uint8_t* signature, size_t signature_length, size_t num_keys,
+    const OEMCrypto_KeyRefreshObject_V14* key_array);
+
+OEMCryptoResult OEMCrypto_CopyBuffer_V14(const uint8_t* data_addr,
+                                         size_t data_length,
+                                         OEMCrypto_DestBufferDesc* out_buffer,
+                                         uint8_t subsample_flags);
+
 }  // extern "C"
 
 #endif  // WVCDM_CORE_OEMCRYPTO_ADAPTER_H_