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

Remove reference to OEMCrypto_LoadKeys() in ODK code

Browse Source 
PiperOrigin-RevId: 522089097
Merged from https://widevine-internal-review.googlesource.com/168481

Change-Id: I59927c7f5aba52523aeba78c130f4b148d1c363f
This commit is contained in:
Vicky Min
2023-04-05 10:25:46 -07:00
committed by Robert Shih
parent 231ff3735c
commit c6e7c70a6b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libwvdrmengine/oemcrypto/odk/include/OEMCryptoCENCCommon.h
View File

@@ -156,8 +156,8 @@ typedef enum OEMCrypto_TimerDelayBase {
} OEMCrypto_TimerDelayBase; } OEMCrypto_TimerDelayBase;
/** /**
* Used to indicate a substring of a signed message in OEMCrypto_LoadKeys and * Used to indicate a substring of a signed message in ODK_ParseLicense
* other functions which must verify that a parameter is contained within a * and other functions which must verify that a parameter is contained within a
* signed message. * signed message.
*/ */
typedef struct { typedef struct {
@@ -223,7 +223,7 @@ typedef struct {
/** /**
* Points to the relevant fields for a content key. The fields are extracted * Points to the relevant fields for a content key. The fields are extracted
* from the License Response message offered to OEMCrypto_LoadKeys(). Each * from the License Response message offered to ODK_ParseLicense(). Each
* field points to one of the components of the key. Key data, key control, * field points to one of the components of the key. Key data, key control,
* and both IV fields are 128 bits (16 bytes): * and both IV fields are 128 bits (16 bytes):
* @param key_id: the unique id of this key. * @param key_id: the unique id of this key.
@@ -240,7 +240,7 @@ typedef struct {
* the content key from the key_data field. * the content key from the key_data field.
* *
* The memory for the OEMCrypto_KeyObject fields is allocated and freed * The memory for the OEMCrypto_KeyObject fields is allocated and freed
* by the caller of OEMCrypto_LoadKeys(). * by the caller of ODK_ParseLicense().
*/ */
typedef struct { typedef struct {
OEMCrypto_Substring key_id; OEMCrypto_Substring key_id;

2
libwvdrmengine/oemcrypto/odk/include/odk_structs.h
View File

@@ -19,7 +19,7 @@ extern "C" {
#define ODK_MINOR_VERSION 1 #define ODK_MINOR_VERSION 1
/* ODK Version string. Date changed automatically on each release. */ /* ODK Version string. Date changed automatically on each release. */
#define ODK_RELEASE_DATE "ODK v18.1 2023-02-25" #define ODK_RELEASE_DATE "ODK v18.1 2023-04-05"
/* The lowest version number for an ODK message. */ /* The lowest version number for an ODK message. */
#define ODK_FIRST_VERSION 16 #define ODK_FIRST_VERSION 16