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 diff --git a/client/android/CMakeLists.txt b/client/android/CMakeLists.txt index b66fe4e24..9bf318d09 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") @@ -199,7 +200,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 # android resources jni_tools.c pm3_main.c 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);