From 3d61cf1eedd237645d0cb4b498306d3e6663d088 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Thu, 6 Jan 2022 20:08:09 +0100 Subject: [PATCH 1/5] release checklist --- .github/ISSUE_TEMPLATE/checklist-for-release.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/ISSUE_TEMPLATE/checklist-for-release.md b/.github/ISSUE_TEMPLATE/checklist-for-release.md index 4825270d5..e75aa2d22 100644 --- a/.github/ISSUE_TEMPLATE/checklist-for-release.md +++ b/.github/ISSUE_TEMPLATE/checklist-for-release.md @@ -18,6 +18,7 @@ assignees: doegox, iceman1001 - [ ] `tools/build_all_firmwares.sh` check that the script contains all standalone modes then compile all standalone modes (linux only) - [ ] `experimental_lib` compilation & tests - [ ] `experimental_client_with_swig` compilation & tests +- [ ] Check Android `CMakeLists.txt` list of source file - [ ] GitHub Actions - green across the board ( MacOS, Ubuntu, Windows) # OS compilation and tests From e618fbcd2894bcae62626eb4589aa7c5faf64078 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Thu, 6 Jan 2022 20:14:58 +0100 Subject: [PATCH 2/5] typo --- common/cardhelper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/cardhelper.c b/common/cardhelper.c index e337010e6..7d312e869 100644 --- a/common/cardhelper.c +++ b/common/cardhelper.c @@ -17,7 +17,7 @@ #define CARD_INS_DECRYPT 0x01 #define CARD_INS_ENCRYPT 0x02 -#define CARD_INS_VEIRFY_RRG 0x05 +#define CARD_INS_VERIFY_RRG 0x05 #define CARD_INS_DECODE 0x06 #define CARD_INS_NUMBLOCKS 0x07 #define CARD_INS_PINSIZE 0x08 @@ -177,7 +177,7 @@ int VerifyRdv4Signature(uint8_t *memid, uint8_t *signature) { int resp_len = 0; uint8_t resp[254] = {0}; - uint8_t c[5 + 8 + 128] = {0x96, CARD_INS_VEIRFY_RRG, 0x00, 0x00, 8 + 128}; + uint8_t c[5 + 8 + 128] = {0x96, CARD_INS_VERIFY_RRG, 0x00, 0x00, 8 + 128}; memcpy(c + 5, memid, 8); memcpy(c + 5 + 8, signature, 128); From 3edf9a0975d136f0866aa349ad03c2d3f7ced845 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Wed, 4 Nov 2020 01:25:44 +0100 Subject: [PATCH 3/5] get android cmake running on host, only for testing --- client/android/CMakeLists.txt | 34 +++------------------------------- 1 file changed, 3 insertions(+), 31 deletions(-) diff --git a/client/android/CMakeLists.txt b/client/android/CMakeLists.txt index b66fe4e24..b1e421295 100644 --- a/client/android/CMakeLists.txt +++ b/client/android/CMakeLists.txt @@ -9,32 +9,7 @@ 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 () +find_package (BZip2 REQUIRED) # client resources add_library(pm3rrg_rdv4 SHARED @@ -200,9 +175,7 @@ add_library(pm3rrg_rdv4 SHARED ${PM3_ROOT}/client/src/wiegand_formats.c ${PM3_ROOT}/client/src/wiegand_formatutils.c ${CMAKE_BINARY_DIR}/version_pm3.c - # android resources - jni_tools.c - pm3_main.c + ${PM3_ROOT}/client/src/proxmark3.c ) # includes @@ -227,5 +200,4 @@ target_link_libraries(pm3rrg_rdv4 pm3rrg_rdv4_amiibo pm3rrg_rdv4_reveng pm3rrg_rdv4_whereami - android - log) + ) From ac681a5836a1182edee669d39eafa1b03d657cd9 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Thu, 6 Jan 2022 20:24:18 +0100 Subject: [PATCH 4/5] fix Android CMake --- client/android/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/android/CMakeLists.txt b/client/android/CMakeLists.txt index b1e421295..72c68ab66 100644 --- a/client/android/CMakeLists.txt +++ b/client/android/CMakeLists.txt @@ -1,6 +1,7 @@ # 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") @@ -174,7 +175,6 @@ add_library(pm3rrg_rdv4 SHARED ${PM3_ROOT}/client/src/util.c ${PM3_ROOT}/client/src/wiegand_formats.c ${PM3_ROOT}/client/src/wiegand_formatutils.c - ${CMAKE_BINARY_DIR}/version_pm3.c ${PM3_ROOT}/client/src/proxmark3.c ) From 2562811433df46708828de457ae0e992beb52afa Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Thu, 6 Jan 2022 20:26:20 +0100 Subject: [PATCH 5/5] Revert "get android cmake running on host, only for testing" This reverts commit 3edf9a0975d136f0866aa349ad03c2d3f7ced845. --- client/android/CMakeLists.txt | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/client/android/CMakeLists.txt b/client/android/CMakeLists.txt index 72c68ab66..9bf318d09 100644 --- a/client/android/CMakeLists.txt +++ b/client/android/CMakeLists.txt @@ -10,7 +10,32 @@ set(PM3_ROOT ../../) add_subdirectory(../deps deps) -find_package (BZip2 REQUIRED) +# 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 @@ -175,7 +200,9 @@ add_library(pm3rrg_rdv4 SHARED ${PM3_ROOT}/client/src/util.c ${PM3_ROOT}/client/src/wiegand_formats.c ${PM3_ROOT}/client/src/wiegand_formatutils.c - ${PM3_ROOT}/client/src/proxmark3.c + # android resources + jni_tools.c + pm3_main.c ) # includes @@ -200,4 +227,5 @@ target_link_libraries(pm3rrg_rdv4 pm3rrg_rdv4_amiibo pm3rrg_rdv4_reveng pm3rrg_rdv4_whereami - ) + android + log)