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

adding OEM_ENTITLEMENT key container type.

Browse Source 
[ Merge of http://go/wvgerrit/148691 ]

This is a followup to OEM_CONTENT,
a custom key container that was added to Widevine server.

Bug: 193006094
Bug: 236317198
Change-Id: I82285e4e50f981e0cedf2adac5910643f34f8e46
This commit is contained in:
Alex Dale
2022-07-20 13:53:47 -07:00
parent 41d307ed9e
commit 1a405a11a6
5 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libwvdrmengine/oemcrypto/odk/include/core_message_features.h
View File

@@ -30,13 +30,13 @@ struct CoreMessageFeatures {
uint32_t maximum_major_version = 17; uint32_t maximum_major_version = 17;
uint32_t maximum_minor_version = 0; uint32_t maximum_minor_version = 0;
bool operator==(const CoreMessageFeatures& other) const; bool operator==(const CoreMessageFeatures &other) const;
bool operator!=(const CoreMessageFeatures& other) const { bool operator!=(const CoreMessageFeatures &other) const {
return !(*this == other); return !(*this == other);
} }
}; };
std::ostream& operator<<(std::ostream& os, const CoreMessageFeatures& features); std::ostream &operator<<(std::ostream &os, const CoreMessageFeatures &features);
} // namespace features } // namespace features
} // namespace oemcrypto_core_message } // namespace oemcrypto_core_message

6
libwvdrmengine/oemcrypto/odk/include/odk_message.h
View File

@@ -35,10 +35,10 @@ extern "C" {
*/ */
#if defined(__GNUC__) || defined(__clang__) #if defined(__GNUC__) || defined(__clang__)
# define ALIGNED __attribute__((aligned)) #define ALIGNED __attribute__((aligned))
#else #else
# define ALIGNED #define ALIGNED
# error ODK_Message must be aligned to the maximum useful alignment of the \ #error ODK_Message must be aligned to the maximum useful alignment of the \
machine you are compiling for. Define the ALIGNED macro accordingly. machine you are compiling for. Define the ALIGNED macro accordingly.
#endif #endif

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

@@ -19,7 +19,7 @@ extern "C" {
#define ODK_MINOR_VERSION 0 #define ODK_MINOR_VERSION 0
/* ODK Version string. Date changed automatically on each release. */ /* ODK Version string. Date changed automatically on each release. */
#define ODK_RELEASE_DATE "ODK v17.0 2022-02-15" #define ODK_RELEASE_DATE "ODK v17.0 2022-03-25"
/* 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

6
libwvdrmengine/oemcrypto/odk/src/core_message_features.cpp
View File

@@ -8,7 +8,7 @@ namespace oemcrypto_core_message {
namespace features { namespace features {
const CoreMessageFeatures CoreMessageFeatures::kDefaultFeatures; const CoreMessageFeatures CoreMessageFeatures::kDefaultFeatures;
bool CoreMessageFeatures::operator==(const CoreMessageFeatures& other) const { bool CoreMessageFeatures::operator==(const CoreMessageFeatures &other) const {
return maximum_major_version == other.maximum_major_version && return maximum_major_version == other.maximum_major_version &&
maximum_minor_version == other.maximum_minor_version; maximum_minor_version == other.maximum_minor_version;
} }
@@ -31,8 +31,8 @@ CoreMessageFeatures CoreMessageFeatures::DefaultFeatures(
return features; return features;
} }
std::ostream& operator<<(std::ostream& os, std::ostream &operator<<(std::ostream &os,
const CoreMessageFeatures& features) { const CoreMessageFeatures &features) {
return os << "v" << features.maximum_major_version << "." return os << "v" << features.maximum_major_version << "."
<< features.maximum_minor_version; << features.maximum_minor_version;
} }

5
libwvdrmengine/oemcrypto/odk/src/core_message_serialize_proto.cpp
View File

@@ -101,8 +101,11 @@ bool CreateCoreLicenseResponseFromProto(const CoreMessageFeatures& features,
} }
case video_widevine::License_KeyContainer::CONTENT: case video_widevine::License_KeyContainer::CONTENT:
case video_widevine::License_KeyContainer::OPERATOR_SESSION: case video_widevine::License_KeyContainer::OPERATOR_SESSION:
case video_widevine::License_KeyContainer::OEM_CONTENT:
case video_widevine::License_KeyContainer::OEM_ENTITLEMENT:
case video_widevine::License_KeyContainer::ENTITLEMENT: { case video_widevine::License_KeyContainer::ENTITLEMENT: {
if (k.type() == video_widevine::License_KeyContainer::ENTITLEMENT) { if (k.type() == video_widevine::License_KeyContainer::ENTITLEMENT ||
k.type() == video_widevine::License_KeyContainer::OEM_ENTITLEMENT) {
any_entitlement = true; any_entitlement = true;
} else { } else {
any_content = true; any_content = true;