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/src/odk_overflow.c
+++ b/libwvdrmengine/oemcrypto/odk/src/odk_overflow.c
@@ -34,3 +34,13 @@ int odk_add_overflow_ux(size_t a, size_t b, size_t* c) {
  }
  return 1;
 }
+
+int odk_mul_overflow_ux(size_t a, size_t b, size_t* c) {
+  if (b > 0 && a > SIZE_MAX / b) {
+    return 1;
+  }
+  if (c) {
+    *c = a * b;
+  }
+  return 0;
+}