Merge changes I55b1eb04,I839db69a,I43e845b8,I56b6d301,Ia59bfacf, ... into main

* changes:
  Unit tests for forbidden RSA key usage
  Add DRM reprovisioning request generation
  Correct copyright header
  Fix bcc length for printing
  Update ODK version to 18.4
  Adjust skipping tests when provisioning skipped
  Change test storage to use protobuf
  Remove WvCdmEnginePreProvTestStaging
  Rename and clarify Drm Reprovisioning token types
This commit is contained in:
Rahul Frias
2024-03-26 06:09:26 +00:00
committed by Android (Google) Code Review
22 changed files with 67 additions and 258 deletions

View File

@@ -607,7 +607,9 @@ enum CdmClientTokenType : int32_t {
kClientTokenOemCert,
kClientTokenUninitialized,
kClientTokenBootCertChain,
kClientTokenDrmReprovisioning,
// For use by internal L3 CDMs supporting individualization of embedded
// drm certificates.
kClientTokenDrmCertificateReprovisioning,
};
// kNonSecureUsageSupport - TEE does not provide any support for usage