MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-11-16 06:59:29 +01:00
Code Releases Wiki Activity

Mi Band 6 auth: Working jni call to generate keys

Browse Source
This commit is contained in:
Andreas Shimokawa 2021-08-24 10:13:31 +02:00
parent 9bd8424f83
commit 1c6f055bef
4 changed files with 47 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/build.gradle
View File

@ -64,6 +64,11 @@ android {
version "3.10.2" version "3.10.2"
} }
} }
sourceSets {
main {
jniLibs.srcDirs = ['libs'] // where libs is the name of the directory!
}
}
} }
pmd { pmd {

7
app/src/main/c/CMakeLists.txt
View File

@ -1,4 +1,5 @@
cmake_minimum_required(VERSION 3.4.1) cmake_minimum_required(VERSION 3.4.1)
add_library( tiny-edhc add_library(tiny-edhc
SHARED SHARED
ecdh.c ) ecdh.c
ecdh_jni.c)

14
app/src/main/c/ecdh_jni.c Normal file
View File

@ -0,0 +1,14 @@
#include <jni.h>
#include "ecdh.h"
JNIEXPORT jbyteArray JNICALL
Java_nodomain_freeyourgadget_gadgetbridge_service_devices_huami_operations_InitOperation2021_ecdh_1generate_1public(
JNIEnv *env, jobject thiz, jbyteArray private_ec) {
jboolean isCopy;
jbyte *a = (*env)->GetByteArrayElements(env, private_ec, &isCopy);
jbyte public_ec[48];
ecdh_generate_keys((unsigned char *) public_ec, (unsigned char *) a);
jbyteArray return_array = (*env)->NewByteArray(env, 48);
(*env)->SetByteArrayRegion(env, return_array, 0, 48, public_ec);
return return_array;
}

27
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/InitOperation2021.java
View File

@ -27,6 +27,7 @@ import org.slf4j.LoggerFactory;
import java.security.InvalidKeyException; import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.util.Arrays; import java.util.Arrays;
import java.util.Random;
import java.util.UUID; import java.util.UUID;
import javax.crypto.BadPaddingException; import javax.crypto.BadPaddingException;
@ -45,6 +46,15 @@ import nodomain.freeyourgadget.gadgetbridge.util.GB;
public class InitOperation2021 extends InitOperation { public class InitOperation2021 extends InitOperation {
private byte[] privateEC = new byte[24];
private byte[] publicEC;
private byte[] sharedEC;
static {
System.loadLibrary("tiny-edhc");
}
private static final Logger LOG = LoggerFactory.getLogger(InitOperation2021.class); private static final Logger LOG = LoggerFactory.getLogger(InitOperation2021.class);
public InitOperation2021(boolean needsAuth, byte authFlags, byte cryptFlags, HuamiSupport support, TransactionBuilder builder) { public InitOperation2021(boolean needsAuth, byte authFlags, byte cryptFlags, HuamiSupport support, TransactionBuilder builder) {
@ -56,11 +66,22 @@ public class InitOperation2021 extends InitOperation {
huamiSupport.enableNotifications(builder, true); huamiSupport.enableNotifications(builder, true);
builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZING, getContext())); builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZING, getContext()));
// get random auth number // get random auth number
huamiSupport.writeToChunked2021(builder, (short) 0x82, (byte) 0x66, requestAuthNumber()); generateKeyPair();
byte[] sendPubkeyCommand = new byte[48 + 4];
sendPubkeyCommand[0] = 0x04;
sendPubkeyCommand[1] = 0x02;
sendPubkeyCommand[2] = 0x00;
sendPubkeyCommand[3] = 0x02;
System.arraycopy(publicEC, 0, sendPubkeyCommand, 4, 48);
huamiSupport.writeToChunked2021(builder, (short) 0x82, (byte) 0x66, sendPubkeyCommand);
} }
private byte[] requestAuthNumber() { private native byte[] ecdh_generate_public(byte[] privateEC);
return new byte[]{0x04,0x02,0x00,0x02, (byte) 0xe3,0x16, (byte) 0xde,0x05, (byte) 0xe4, (byte) 0xa7,0x05,0x18,0x4b, (byte) 0xc9, (byte) 0x99, (byte) 0xd7, (byte) 0x90, (byte) 0x90,0x71, (byte) 0xdc,0x1c,0x58,0x55,0x1b,0x02,0x00,0x00,0x00, (byte) 0x96, (byte) 0xf1, (byte) 0x82,0x01, (byte) 0x98,0x6a, (byte) 0xd7, (byte) 0xe6,0x52,0x2e, (byte) 0xfd, (byte) 0xdc,0x4d, (byte) 0xe9,0x23, (byte) 0x81, (byte) 0x82,0x7d,0x76,0x6c,0x01,0x00,0x00,0x00};
private void generateKeyPair() {
Random r = new Random();
r.nextBytes(privateEC);
publicEC = ecdh_generate_public(privateEC);
} }
private byte[] getSecretKey() { private byte[] getSecretKey() {