commit 67ac379f0125c91c14e6ac9ab389d1f791d02945
author Josh Gao <jmgao@google.com> Thu Oct 06 13:31:44 2016 -0700
committer Josh Gao <jmgao@google.com> Thu Oct 06 14:50:02 2016 -0700
tree 45b68a3848150ccc5abaccb12672f94e8f0fa5a4
parent b4e8ba2768d060465ad4fe9f0d39c809b08b93d7

adb: rationalize types.

Use fixed length types for structs going over the wire, constify
arguments where possible, use char* instead of unsigned char* for
apacket data, and assorted other refactoring.

Bug: http://b/29273531
Test: python test_device.py with every combination of old/new adb and adbd
Change-Id: I0b6f818a32be5386985aa4519f542003cf427f9d

adb_auth_host.cpp

diff --git a/adb_auth_host.cpp b/adb_auth_host.cpp
index b5b9b97..ff2d76d 100644
--- a/adb_auth_host.cpp
+++ b/adb_auth_host.cpp
@@ -298,14 +298,15 @@
     return result;
 }
 
-int adb_auth_sign(RSA* key, const unsigned char* token, size_t token_size, unsigned char* sig) {
+static int adb_auth_sign(RSA* key, const char* token, size_t token_size, char* sig) {
     if (token_size != TOKEN_SIZE) {
         D("Unexpected token size %zd", token_size);
         return 0;
     }
 
     unsigned int len;
-    if (!RSA_sign(NID_sha1, token, token_size, sig, &len, key)) {
+    if (!RSA_sign(NID_sha1, reinterpret_cast<const uint8_t*>(token), token_size,
+                  reinterpret_cast<uint8_t*>(sig), &len, key)) {
         return 0;
     }
 
@@ -448,7 +449,7 @@
     send_packet(p, t);
 }
 
-void send_auth_response(uint8_t* token, size_t token_size, atransport* t) {
+void send_auth_response(const char* token, size_t token_size, atransport* t) {
     std::shared_ptr<RSA> key = t->NextKey();
     if (key == nullptr) {
         // No more private keys to try, send the public key.