- Fixed bug, caused by sending payloads to device but not triggering it

MenosGrante · Jul 9, 2018 · d9f196d · d9f196d
1 parent 2a4916d
commit d9f196d
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "com.pavelrekun.rekado"
         minSdkVersion minimumSDKVersion
         targetSdkVersion currentSDKVersion
-        versionCode 10
-        versionName "1.1"
+        versionCode 11
+        versionName "1.1.1"
 
         externalNativeBuild {
             cmake {
@@ -43,9 +43,8 @@ android {
     }
 
     lintOptions {
-        checkReleaseBuilds false
+        abortOnError false
     }
-
 }
 
 kotlin {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -39,8 +39,7 @@
             <intent-filter>
                 <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
             </intent-filter>
-            <meta-data
-                android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
+            <meta-data android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
                 android:resource="@xml/device_filter" />
         </activity>
 

diff --git a/app/src/main/cpp/native-lib.cpp b/app/src/main/cpp/native-lib.cpp
@@ -7,7 +7,7 @@
 
 extern "C" JNIEXPORT jint
 JNICALL
-Java_com_pavelrekun_rekado_services_usb_USBLoader_nativeTriggerExploit(
+Java_com_pavelrekun_rekado_services_payloads_PayloadLoader_nativeTriggerExploit(
         JNIEnv *env,
         jobject /* this */,
         jint fd,

diff --git a/app/src/main/java/com/pavelrekun/rekado/services/payloads/PayloadLoader.kt b/app/src/main/java/com/pavelrekun/rekado/services/payloads/PayloadLoader.kt
@@ -15,14 +15,14 @@ import java.nio.ByteOrder
 class PayloadLoader : USBHandler {
 
     companion object {
+        init {
+            System.loadLibrary("native-lib")
+        }
+
         private const val RCM_PAYLOAD_ADDR = 0x40010000
         private const val INTERMEZZO_LOCATION = 0x4001F000
         private const val PAYLOAD_LOAD_BLOCK = 0x40020000
         private const val MAX_LENGTH = 0x30298
-
-        init {
-            System.loadLibrary("native-lib")
-        }
     }
 
     override fun handleDevice(device: UsbDevice) {
@@ -77,6 +77,7 @@ class PayloadLoader : USBHandler {
         }
 
         payload.put(intermezzo)
+
         payload.put(ByteArray(PAYLOAD_LOAD_BLOCK - INTERMEZZO_LOCATION - intermezzo.size))
 
         try {
@@ -136,5 +137,5 @@ class PayloadLoader : USBHandler {
      * A native method that is implemented by the 'native-lib' native library,
      * which is packaged with this application.
      */
-    private external fun nativeTriggerExploit(fd: Int, length: Int): Int
+    external fun nativeTriggerExploit(fd: Int, length: Int): Int
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <string name="app_name" translatable="false">Rekado</string>
-    <string name="app_version" translatable="false">1.1</string>
+    <string name="app_version" translatable="false">1.1.1</string>
 
     <!-- Strings for Navigation -->
     <string name="navigation_payloads">Payloads</string>