widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove V17 backwards-compatibility decrypt functions

Browse Source 
Merge from Widevine repo of http://go/wvgerrit/169066

Now that we only have to support the v18 API, we can drop the v17
versions of these functions. For SelectKey, the new function fully
replaces it, so it has been removed. For the other functions, the v18
functions were calling the v17 functions previously. Now, they have been
rolled together.

These functions were not actually deprecated in the OEMCryptoCENC.h
header to allow OPK's serialization generator to still support them for
backwards-compatibility. Now that they are gone, this patch also
deprecates the functions.

Bug: 240995221
Merged from https://widevine-internal-review.googlesource.com/167338

Change-Id: I10261142121d4de8c96e2cd5fac570f7b536a82e
This commit is contained in:
John "Juce" Bruce
2023-03-27 19:41:25 -07:00
committed by Fred Gylys-Colwell
parent 54e6b3d45d
commit d3183f504e
1 changed files with 6 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
libwvdrmengine/oemcrypto/include/OEMCryptoCENC.h
View File

@@ -5594,17 +5594,9 @@ OEMCryptoResult OEMCrypto_GetRandom(uint8_t* random_data,
/**
* OEMCrypto_SelectKey
* @deprecated
* Not required for the current version of OEMCrypto. Declared here to
* help with backward compatibility.
*
* TODO(b/240995221): Deprecate and remove params.
* @param[in] session: handle for the crypto or entitled key session to be used.
* @param[in] content_key_id: pointer to the content Key ID.
* @param[in] content_key_id_length: length of the content Key ID, in bytes.
* From 1 to 16, inclusive.
* @param[in] cipher_mode: whether the key should be prepared for CTR mode or
* CBC mode when used in later calls to DecryptCENC. This should be ignored
* when the key is used for Generic Crypto calls.
*/
OEMCryptoResult OEMCrypto_SelectKey(OEMCrypto_SESSION session,
const uint8_t* content_key_id,
@@ -5613,18 +5605,9 @@ OEMCryptoResult OEMCrypto_SelectKey(OEMCrypto_SESSION session,
/**
* OEMCrypto_DecryptCENC_V17
* @deprecated
* Not required for the current version of OEMCrypto. Declared here to
* help with backward compatibility.
*
* TODO(b/240995221): Deprecate and remove params.
* @param[in] session: Crypto or entitled session identifier. The crypto session
* in which decrypt is to be performed.
* @param[in] samples: A caller-owned array of OEMCrypto_SampleDescription
* structures. Each entry in this array contains one sample of the content.
* @param[in] samples_length: The length of the array pointed to by the samples
* parameter.
* @param[in] pattern: A caller-owned structure indicating the encrypt/skip
* pattern as specified in the ISO-CENC standard.
*/
OEMCryptoResult OEMCrypto_DecryptCENC_V17(
OEMCrypto_SESSION session, const OEMCrypto_SampleDescription* samples,
@@ -5632,19 +5615,9 @@ OEMCryptoResult OEMCrypto_DecryptCENC_V17(
/**
* OEMCrypto_Generic_Encrypt_V17
* @deprecated
* Not required for the current version of OEMCrypto. Declared here to
* help with backward compatibility.
*
* TODO(b/240995221): Deprecate and remove params.
* @param[in] session: crypto or entitled key session identifier.
* @param[in] in_buffer: pointer to memory containing data to be encrypted.
* @param[in] in_buffer_length: length of the buffer, in bytes. The algorithm
* may restrict in_buffer_length to be a multiple of block size.
* @param[in] iv: IV for encrypting data. Size is 128 bits.
* @param[in] algorithm: Specifies which encryption algorithm to use.
* Currently, only CBC 128 mode is allowed for encryption.
* @param[out] out_buffer: pointer to buffer in which encrypted data should be
* stored.
*/
OEMCryptoResult OEMCrypto_Generic_Encrypt_V17(
OEMCrypto_SESSION session, const OEMCrypto_SharedMemory* in_buffer,
@@ -5653,19 +5626,9 @@ OEMCryptoResult OEMCrypto_Generic_Encrypt_V17(
/**
* OEMCrypto_Generic_Decrypt_V17
* @deprecated
* Not required for the current version of OEMCrypto. Declared here to
* help with backward compatibility.
*
* TODO(b/240995221): Deprecate and remove params.
* @param[in] session: crypto or entitled key session identifier.
* @param[in] in_buffer: pointer to memory containing data to be encrypted.
* @param[in] in_buffer_length: length of the buffer, in bytes. The algorithm
* may restrict in_buffer_length to be a multiple of block size.
* @param[in] iv: IV for encrypting data. Size is 128 bits.
* @param[in] algorithm: Specifies which encryption algorithm to use.
* Currently, only CBC 128 mode is allowed for decryption.
* @param[out] out_buffer: pointer to buffer in which decrypted data should be
* stored.
*/
OEMCryptoResult OEMCrypto_Generic_Decrypt_V17(
OEMCrypto_SESSION session, const OEMCrypto_SharedMemory* in_buffer,
@@ -5674,19 +5637,9 @@ OEMCryptoResult OEMCrypto_Generic_Decrypt_V17(
/**
* OEMCrypto_Generic_Sign_V17
* @deprecated
* Not required for the current version of OEMCrypto. Declared here to
* help with backward compatibility.
*
* TODO(b/240995221): Deprecate and remove params.
* @param[in] session: crypto or entitled key session identifier.
* @param[in] buffer: pointer to memory containing data to be encrypted.
* @param[in] buffer_length: length of the buffer, in bytes.
* @param[in] algorithm: Specifies which algorithm to use.
* @param[out] signature: pointer to buffer in which signature should be
* stored. May be null on the first call in order to find required buffer
* size.
* @param[in,out] signature_length: (in) length of the signature buffer, in
* bytes. (out) actual length of the signature
*/
OEMCryptoResult OEMCrypto_Generic_Sign_V17(OEMCrypto_SESSION session,
const OEMCrypto_SharedMemory* buffer,
@@ -5697,16 +5650,9 @@ OEMCryptoResult OEMCrypto_Generic_Sign_V17(OEMCrypto_SESSION session,
/**
* OEMCrypto_Generic_Verify_V17
* @deprecated
* Not required for the current version of OEMCrypto. Declared here to
* help with backward compatibility.
*
* TODO(b/240995221): Deprecate and remove params.
* @param[in] session: crypto or entitled key session identifier.
* @param[in] buffer: pointer to memory containing data to be encrypted.
* @param[in] buffer_length: length of the buffer, in bytes.
* @param[in] algorithm: Specifies which algorithm to use.
* @param[in] signature: pointer to buffer in which signature resides.
* @param[in] signature_length: length of the signature buffer, in bytes.
*/
OEMCryptoResult OEMCrypto_Generic_Verify_V17(
OEMCrypto_SESSION session, const OEMCrypto_SharedMemory* buffer,