Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b9fcd9d authored by Inseob Kim's avatar Inseob Kim
Browse files

Move adb_keys to product partition 

/adb_keys will be moved to /product/etc/security as it's a
product-specific file. To prevent regression, /adb_keys will be a
symlink to the new location.

Bug: 353430323
Test: boot and connect adb with ADB_VENDOR_KEYS
Change-Id: Iaec1acfa5e8e758058fabf2ec0edd85bd64e7700
parent 5a74561a

libs/adbd_auth/adbd_auth.cpp

+6 −3
Original line number Diff line number Diff line
@@ -390,13 +390,16 @@ public: 
        }

    }



    static constexpr const char* key_paths[] = {"/adb_keys", "/data/misc/adb/adb_keys"};

    static constexpr std::pair<const char*, bool> key_paths[] = {

        {"/adb_keys",               true  /* follow symlinks */       },

        {"/data/misc/adb/adb_keys", false /* don't follow symlinks */ },

    };

    void IteratePublicKeys(bool (*callback)(void*, const char*, size_t), void* opaque) {

        for (const auto& path : key_paths) {

        for (const auto& [path, follow_symlinks] : key_paths) {

            if (access(path, R_OK) == 0) {

                LOG(INFO) << "adbd_auth: loading keys from " << path;

                std::string content;

                if (!android::base::ReadFileToString(path, &content)) {

                if (!android::base::ReadFileToString(path, &content, follow_symlinks)) {

                    PLOG(ERROR) << "adbd_auth: couldn't read " << path;

                    continue;

                }