commit 7eeda6ba0307e70d977b7d1303270b5f25425db3
author Michael Groover <mpgroover@google.com> Thu Apr 25 18:33:35 2019 -0700
committer Michael Groover <mpgroover@google.com> Thu May 09 16:05:40 2019 -0700
tree ab28d0b85a2dd88da9a2d461e6175b09a5ec1277
parent 664193a62e55e016d8dd7cf3eb8453c772f0fff4

Notify the framework when an adb key is authorized

Bug: 124076524
Test: atest AdbDebuggingManagerTest
Change-Id: If73b81ca73ba4d64763cf49c1bbe42de81fa1cb6

adb/adb.cpp

diff --git a/adb/adb.cpp b/adb/adb.cpp
index 2dd22b3..050ba49 100644
--- a/adb/adb.cpp
+++ b/adb/adb.cpp
@@ -337,9 +337,12 @@
             case ADB_AUTH_SIGNATURE: {
                 // TODO: Switch to string_view.
                 std::string signature(p->payload.begin(), p->payload.end());
-                if (adbd_auth_verify(t->token, sizeof(t->token), signature)) {
+                std::string auth_key;
+                if (adbd_auth_verify(t->token, sizeof(t->token), signature, &auth_key)) {
                     adbd_auth_verified(t);
                     t->failed_auth_attempts = 0;
+                    t->auth_key = auth_key;
+                    adbd_notify_framework_connected_key(t);
                 } else {
                     if (t->failed_auth_attempts++ > 256) std::this_thread::sleep_for(1s);
                     send_auth_request(t);
@@ -348,7 +351,8 @@
             }
 
             case ADB_AUTH_RSAPUBLICKEY:
-                adbd_auth_confirm_key(p->payload.data(), p->msg.data_length, t);
+                t->auth_key = std::string(p->payload.data());
+                adbd_auth_confirm_key(t);
                 break;
 #endif
             default: