Update ODK library for OPK compatibility

This is a merge from http://go/wvgerrit of several changes to the ODK library that allow it to be used in the same compilation unit as the OPK serialization/deserialization code. Merge of: http://go/wvgerrit/104403 http://go/wvgerrit/105663 http://go/wvgerrit/106004 http://go/wvgerrit/107903 http://go/wvgerrit/107985 http://go/wvgerrit/110167 http://go/wvgerrit/110403 http://go/wvgerrit/110423 http://go/wvgerrit/110663 http://go/wvgerrit/110703 http://go/wvgerrit/110985 http://go/wvgerrit/111703 http://go/wvgerrit/112563 http://go/wvgerrit/113243 http://go/wvgerrit/115204 http://go/wvgerrit/117803 http://go/wvgerrit/121949 bug: 174518179 bug: 175920940 bug: 175126254 Change-Id: I433459182043ca43a040cdbc16d04f2b8215067a
2021-04-09 14:43:02 -07:00
parent 985d0b5129
commit 6a59fee30a
22 changed files with 588 additions and 324 deletions
--- a/libwvdrmengine/oemcrypto/odk/include/OEMCryptoCENCCommon.h
+++ b/libwvdrmengine/oemcrypto/odk/include/OEMCryptoCENCCommon.h
@@ -87,6 +87,7 @@ typedef enum OEMCryptoResult {
  OEMCrypto_ERROR_LICENSE_RELOAD               = 57,
  OEMCrypto_ERROR_MULTIPLE_USAGE_ENTRIES       = 58,
  OEMCrypto_WARNING_MIXED_OUTPUT_PROTECTION    = 59,
+  OEMCrypto_ERROR_INVALID_ENTITLED_KEY_SESSION = 60,
  /* ODK return values */
  ODK_ERROR_BASE                               = 1000,
  ODK_ERROR_CORE_MESSAGE                       = ODK_ERROR_BASE,