From 21061d6d55a0179db2e3a3f62f83e6f5fcb1446a Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Mon, 10 Jan 2022 10:27:39 +0100 Subject: [PATCH] Removing client/android library cmake, not needed anymore --- client/android/CMakeLists.txt | 246 ---------------------------------- client/android/jni_tools.c | 81 ----------- client/android/jni_tools.h | 40 ------ client/android/pm3_main.c | 174 ------------------------ 4 files changed, 541 deletions(-) delete mode 100644 client/android/CMakeLists.txt delete mode 100644 client/android/jni_tools.c delete mode 100644 client/android/jni_tools.h delete mode 100644 client/android/pm3_main.c diff --git a/client/android/CMakeLists.txt b/client/android/CMakeLists.txt deleted file mode 100644 index 3148436ac..000000000 --- a/client/android/CMakeLists.txt +++ /dev/null @@ -1,246 +0,0 @@ -#----------------------------------------------------------------------------- -# Copyright (C) Jonathan Westhues, Mar 2006 -# Copyright (C) Proxmark3 contributors. See AUTHORS.md for details. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# See LICENSE.txt for the text of the license. -#----------------------------------------------------------------------------- -# version -message(STATUS "CMake ${CMAKE_VERSION}") -cmake_minimum_required(VERSION 3.4.1) -project(proxmark3) - -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -fvisibility=hidden -w") - -# Root path into client -set(PM3_ROOT ../../) - -add_subdirectory(../deps deps) - -# Build zlib deps at external -if (CMAKE_MAKE_PROGRAM MATCHES ".*ninja.*") - set(BZIP2_INCLUDE_DIRS ${BZIP2_ROOT}) - set(BZIP2_LIBRARIES pm3rrg_rdv4_bzip2) -elseif (UNIX) # Cross compile at Unix Makefile System. - # bzip2 dep. - include(ExternalProject) - set(CFLAGS_EXTERNAL_LIB "CFLAGS=--target=${CMAKE_C_COMPILER_TARGET} -w") - set(BZIP2_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/deps/bzip2/src/bzip2) - ExternalProject_Add(bzip2 - GIT_REPOSITORY https://android.googlesource.com/platform/external/bzip2 - GIT_TAG platform-tools-30.0.2 - PREFIX deps/bzip2 - #SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/deps/bzip2 - CONFIGURE_COMMAND mkdir -p ${BZIP2_BUILD_DIR} && git archive --format tar HEAD | tar -C ${BZIP2_BUILD_DIR} -x - BUILD_IN_SOURCE ON - BUILD_COMMAND make -C ${BZIP2_BUILD_DIR} -j4 CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} LD=${CMAKE_C_COMPILER} AR=${CMAKE_AR} RANLIB=${CMAKE_RANLIB} ${CFLAGS_EXTERNAL_LIB} libbz2.a - INSTALL_COMMAND "" - LOG_DOWNLOAD ON - ) - ExternalProject_Add_StepTargets(bzip2 configure build install) - set(BZIP2_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/deps/bzip2/src/bzip2) - set(BZIP2_LIBRARIES ${CMAKE_CURRENT_BINARY_DIR}/deps/bzip2/src/bzip2/libbz2.a) -else () - message(ERROR "Please implement your BZIP2 import.") -endif () - -# client resources -add_library(pm3rrg_rdv4 SHARED - ${PM3_ROOT}/common/commonutil.c - ${PM3_ROOT}/common/util_posix.c - ${PM3_ROOT}/common/bucketsort.c - ${PM3_ROOT}/common/crapto1/crapto1.c - ${PM3_ROOT}/common/crapto1/crypto1.c - ${PM3_ROOT}/common/crc.c - ${PM3_ROOT}/common/crc16.c - ${PM3_ROOT}/common/crc32.c - ${PM3_ROOT}/common/crc64.c - ${PM3_ROOT}/common/lfdemod.c - ${PM3_ROOT}/common/legic_prng.c - ${PM3_ROOT}/common/iso15693tools.c - ${PM3_ROOT}/common/cardhelper.c - ${PM3_ROOT}/common/generator.c - ${PM3_ROOT}/client/src/crypto/asn1dump.c - ${PM3_ROOT}/client/src/crypto/asn1utils.c - ${PM3_ROOT}/client/src/crypto/libpcrypto.c - ${PM3_ROOT}/client/src/emv/test/cda_test.c - ${PM3_ROOT}/client/src/emv/test/crypto_test.c - ${PM3_ROOT}/client/src/emv/test/cryptotest.c - ${PM3_ROOT}/client/src/emv/test/dda_test.c - ${PM3_ROOT}/client/src/emv/test/sda_test.c - ${PM3_ROOT}/client/src/emv/cmdemv.c - ${PM3_ROOT}/client/src/emv/crypto.c - ${PM3_ROOT}/client/src/emv/crypto_polarssl.c - ${PM3_ROOT}/client/src/emv/dol.c - ${PM3_ROOT}/client/src/emv/emv_pk.c - ${PM3_ROOT}/client/src/emv/emv_pki.c - ${PM3_ROOT}/client/src/emv/emv_pki_priv.c - ${PM3_ROOT}/client/src/emv/emv_roca.c - ${PM3_ROOT}/client/src/emv/emv_tags.c - ${PM3_ROOT}/client/src/emv/emvcore.c - ${PM3_ROOT}/client/src/emv/emvjson.c - ${PM3_ROOT}/client/src/emv/tlv.c - ${PM3_ROOT}/client/src/fido/additional_ca.c - ${PM3_ROOT}/client/src/fido/cbortools.c - ${PM3_ROOT}/client/src/fido/cose.c - ${PM3_ROOT}/client/src/fido/fidocore.c - ${PM3_ROOT}/client/src/iso7816/apduinfo.c - ${PM3_ROOT}/client/src/iso7816/iso7816core.c - ${PM3_ROOT}/client/src/ksx6924/ksx6924core.c - ${PM3_ROOT}/client/src/cipurse/cipursecrypto.c - ${PM3_ROOT}/client/src/cipurse/cipursecore.c - ${PM3_ROOT}/client/src/cipurse/cipursetest.c - ${PM3_ROOT}/client/src/loclass/cipher.c - ${PM3_ROOT}/client/src/loclass/cipherutils.c - ${PM3_ROOT}/client/src/loclass/elite_crack.c - ${PM3_ROOT}/client/src/loclass/hash1_brute.c - ${PM3_ROOT}/client/src/loclass/ikeys.c - ${PM3_ROOT}/client/src/mifare/mad.c - ${PM3_ROOT}/client/src/mifare/aiddesfire.c - ${PM3_ROOT}/client/src/mifare/mfkey.c - ${PM3_ROOT}/client/src/mifare/mifare4.c - ${PM3_ROOT}/client/src/mifare/mifaredefault.c - ${PM3_ROOT}/client/src/mifare/mifarehost.c - ${PM3_ROOT}/client/src/nfc/ndef.c - ${PM3_ROOT}/client/src/mifare/lrpcrypto.c - ${PM3_ROOT}/client/src/mifare/desfirecrypto.c - ${PM3_ROOT}/client/src/mifare/desfiresecurechan.c - ${PM3_ROOT}/client/src/mifare/desfirecore.c - ${PM3_ROOT}/client/src/mifare/desfiretest.c - ${PM3_ROOT}/client/src/mifare/gallaghercore.c - ${PM3_ROOT}/client/src/uart/uart_posix.c - ${PM3_ROOT}/client/src/uart/uart_win32.c - ${PM3_ROOT}/client/src/ui/overlays.ui - ${PM3_ROOT}/client/src/ui/image.ui - ${PM3_ROOT}/client/src/aidsearch.c - ${PM3_ROOT}/client/src/atrs.c - ${PM3_ROOT}/client/src/cmdanalyse.c - ${PM3_ROOT}/client/src/cmdcrc.c - ${PM3_ROOT}/client/src/cmddata.c - ${PM3_ROOT}/client/src/cmdflashmem.c - ${PM3_ROOT}/client/src/cmdflashmemspiffs.c - ${PM3_ROOT}/client/src/cmdhf.c - ${PM3_ROOT}/client/src/cmdhf14a.c - ${PM3_ROOT}/client/src/cmdhf14b.c - ${PM3_ROOT}/client/src/cmdhf15.c - ${PM3_ROOT}/client/src/cmdhfcryptorf.c - ${PM3_ROOT}/client/src/cmdhfemrtd.c - ${PM3_ROOT}/client/src/cmdhfepa.c - ${PM3_ROOT}/client/src/cmdhffelica.c - ${PM3_ROOT}/client/src/cmdhffido.c - ${PM3_ROOT}/client/src/cmdhfgallagher.c - ${PM3_ROOT}/client/src/cmdhfcipurse.c - ${PM3_ROOT}/client/src/cmdhficlass.c - ${PM3_ROOT}/client/src/cmdhfjooki.c - ${PM3_ROOT}/client/src/cmdhfksx6924.c - ${PM3_ROOT}/client/src/cmdhflegic.c - ${PM3_ROOT}/client/src/cmdhflist.c - ${PM3_ROOT}/client/src/cmdhflto.c - ${PM3_ROOT}/client/src/cmdhfmf.c - ${PM3_ROOT}/client/src/cmdhfmfdes.c - ${PM3_ROOT}/client/src/cmdhfmfhard.c - ${PM3_ROOT}/client/src/cmdhfmfp.c - ${PM3_ROOT}/client/src/cmdhfmfu.c - ${PM3_ROOT}/client/src/cmdhfseos.c - ${PM3_ROOT}/client/src/cmdhfst.c - ${PM3_ROOT}/client/src/cmdhfst25ta.c - ${PM3_ROOT}/client/src/cmdhfthinfilm.c - ${PM3_ROOT}/client/src/cmdhftopaz.c - ${PM3_ROOT}/client/src/cmdhfwaveshare.c - ${PM3_ROOT}/client/src/cmdhw.c - ${PM3_ROOT}/client/src/cmdlf.c - ${PM3_ROOT}/client/src/cmdlfawid.c - ${PM3_ROOT}/client/src/cmdlfcotag.c - ${PM3_ROOT}/client/src/cmdlfdestron.c - ${PM3_ROOT}/client/src/cmdlfem.c - ${PM3_ROOT}/client/src/cmdlfem410x.c - ${PM3_ROOT}/client/src/cmdlfem4x05.c - ${PM3_ROOT}/client/src/cmdlfem4x50.c - ${PM3_ROOT}/client/src/cmdlfem4x70.c - ${PM3_ROOT}/client/src/cmdlffdxb.c - ${PM3_ROOT}/client/src/cmdlfgallagher.c - ${PM3_ROOT}/client/src/cmdlfguard.c - ${PM3_ROOT}/client/src/cmdlfhid.c - ${PM3_ROOT}/client/src/cmdlfhitag.c - ${PM3_ROOT}/client/src/cmdlfidteck.c - ${PM3_ROOT}/client/src/cmdlfindala.c - ${PM3_ROOT}/client/src/cmdlfio.c - ${PM3_ROOT}/client/src/cmdlfjablotron.c - ${PM3_ROOT}/client/src/cmdlfkeri.c - ${PM3_ROOT}/client/src/cmdlfmotorola.c - ${PM3_ROOT}/client/src/cmdlfnedap.c - ${PM3_ROOT}/client/src/cmdlfnexwatch.c - ${PM3_ROOT}/client/src/cmdlfnoralsy.c - ${PM3_ROOT}/client/src/cmdlfpac.c - ${PM3_ROOT}/client/src/cmdlfparadox.c - ${PM3_ROOT}/client/src/cmdlfpcf7931.c - ${PM3_ROOT}/client/src/cmdlfpresco.c - ${PM3_ROOT}/client/src/cmdlfpyramid.c - ${PM3_ROOT}/client/src/cmdlfsecurakey.c - ${PM3_ROOT}/client/src/cmdlft55xx.c - ${PM3_ROOT}/client/src/cmdlfti.c - ${PM3_ROOT}/client/src/cmdlfviking.c - ${PM3_ROOT}/client/src/cmdlfvisa2000.c - ${PM3_ROOT}/client/src/cmdlfzx8211.c - ${PM3_ROOT}/client/src/cmdmain.c - ${PM3_ROOT}/client/src/cmdnfc.c - ${PM3_ROOT}/client/src/cmdparser.c - ${PM3_ROOT}/client/src/cmdscript.c - ${PM3_ROOT}/client/src/cmdsmartcard.c - ${PM3_ROOT}/client/src/cmdtrace.c - ${PM3_ROOT}/client/src/cmdusart.c - ${PM3_ROOT}/client/src/cmdwiegand.c - ${PM3_ROOT}/client/src/comms.c - ${PM3_ROOT}/client/src/fileutils.c - ${PM3_ROOT}/client/src/flash.c - ${PM3_ROOT}/client/src/graph.c - ${PM3_ROOT}/client/src/jansson_path.c - ${PM3_ROOT}/client/src/preferences.c - ${PM3_ROOT}/client/src/pm3_binlib.c - ${PM3_ROOT}/client/src/pm3_bitlib.c - ${PM3_ROOT}/client/src/prng.c - ${PM3_ROOT}/client/src/scandir.c - ${PM3_ROOT}/client/src/scripting.c - ${PM3_ROOT}/client/src/tea.c - ${PM3_ROOT}/client/src/ui.c - ${PM3_ROOT}/client/src/util.c - ${PM3_ROOT}/client/src/wiegand_formats.c - ${PM3_ROOT}/client/src/wiegand_formatutils.c - # android resources - jni_tools.c - pm3_main.c - ) - -# includes -target_include_directories(pm3rrg_rdv4 PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${BZIP2_INCLUDE_DIRS} - ${PM3_ROOT}/common - ${PM3_ROOT}/common_fpga - ${PM3_ROOT}/include - ${PM3_ROOT}/client/src - ${PM3_ROOT}/client/include - ) - -target_link_libraries(pm3rrg_rdv4 - ${BZIP2_LIBRARIES} - pm3rrg_rdv4_hardnested - pm3rrg_rdv4_mbedtls - pm3rrg_rdv4_cliparser - pm3rrg_rdv4_jansson - pm3rrg_rdv4_lua - pm3rrg_rdv4_tinycbor - pm3rrg_rdv4_amiibo - pm3rrg_rdv4_reveng - pm3rrg_rdv4_whereami - android - log) diff --git a/client/android/jni_tools.c b/client/android/jni_tools.c deleted file mode 100644 index 66f1cf3f8..000000000 --- a/client/android/jni_tools.c +++ /dev/null @@ -1,81 +0,0 @@ -// -// Created by DXL on 2017/9/1. -// - -//including header -#include -#include -#include - -// native thread attach label -static bool g_IsAttach; - -// get current env for jvm -JNIEnv *getJniEnv() { - JNIEnv *currentThreadEnv; - g_IsAttach = false; - if ((*g_JavaVM)->GetEnv(g_JavaVM, (void **) ¤tThreadEnv, JNI_VERSION_1_4) != JNI_OK) { - LOGE("Get Env Fail!"); - if ((*g_JavaVM)->AttachCurrentThread(g_JavaVM, ¤tThreadEnv, NULL) != JNI_OK) { - LOGE("Attach the current thread Fail!"); - g_IsAttach = false; - return NULL; - } else { - g_IsAttach = true; - LOGE("Attach the current thread Success!"); - return currentThreadEnv; - } - } else { - g_IsAttach = false; - //LOGE("Get Env Success!"); - return currentThreadEnv; - } -} - -// detach native thread from jvm -void detachThread() { - if (g_IsAttach) { - (*g_JavaVM)->DetachCurrentThread(g_JavaVM); - } -} - -// cmd arg parse -CMD *parse_command_line(const char *commandStr) { - CMD *cmd = (CMD *) malloc(sizeof(CMD)); - if (!cmd) { - return NULL; - } - // copy the source to the heap - char *pTmp = strdup(commandStr); - // new memory size is default 20 for char ** - int size = 20; - cmd->cmd = (char **) malloc(size * sizeof(char **)); - if (!cmd->cmd) { - free(cmd); - return NULL; - } - // parse - char *pStr = strtok(pTmp, " "); - cmd->cmd[0] = pStr; - int count = 1; - for (; pStr != NULL; ++count) { - // Capacity expansion - if (count == (size - 1)) { - size += 20; - cmd->cmd = (char **) realloc(cmd->cmd, size * sizeof(char **)); - } - pStr = strtok(NULL, " "); - if (pStr) { - cmd->cmd[count] = pStr; - } - } - cmd->len = (count - 1); - return cmd; -} - -// cmd arg struct free -void free_command_line(CMD *cmd) { - free(cmd->cmd[0]); - free(cmd->cmd); - free(cmd); -} diff --git a/client/android/jni_tools.h b/client/android/jni_tools.h deleted file mode 100644 index 8e900374f..000000000 --- a/client/android/jni_tools.h +++ /dev/null @@ -1,40 +0,0 @@ -// -// Created by dell on 2017/9/1. -// - -#ifndef DXL_TOOLS_H -#define DXL_TOOLS_H - -#include -#include -#include - -//JNI LOG -#define TAG "PM3" -#define LOGV(...) __android_log_print(ANDROID_LOG_VERBOSE,TAG,__VA_ARGS__) -#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,TAG,__VA_ARGS__) -#define LOGI(...) __android_log_print(ANDROID_LOG_INFO,TAG,__VA_ARGS__) -#define LOGW(...) __android_log_print(ANDROID_LOG_WARN,TAG,__VA_ARGS__) -#define LOGE(...) __android_log_print(ANDROID_LOG_ERROR,TAG,__VA_ARGS__) - -// a global jvm instance -JavaVM *g_JavaVM; - -// get current env for jvm -JNIEnv *getJniEnv(); - -// detach native thread from jvm， must native thread can detach! -void detachThread(); - -typedef struct { - char **cmd; - int len; -} CMD; - -// cmd arg parse -CMD *parse_command_line(const char *commandStr); - -// cmd arg struct free -void free_command_line(CMD *); - -#endif //DXL_TOOLS_H diff --git a/client/android/pm3_main.c b/client/android/pm3_main.c deleted file mode 100644 index 7c78df203..000000000 --- a/client/android/pm3_main.c +++ /dev/null @@ -1,174 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (C) 2009 Michael Gernoth -// Copyright (C) 2010 iZsh -// -// This code is licensed to you under the terms of the GNU GPL, version 2 or, -// at your option, any later version. See the LICENSE.txt file for the text of -// the license. -//----------------------------------------------------------------------------- -// Main binary -//----------------------------------------------------------------------------- - -#include "proxmark3.h" - -#include -#include // for Mingw readline -#include -#include -#include -#include "usart_defs.h" -#include "util_posix.h" -#include "proxgui.h" -#include "cmdmain.h" -#include "ui.h" -#include "cmdhw.h" -#include "whereami.h" -#include "comms.h" -#include "fileutils.h" -#include "commonutil.h" // ARRAYLEN -#include "jni_tools.h" - -//iceman, todo: proxify socker server name. Maybe set in preferences? -// DXL reply, todo: -// Is a good idea, we can move this def to preferences, but not now. -// Because libpm3rrg_rdv4.so cant load preferences. -// I will impl a function to load preferences at future. -#define PM3_LOCAL_SOCKET_SERVER "DXL.COM.ASL" - -static char *g_android_executable_directory = NULL; -static char *g_android_user_directory = NULL; - -char g_version_information[] = {""}; - -const char *get_my_executable_directory(void) { - if (g_android_executable_directory == NULL) { - char buf[FILE_PATH_SIZE] = {0}; - getcwd(buf, sizeof(buf)); - strncat(buf, PATHSEP, 1); - g_android_executable_directory = strdup(buf); - } - return g_android_executable_directory; -} - -const char *get_my_user_directory(void) { - return g_android_user_directory; -} - -void ShowGraphWindow(void) {} - -void HideGraphWindow(void) {} - -void RepaintGraphWindow(void) {} - -void ShowPictureWindow(char *fn) {} - -void HidePictureWindow(void) {} - -void RepaintPictureWindow(void) {} - -int push_cmdscriptfile(char *path, bool stayafter) { return PM3_SUCCESS; } - -static bool OpenPm3(void) { - if (g_conn.run) { return true; } - // Open with LocalSocket. Not a tcp connection! - bool ret = OpenProxmark(session.current_device, "socket:"PM3_LOCAL_SOCKET_SERVER, false, 1000, false, 115200); - return ret; -} - -/* - * Transfers to the command buffer and waits for a new command to be executed - * */ -jint Console(JNIEnv *env, jobject instance, jstring cmd_) { - - if (!g_conn.run) { - if (OpenPm3() && TestProxmark(session.current_device) == PM3_SUCCESS) { - LOGD("Connected to device"); - PrintAndLogEx(SUCCESS, "Connected to device"); - } else { - LOGD("Failed to connect to device"); - PrintAndLogEx(ERR, "Failed to connect to device"); - CloseProxmark(session.current_device); - } - } - - PrintAndLogEx(NORMAL, ""); - - char *cmd = (char *)((*env)->GetStringUTFChars(env, cmd_, 0)); - int ret = CommandReceived(cmd); - if (ret == 99) { - // exit / quit - // TODO: implement this - PrintAndLogEx(NORMAL, "Asked to exit, can't really do that yet..."); - } - - (*env)->ReleaseStringUTFChars(env, cmd_, cmd); - return ret; -} - -/* - * Is client running! - * */ -jboolean IsClientRunning(JNIEnv *env, jobject instance) { - return (jboolean)((jboolean) g_conn.run); -} - -/* - * test hw and fw and client. - * */ -jboolean TestPm3(JNIEnv *env, jobject instance) { - if (open() == false) { - CloseProxmark(session.current_device); - return false; - } - bool ret = (TestProxmark(session.current_device) == PM3_SUCCESS); - return (jboolean)(ret); -} - -/* - * stop pm3 client - * */ -void ClosePm3(JNIEnv *env, jobject instance) { - CloseProxmark(session.current_device); -} - -/* - * native function map to jvm - * */ - -//iceman: todo, pm3:ify java class root. Return codes, should match PM3_E* codes. -JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *reserved) { - JNIEnv *jniEnv = NULL; - if ((*vm)->GetEnv(vm, (void **) &jniEnv, JNI_VERSION_1_4) != JNI_OK) { - return -1; - } - (*jniEnv)->GetJavaVM(jniEnv, &g_JavaVM); - jclass clazz = (*jniEnv)->FindClass(jniEnv, "cn/rrg/natives/Proxmark3RRGRdv4Tools"); - if (clazz == NULL) { - return -1; - } - jclass clz_test = (*jniEnv)->FindClass(jniEnv, "cn/rrg/devices/Proxmark3RRGRdv4"); - JNINativeMethod methods[] = { - {"startExecute", "(Ljava/lang/String;)I", (void *) Console}, - {"stopExecute", "()V", (void *) ClosePm3}, - {"isExecuting", "()Z", (void *) IsClientRunning} - }; - - JNINativeMethod methods1[] = { - {"testPm3", "()Z", (void *) TestPm3}, - {"closePm3", "()V", ClosePm3} - }; - - if ((*jniEnv)->RegisterNatives(jniEnv, clazz, methods, ARRAYLEN(methods)) != - JNI_OK) { - return -1; - } - - if ((*jniEnv)->RegisterNatives(jniEnv, clz_test, methods1, - ARRAYLEN(methods1)) != JNI_OK) { - return -1; - } - - (*jniEnv)->DeleteLocalRef(jniEnv, clazz); - (*jniEnv)->DeleteLocalRef(jniEnv, clz_test); - return JNI_VERSION_1_4; -}