From bec6a777ef8f8cf7e6e5430c0e7a5bf20c1eaa25 Mon Sep 17 00:00:00 2001 From: Chungjui Fan Date: Thu, 23 Jun 2022 14:07:01 +0800 Subject: [PATCH 1/4] CastInstallKeybox: Enable provisioning tool Bug: 229695139 Change-Id: I1af48ec02b26ac83c1ca776e0f0e744d0e40658c Signed-off-by: Chungjui Fan --- factory_tangorpro.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/factory_tangorpro.mk b/factory_tangorpro.mk index 1646a9d..3a16ccc 100644 --- a/factory_tangorpro.mk +++ b/factory_tangorpro.mk @@ -35,3 +35,7 @@ PRODUCT_PACKAGES += fatp_imx787_hat_tool # Factory binaries of wifi PRODUCT_PACKAGES += myftm + +# Tool for installing Cast keybox +PRODUCT_PACKAGES_DEBUG += \ + CastInstallKeybox From 37a8657b562236d41372c991c47248cc6d5c6b12 Mon Sep 17 00:00:00 2001 From: Chungjui Fan Date: Mon, 27 Jun 2022 22:59:31 +0800 Subject: [PATCH 2/4] Check-in cast auth ICA. Copied from http://google3/tv/eureka/tools/keygen/eureka_ca/tangor_ica.crt;rcl=443398868 Bug: 234314805 Change-Id: I8a3e09c4bc8f35d2a1ed237656b253d764a95201 Signed-off-by: Chungjui Fan --- cast_auth/README.md | 4 ++++ cast_auth/tangor_ica.crt | 23 +++++++++++++++++++++++ device-tangorpro.mk | 7 +++++++ 3 files changed, 34 insertions(+) create mode 100644 cast_auth/README.md create mode 100644 cast_auth/tangor_ica.crt diff --git a/cast_auth/README.md b/cast_auth/README.md new file mode 100644 index 0000000..d1df779 --- /dev/null +++ b/cast_auth/README.md @@ -0,0 +1,4 @@ +## tangor_ica.crt + +It is a copy of http://google3/tv/eureka/tools/keygen/eureka_ca/tangor_ica.crt + diff --git a/cast_auth/tangor_ica.crt b/cast_auth/tangor_ica.crt new file mode 100644 index 0000000..771264f --- /dev/null +++ b/cast_auth/tangor_ica.crt @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIID1TCCAr2gAwIBAgICAmAwDQYJKoZIhvcNAQELBQAwdTELMAkGA1UEBhMCVVMx +EzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDU1vdW50YWluIFZpZXcxEzAR +BgNVBAoMCkdvb2dsZSBJbmMxDTALBgNVBAsMBENhc3QxFTATBgNVBAMMDENhc3Qg +Um9vdCBDQTAeFw0yMjA0MTQwMDUzMDhaFw00MjA0MDkwMDUzMDhaMIGDMQswCQYD +VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNTW91bnRhaW4g +VmlldzETMBEGA1UECgwKR29vZ2xlIEluYzENMAsGA1UECwwEQ2FzdDEjMCEGA1UE +AwwaQ2hyb21lY2FzdCBJQ0EgMzMgKFRhYmxldCkwggEiMA0GCSqGSIb3DQEBAQUA +A4IBDwAwggEKAoIBAQDW4wt8YhD+OiKHy0sikOisWLRZ5i9ozYhv89XaqbStXqrS +pRyZXUJCeD3b/UiaoX8uEqiNKB+rZJPA+s9uc0ojlqQBCbcHpCWwjgcZb3YAyx1P +FBduV17FCLO+OmNpxipNltwT9v9Pyx0uaOiNbL9F5p2JK20nzdRAZ2CqyH4Qapat +PgPu0RFKDvfNnmrZ3yYoo85aN+eVXn3BD2E8SsbFVLeETlDoKtBBAb63F6vnphW4 +xnp42nZ2EuugPe46uCT84R+PgFARUdV9J1eXNK5vXLf+R6mSNNsYoP/nV0kFPSjv +FOuh29j5oKCbvHvxDdfA5llwGjhquyWnolIqEdQBAgMBAAGjYDBeMA8GA1UdEwQI +MAYBAf8CAQAwHQYDVR0OBBYEFOGmBM3MpigmTwHryoLQSEAGZ5QmMB8GA1UdIwQY +MBaAFHyaHn3feVS818xeypmGRXlldCgZMAsGA1UdDwQEAwIBBjANBgkqhkiG9w0B +AQsFAAOCAQEAPrEj3/AjBNcVMIlsk4jtrq/NIGu1c5+g3AtFjYI8+j4+3IaQ22iW +3HtrS/9Qgx1d+g42Vz2n1a2940DD4pFpNdFQi5Cl5Vw3VmGIaALkHAUQpiUjq0+z +LsUZymzRMZtXWUx7kkXs78RYafdojp5kV5eL4unS35YSavM5vHBcMFj0R6Rf5zc5 +DMQlQc+zh1E0cbj8UXAby35imAtObxbJ/ys+nJD6ckjf1M0IyugUE63ZE2N2pRyV +LkKrDXB0lLQAsTARSINWKCLODFtGyIMGq0aZsZS6J5u7sVPqnpVQOnIC6BTwajZP +SWPjUpZU+tbfBB8Fp0CYtiSDEWzgyEHVcw== +-----END CERTIFICATE----- diff --git a/device-tangorpro.mk b/device-tangorpro.mk index 3fdbb6b..fbddefc 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -163,3 +163,10 @@ PRODUCT_PROPERTY_OVERRIDES += ro.crypto.metadata_init_delete_all_keys.enabled=fa # b/227692870 PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.software.telecom.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.telecom.xml + +# Cast auth +PRODUCT_COPY_FILES += \ + device/google/tangorpro/cast_auth/tangor_ica.crt:$(TARGET_COPY_OUT_VENDOR)/etc/cert-chain.crt + +PRODUCT_PACKAGES_DEBUG += \ + test_cast_auth From 939bf7c68da350df95df44d66f74996b67bdefd7 Mon Sep 17 00:00:00 2001 From: Chungjui Fan Date: Mon, 27 Jun 2022 23:16:22 +0800 Subject: [PATCH 3/4] castauth: load castauth TZ app Bug: 234314805 Change-Id: Ia781ed2791dc4bb3bc87962dd83fb795070e1095 Signed-off-by: Chungjui Fan --- conf/init.tangorpro.rc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/init.tangorpro.rc b/conf/init.tangorpro.rc index 0bbbc06..96f0063 100644 --- a/conf/init.tangorpro.rc +++ b/conf/init.tangorpro.rc @@ -67,6 +67,10 @@ on post-fs-data chown system system /sys/devices/platform/odm/odm:fp_fpc1020/wakeup_enable exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/1540.app +# Castauth +on post-fs-data + exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/cast_auth.app + # Wifi on post-fs-data setprop wifi.direct.interface p2p-dev-wlan0 From fb24899437b0489cd3d8d7a8f962a583d15cbfdf Mon Sep 17 00:00:00 2001 From: Chungjui Fan Date: Fri, 1 Jul 2022 06:54:02 +0000 Subject: [PATCH 4/4] Define namespaces to include libbinder_trusty_paidl.so and libcast_auth.so Bug: 234314805 Change-Id: Ic32d7f960e10e0028bf6c42b06b722264ef48c27 Signed-off-by: Chungjui Fan --- device-tangorpro.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/device-tangorpro.mk b/device-tangorpro.mk index fbddefc..81552c8 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -164,6 +164,10 @@ PRODUCT_PROPERTY_OVERRIDES += ro.crypto.metadata_init_delete_all_keys.enabled=fa PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.software.telecom.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.telecom.xml +# Trusty libbinder_trusty_paidl.so and libcast_auth.so +PRODUCT_SOONG_NAMESPACES += \ + vendor/google/trusty/common + # Cast auth PRODUCT_COPY_FILES += \ device/google/tangorpro/cast_auth/tangor_ica.crt:$(TARGET_COPY_OUT_VENDOR)/etc/cert-chain.crt