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

Commit 7fb14071 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

adb: log more detail on failure to read keys. 

Before we just got "Failed to read key". After:

  adb E 10-07 08:20:14 258249 258249 auth.cpp:176] Failed to read key \
    from '/usr/local/google/home/enh/.android/adbkey'
  94390117965240:error:0900006e:PEM routines:OPENSSL_internal:NO_START_LINE:\
    external/boringssl/src/crypto/pem/pem_lib.c:622:Expecting: ANY PRIVATE KEY

Also fix the misleading "Failed to generate" message from adb_auth_init.

Bug: http://b/141715453
Test: manually corrupted key; see above
Change-Id: I6732ee6b683c8548d596d7c22eeddab8ce9a3cea
parent 58ae8d47

adb/client/auth.cpp

+5 −4
Original line number Diff line number Diff line
@@ -173,7 +173,8 @@ static std::shared_ptr<RSA> read_key_file(const std::string& file) { 


    RSA* key = RSA_new();

    if (!PEM_read_RSAPrivateKey(fp.get(), &key, nullptr, nullptr)) {

        LOG(ERROR) << "Failed to read key";

        LOG(ERROR) << "Failed to read key from '" << file << "'";

        ERR_print_errors_fp(stderr);

        RSA_free(key);

        return nullptr;

    }
@@ -249,7 +250,7 @@ static std::string get_user_key_path() { 
    return adb_get_android_dir_path() + OS_PATH_SEPARATOR + "adbkey";

}



static bool generate_userkey() {

static bool load_userkey() {

    std::string path = get_user_key_path();

    if (path.empty()) {

        PLOG(ERROR) << "Error getting user key filename";
@@ -435,8 +436,8 @@ static void adb_auth_inotify_init(const std::set<std::string>& paths) { 
void adb_auth_init() {

    LOG(INFO) << "adb_auth_init...";



    if (!generate_userkey()) {

        LOG(ERROR) << "Failed to generate user key";

    if (!load_userkey()) {

        LOG(ERROR) << "Failed to load (or generate) user key";

        return;

    }