Regular update

Plugin:
1. Process ECM v3 and send fingerprinting/service_blocking events
2. Rmove unused function Ctr128Add
3. Add support for ECM v3

OEMCrypto:
1. Update API description of OEMCrypto_LoadCasECMKeys
2. Fix android build files for ODK
3. Load content keys to shared memory
4. Move KCB check to LoadCasKeys call
5. Support even/odd content keys to share entitlement key

plugin/include/cas_events.h

@@ -11,6 +11,8 @@
 #define CAS_QUERY_EVENT_START 4000
 #define CAS_ERROR_EVENT_START 5000
 #define CAS_PARENTAL_CONTROL_EVENT_START 6000
+#define CAS_FINGERPRINTING_EVENT_START 6100
+#define CAS_SERVICE_BLOCKING_EVENT_START 6200
 #define CAS_TEST_EVENT_START 10000
 
 typedef enum {
@@ -48,9 +50,41 @@ typedef enum {
   ACCESS_DENIED_BY_PARENTAL_CONTROL,
   AGE_RESTRICTION_UPDATED,
 
+  // The content of FINGERPRINTING_INFO events follows TLV (Type (1 byte) -
+  // Length (2 bytes) - Value) format. See FingerprintingFieldType for possible
+  // types. A FINGERPRINTING_INFO event contains {one or more CHANNEL, one
+  // CONTROL}.
+  FINGERPRINTING_INFO = CAS_FINGERPRINTING_EVENT_START,
+  // Fingerprinting control info for a session. The content of the event follows
+  // TLV (Type (1 byte) - Length (2 bytes) - Value) format. See
+  // SessionFingerprintingFieldType for possible types. It will contain {one
+  // FINGERPRINTING_CONTROL}.
+  SESSION_FINGERPRINTING_INFO,
+
+  // The content of SERVICE_BLOCKING_INFO events follows TLV (Type (1 byte) -
+  // Length (2 bytes) - Value) format. See ServiceBlockingFieldType for possible
+  // types. A SERVICE_BLOCKING_INFO event contains {one or more CHANNEL, one or
+  // more DEVICE_GROUP, zero or one START_TIME_SECONDS, one END_TIME_SECONDS}.
+  SERVICE_BLOCKING_INFO = CAS_SERVICE_BLOCKING_EVENT_START,
+  // Service blocking device group for a session. The content of the event
+  // follows TLV (Type (1 byte) - Length (2 bytes) - Value) format. See
+  // SessionServiceBlockingFieldType for possible types. It will contain {one or
+  // more SERVICE_BLOCKING_DEVICE_GROUP}.
+  SESSION_SERVICE_BLOCKING_INFO,
+
   TEST_FOR_ECHO =
       CAS_TEST_EVENT_START,  // Request an ECHO response to test events passing.
   ECHO,                      // Respond to TEST_FOR_ECHO.
 } CasEventId;
 
+// Types used inside an SESSION_FINGERPRINTING_CONTROL event.
+typedef enum {
+  FINGERPRINTING_CONTROL = 0,
+} SessionFingerprintingFieldType;
+
+// Types used inside an SESSION_SERVICE_BLOCKING_GROUPS event.
+typedef enum {
+  SERVICE_BLOCKING_DEVICE_GROUP = 0,
+} SessionServiceBlockingFieldType;
+
 #endif  // CAS_EVENTS_H