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

oemcrypto/odk/test/fuzzing/Android.bp

@@ -3,7 +3,7 @@
 // License Agreement.
 
 cc_defaults {
-    name: "odk_fuzz_library_defaults",
+    name: "cas_odk_fuzz_library_defaults",
     srcs: [
         "odk_fuzz_helper.cpp",
     ],
@@ -15,7 +15,7 @@ cc_defaults {
 }
 
 cc_fuzz {
-    name: "odk_license_request_fuzz",
+    name: "cas_odk_license_request_fuzz",
     srcs: [
         "odk_license_request_fuzz.cpp",
     ],
@@ -24,15 +24,15 @@ cc_fuzz {
     },
     corpus: ["corpus/little_endian_64bit/license_request_corpus/*"],
     static_libs: [
-        "libwv_kdo",
-        "libwv_odk",
+        "libwvcas_kdo",
+        "libwvcas_odk",
     ],
-    defaults: ["odk_fuzz_library_defaults"],
+    defaults: ["cas_odk_fuzz_library_defaults"],
     proprietary: true,
 }
 
 cc_fuzz {
-    name: "odk_renewal_request_fuzz",
+    name: "cas_odk_renewal_request_fuzz",
     srcs: [
         "odk_renewal_request_fuzz.cpp",
     ],
@@ -41,15 +41,15 @@ cc_fuzz {
     },
     corpus: ["corpus/little_endian_64bit/renewal_request_corpus/*"],
     static_libs: [
-        "libwv_kdo",
-        "libwv_odk",
+        "libwvcas_kdo",
+        "libwvcas_odk",
     ],
-    defaults: ["odk_fuzz_library_defaults"],
+    defaults: ["cas_odk_fuzz_library_defaults"],
     proprietary: true,
 }
 
 cc_fuzz {
-    name: "odk_provisioning_request_fuzz",
+    name: "cas_odk_provisioning_request_fuzz",
     srcs: [
         "odk_provisioning_request_fuzz.cpp",
     ],
@@ -58,15 +58,15 @@ cc_fuzz {
     },
     corpus: ["corpus/little_endian_64bit/provisioning_request_corpus/*"],
     static_libs: [
-        "libwv_kdo",
-        "libwv_odk",
+        "libwvcas_kdo",
+        "libwvcas_odk",
     ],
-    defaults: ["odk_fuzz_library_defaults"],
+    defaults: ["cas_odk_fuzz_library_defaults"],
     proprietary: true,
 }
 
 cc_fuzz {
-    name: "odk_license_response_fuzz",
+    name: "cas_odk_license_response_fuzz",
     srcs: [
         "odk_license_response_fuzz.cpp",
     ],
@@ -75,15 +75,15 @@ cc_fuzz {
     },
     corpus: ["corpus/little_endian_64bit/license_response_corpus/*"],
     static_libs: [
-        "libwv_kdo",
-        "libwv_odk",
+        "libwvcas_kdo",
+        "libwvcas_odk",
     ],
-    defaults: ["odk_fuzz_library_defaults"],
+    defaults: ["cas_odk_fuzz_library_defaults"],
     proprietary: true,
 }
 
 cc_fuzz {
-    name: "odk_renewal_response_fuzz",
+    name: "cas_odk_renewal_response_fuzz",
     srcs: [
         "odk_renewal_response_fuzz.cpp",
     ],
@@ -92,15 +92,15 @@ cc_fuzz {
     },
     corpus: ["corpus/little_endian_64bit/renewal_response_corpus/*"],
     static_libs: [
-        "libwv_kdo",
-        "libwv_odk",
+        "libwvcas_kdo",
+        "libwvcas_odk",
     ],
-    defaults: ["odk_fuzz_library_defaults"],
+    defaults: ["cas_odk_fuzz_library_defaults"],
     proprietary: true,
 }
 
 cc_fuzz {
-    name: "odk_provisioning_response_fuzz",
+    name: "cas_odk_provisioning_response_fuzz",
     srcs: [
         "odk_provisioning_response_fuzz.cpp",
     ],
@@ -109,15 +109,15 @@ cc_fuzz {
     },
     corpus: ["corpus/little_endian_64bit/provisioning_response_corpus/*"],
     static_libs: [
-        "libwv_kdo",
-        "libwv_odk",
+        "libwvcas_kdo",
+        "libwvcas_odk",
     ],
-    defaults: ["odk_fuzz_library_defaults"],
+    defaults: ["cas_odk_fuzz_library_defaults"],
     proprietary: true,
 }
 
 cc_fuzz {
-    name: "odk_license_response_fuzz_with_mutator",
+    name: "cas_odk_license_response_fuzz_with_mutator",
     srcs: [
         "odk_license_response_fuzz_with_mutator.cpp",
     ],
@@ -126,15 +126,15 @@ cc_fuzz {
     },
     corpus: ["corpus/little_endian_64bit/license_response_corpus/*"],
     static_libs: [
-        "libwv_kdo",
-        "libwv_odk",
+        "libwvcas_kdo",
+        "libwvcas_odk",
     ],
-    defaults: ["odk_fuzz_library_defaults"],
+    defaults: ["cas_odk_fuzz_library_defaults"],
     proprietary: true,
 }
 
 cc_fuzz {
-    name: "odk_renewal_response_fuzz_with_mutator",
+    name: "cas_odk_renewal_response_fuzz_with_mutator",
     srcs: [
         "odk_renewal_response_fuzz_with_mutator.cpp",
     ],
@@ -143,15 +143,15 @@ cc_fuzz {
     },
     corpus: ["corpus/little_endian_64bit/renewal_response_corpus/*"],
     static_libs: [
-        "libwv_kdo",
-        "libwv_odk",
+        "libwvcas_kdo",
+        "libwvcas_odk",
     ],
-    defaults: ["odk_fuzz_library_defaults"],
+    defaults: ["cas_odk_fuzz_library_defaults"],
     proprietary: true,
 }
 
 cc_fuzz {
-    name: "odk_provisioning_response_fuzz_with_mutator",
+    name: "cas_odk_provisioning_response_fuzz_with_mutator",
     srcs: [
         "odk_provisioning_response_fuzz_with_mutator.cpp",
     ],
@@ -160,9 +160,9 @@ cc_fuzz {
     },
     corpus: ["corpus/little_endian_64bit/provisioning_response_corpus/*"],
     static_libs: [
-        "libwv_kdo",
-        "libwv_odk",
+        "libwvcas_kdo",
+        "libwvcas_odk",
     ],
-    defaults: ["odk_fuzz_library_defaults"],
+    defaults: ["cas_odk_fuzz_library_defaults"],
     proprietary: true,
 }

oemcrypto/odk/test/fuzzing/corpus_generator/Android.bp

@@ -10,7 +10,7 @@
 // Builds libwv_odk.so, The ODK shared Library (libwv_odk) is used
 // by the OEMCrypto unit tests to generate corpus for ODK fuzz scrips.
 cc_library_shared {
-    name: "libwv_odk_corpus_generator",
+    name: "libwvcas_odk_corpus_generator",
     include_dirs: [
         "vendor/widevine/libwvmediacas/oemcrypto/include",
         "vendor/widevine/libwvmediacas/oemcrypto/odk/include",