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

Commit 28f07697 authored by Dan Albert's avatar Dan Albert Committed by Gerrit Code Review
Browse files

Merge "File header cleanup."

parents 6a0548bf 3313426f

adb/adb.cpp

+4 −3
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


#define TRACE_TAG TRACE_ADB



#include "sysdeps.h"

#include "adb.h"



#include <stdio.h>

#include <stdlib.h>

#include <ctype.h>
@@ -27,8 +30,6 @@ 
#include <sys/time.h>

#include <stdint.h>



#include "sysdeps.h"

#include "adb.h"

#include "adb_auth.h"

#include "adb_io.h"

#include "adb_listeners.h"

adb/adb_auth.cpp

+4 −3
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


#define TRACE_TAG TRACE_ADB



#include "sysdeps.h"

#include "adb_auth.h"



#include <errno.h>

#include <stdio.h>

#include <string.h>
@@ -23,9 +26,7 @@ 
#include <unistd.h>



#include "adb.h"

#include "adb_auth.h"

#include "transport.h"

#include "sysdeps.h"



int auth_enabled = 0;

adb/adb_auth.h

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#ifndef __ADB_AUTH_H

#define __ADB_AUTH_H



#include "adb.h"



#ifdef __cplusplus

extern "C" {

#endif

adb/adb_auth_client.cpp

+8 −8
Original line number Diff line number Diff line
@@ -14,23 +14,23 @@ 
 * limitations under the License.

 */



#define TRACE_TAG TRACE_AUTH



#include "sysdeps.h"

#include "adb_auth.h"



#include <resolv.h>

#include <stdio.h>

#include <string.h>



#include "sysdeps.h"



#include "adb.h"

#include "adb_auth.h"

#include "cutils/list.h"

#include "cutils/sockets.h"

#include "fdevent.h"

#include "mincrypt/rsa.h"

#include "mincrypt/sha.h"

#include "transport.h"



#define TRACE_TAG TRACE_AUTH



#include "adb.h"

#include "fdevent.h"

#include "transport.h"



struct adb_public_key {

    struct listnode node;

adb/adb_auth_host.cpp

+6 −6
Original line number Diff line number Diff line
@@ -14,8 +14,14 @@ 
 * limitations under the License.

 */



#define TRACE_TAG TRACE_AUTH



#include "sysdeps.h"

#include "adb_auth.h"



#include <stdio.h>

#include <stdlib.h>

#include <string.h>



#ifdef _WIN32

#  ifndef WIN32_LEAN_AND_MEAN
@@ -28,11 +34,8 @@ 
#  include <sys/stat.h>

#  include <unistd.h>

#endif

#include <string.h>



#include "sysdeps.h"

#include "adb.h"

#include "adb_auth.h"



/* HACK: we need the RSAPublicKey struct

 * but RSA_verify conflits with openssl */
@@ -52,12 +55,9 @@ 
#include <openssl/base64.h>

#endif



#define TRACE_TAG TRACE_AUTH



#define ANDROID_PATH   ".android"

#define ADB_KEY_FILE   "adbkey"





struct adb_private_key {

    struct listnode node;

    RSA *rsa;