Refactor and cleanup codes. No functional changes.

provisioning_sdk/internal/BUILD

@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright 2016 Google Inc.
+# Copyright 2016 Google LLC.
 #
 # This software is licensed under the terms defined in the Widevine Master
 # License Agreement. For a copy of this agreement, please contact
@@ -12,7 +12,9 @@
 package_group(
     name = "internal",
     packages = [
+        "//arcpp_provisioning/...",
         "//provisioning_sdk/...",
+        "//sigma101_provisioning/...",
     ],
 )
 
@@ -27,14 +29,21 @@ cc_library(
     deps = [
         ":oem_device_cert",
         "//base",
+        "@abseil_repo//absl/synchronization",
+        "//common:aes_cbc_util",
+        "//common:certificate_type",
+        "//common:crypto_util",
+        "//common:drm_root_certificate",
+        "//common:drm_service_certificate",
         "//common:random_util",
         "//common:rsa_key",
-        "//provisioning_sdk/internal/certificates:root_certificates",
-        "//provisioning_sdk/public:certificate_type",
+        "//provisioning_sdk/internal/certificates:root_oem_certificates",
         "//provisioning_sdk/public:provisioning_status",
-        "//protos/public:device_certificate_proto",
+        "//protos/public:certificate_provisioning_proto",
+        "//protos/public:device_certificate_status_proto",
+        "//protos/public:drm_certificate_proto",
         "//protos/public:provisioned_device_info_proto",
-        "//protos/public:signed_device_certificate_proto",
+        "//protos/public:signed_drm_certificate_proto",
     ],
 )
 
@@ -45,9 +54,15 @@ cc_test(
     deps = [
         ":provisioning_engine_impl",
         "//base",
-        "//external:gtest_main",
+        "//testing:gunit_main",
+        "//common:certificate_type",
+        "//common:drm_service_certificate",
         "//common:mock_rsa_key",
-        "//provisioning_sdk/public:certificate_type",
+        "//common:rsa_test_keys",
+        "//common:rsa_util",
+        "//common:status",
+        "//common:test_drm_certificates",
+        "//protos/public:certificate_provisioning_proto",
     ],
 )
 
@@ -56,18 +71,9 @@ cc_library(
     srcs = ["provisioning_session_impl.cc"],
     hdrs = ["provisioning_session_impl.h"],
     deps = [
-        ":oem_device_cert",
-        ":provisioning_engine_impl",
         "//base",
-        "//common:aes_cbc_util",
-        "//common:random_util",
         "//common:rsa_key",
-        "//common:sha_util",
         "//provisioning_sdk/public:provisioning_status",
-        "//protos/public:certificate_provisioning_proto",
-        "//protos/public:client_identification_proto",
-        "//protos/public:device_certificate_proto",
-        "//protos/public:provisioned_device_info_proto",
     ],
 )
 
@@ -75,11 +81,46 @@ cc_test(
     name = "provisioning_session_impl_test",
     size = "small",
     srcs = ["provisioning_session_impl_test.cc"],
+    deps = [
+        ":provisioning_engine_impl",
+        ":provisioning_session_impl",
+        "//testing:gunit_main",
+        "//common:mock_rsa_key",
+    ],
+)
+
+cc_library(
+    name = "provisioning30_session_impl",
+    srcs = ["provisioning30_session_impl.cc"],
+    hdrs = ["provisioning30_session_impl.h"],
     deps = [
         ":oem_device_cert",
         ":provisioning_engine_impl",
         ":provisioning_session_impl",
-        "//external:gtest_main",
+        "//base",
+        "//common:aes_cbc_util",
+        "//common:drm_service_certificate",
+        "//common:random_util",
+        "//common:rsa_key",
+        "//common:sha_util",
+        "//provisioning_sdk/public:provisioning_status",
+        "//protos/public:certificate_provisioning_proto",
+        "//protos/public:client_identification_proto",
+        "//protos/public:drm_certificate_proto",
+        "//protos/public:provisioned_device_info_proto",
+    ],
+)
+
+cc_test(
+    name = "provisioning30_session_impl_test",
+    size = "small",
+    srcs = ["provisioning30_session_impl_test.cc"],
+    deps = [
+        ":oem_device_cert",
+        ":provisioning30_session_impl",
+        ":provisioning_engine_impl",
+        ":provisioning_session_impl",
+        "//testing:gunit_main",
         "//common:aes_cbc_util",
         "//common:mock_rsa_key",
         "//common:sha_util",
@@ -92,11 +133,12 @@ cc_library(
     hdrs = ["oem_device_cert.h"],
     deps = [
         "//base",
+        "@abseil_repo//absl/memory",
         "//external:openssl",
+        "//common:certificate_type",
         "//common:openssl_util",
         "//common:rsa_key",
-        "//provisioning_sdk/internal/certificates:root_certificates",
-        "//provisioning_sdk/public:certificate_type",
+        "//provisioning_sdk/internal/certificates:root_oem_certificates",
     ],
 )
 
@@ -106,7 +148,8 @@ cc_test(
     srcs = ["oem_device_cert_test.cc"],
     deps = [
         ":oem_device_cert",
-        "//external:gtest_main",
-        "//provisioning_sdk/internal/certificates:test_certificates",
+        "//testing:gunit_main",
+        "//common:rsa_key",
+        "//provisioning_sdk/internal/certificates:test_oem_certificates",
     ],
 )