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

device_files proto changes for Expiring DRM certificates am: dbb1671e39

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13785063

Change-Id: I796dce0d2f1b164a4f426037856f49765ec8820e
This commit is contained in:
Rahul Frias
2021-03-18 00:04:28 +00:00
committed by Automerger Merge Worker
parent bab2a08a61 dbb1671e39
commit b295a1d3af
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libwvdrmengine/cdm/core/src/device_files.proto
View File

@@ -28,6 +28,15 @@ message DeviceCertificate {
optional bytes certificate = 1; optional bytes certificate = 1;
optional bytes wrapped_private_key = 2; optional bytes wrapped_private_key = 2;
optional PrivateKeyType key_type = 3 [default = RSA]; optional PrivateKeyType key_type = 3 [default = RSA];
// Used by DRM certificates with an expiry time. Set by the client when
// the certificate is received. Aids expiration calculation at the
// client when provisioning server and client clocks are not aligned
optional int64 acquisition_time_seconds = 4;
// Used by DRM certificates without an expiration time. This is for
// upgrading devices with pre-existing DRM certificates. The client will
// calculate an expiration time 6 months into the future with a randomized
// +/-2 month window
optional int64 expiration_time_seconds = 5;
} }
message License { message License {
@@ -56,6 +65,7 @@ message License {
optional int64 grace_period_end_time = 11 [default = 0]; optional int64 grace_period_end_time = 11 [default = 0];
optional bytes usage_entry = 12; optional bytes usage_entry = 12;
optional int64 usage_entry_number = 13; optional int64 usage_entry_number = 13;
optional DeviceCertificate drm_certificate = 14;
} }
message UsageInfo { message UsageInfo {
@@ -68,9 +78,19 @@ message UsageInfo {
optional bytes key_set_id = 4; optional bytes key_set_id = 4;
optional bytes usage_entry = 5; optional bytes usage_entry = 5;
optional int64 usage_entry_number = 6; optional int64 usage_entry_number = 6;
// If not present, use the legacy DRM certificate rather than
// one in DrmDeviceCertificate
optional int32 drm_certificate_entry_number = 7;
}
// A cache of DeviceCertificates associated with usage entries
message DrmDeviceCertificate {
optional int32 drm_certificate_entry_number = 1;
optional DeviceCertificate drm_certificate = 2;
} }
repeated ProviderSession sessions = 1; repeated ProviderSession sessions = 1;
repeated DrmDeviceCertificate drm_device_certificates = 2;
} }
message HlsAttributes { message HlsAttributes {
@@ -114,9 +134,7 @@ message File {
USAGE_TABLE_INFO = 5; USAGE_TABLE_INFO = 5;
} }
enum FileVersion { enum FileVersion { VERSION_1 = 1; }
VERSION_1 = 1;
}
optional FileType type = 1; optional FileType type = 1;
optional FileVersion version = 2 [default = VERSION_1]; optional FileVersion version = 2 [default = VERSION_1];