Revert "Release v4.23346 - Frosty Lemon"
This reverts commit dc0110c29d.
This commit is contained in:
21 files changed
+56
-41
No files matched your search
+2
-2
@@ -130,8 +130,8 @@ ifeq ($(DEBUG),1)
|
|||||||
DEFCFLAGS = -ggdb3 -O0 -fstrict-aliasing -pipe
|
DEFCFLAGS = -ggdb3 -O0 -fstrict-aliasing -pipe
|
||||||
DEFLDFLAGS =
|
DEFLDFLAGS =
|
||||||
else
|
else
|
||||||
DEFCXXFLAGS = -Wall -O3 -pipe
|
DEFCXXFLAGS = -Wall -Werror -O3 -pipe
|
||||||
DEFCFLAGS = -Wall -O3 -fstrict-aliasing -pipe
|
DEFCFLAGS = -Wall -Werror -O3 -fstrict-aliasing -pipe
|
||||||
DEFLDFLAGS =
|
DEFLDFLAGS =
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -283,7 +283,7 @@ showinfo:
|
|||||||
# version_pm3.c should be checked on every time fullimage.stage1.elf should be remade
|
# version_pm3.c should be checked on every time fullimage.stage1.elf should be remade
|
||||||
version_pm3.c: default_version_pm3.c $(OBJDIR)/fpga_version_info.o $(FPGA_ALL_O_DEP) $(THUMBOBJ) $(ARMOBJ) $(ASMOBJ) .FORCE
|
version_pm3.c: default_version_pm3.c $(OBJDIR)/fpga_version_info.o $(FPGA_ALL_O_DEP) $(THUMBOBJ) $(ARMOBJ) $(ASMOBJ) .FORCE
|
||||||
$(info [-] CHECK $@)
|
$(info [-] CHECK $@)
|
||||||
$(Q)$(CP) $< $@
|
$(Q)$(SH) ../tools/mkversion.sh $@ || $(CP) $< $@
|
||||||
|
|
||||||
fpga_version_info.c: $(FPGA_BITSTREAMS) $(FPGA_COMPRESSOR)
|
fpga_version_info.c: $(FPGA_BITSTREAMS) $(FPGA_COMPRESSOR)
|
||||||
$(info [-] GEN $@)
|
$(info [-] GEN $@)
|
||||||
|
|||||||
+1
-1
@@ -82,7 +82,7 @@ OBJS = $(OBJDIR)/bootrom.s19
|
|||||||
# version_pm3.c should be checked on every compilation
|
# version_pm3.c should be checked on every compilation
|
||||||
version_pm3.c: default_version_pm3.c .FORCE
|
version_pm3.c: default_version_pm3.c .FORCE
|
||||||
$(info [=] CHECK $@)
|
$(info [=] CHECK $@)
|
||||||
$(Q)$(CP) $< $@
|
$(Q)$(SH) ../tools/mkversion.sh $@ || $(CP) $< $@
|
||||||
|
|
||||||
all: showinfo $(OBJS)
|
all: showinfo $(OBJS)
|
||||||
|
|
||||||
|
|||||||
@@ -295,7 +295,7 @@ endif (NOT SKIPWHEREAMISYSTEM EQUAL 1)
|
|||||||
# These must be set BEFORE add_subdirectory(deps): CMake copies the
|
# These must be set BEFORE add_subdirectory(deps): CMake copies the
|
||||||
# current variable scope into a subdirectory at that point, so flags set
|
# current variable scope into a subdirectory at that point, so flags set
|
||||||
# further down never reach the bundled deps and jansson fails the
|
# further down never reach the bundled deps and jansson fails the
|
||||||
#=stringop-overflow false positive on its own.
|
# -Werror=stringop-overflow false positive on its own.
|
||||||
# GCC 10 has issues with false positives on stringop-overflow,
|
# GCC 10 has issues with false positives on stringop-overflow,
|
||||||
# let's disable them for now (cf https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92955, https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94335)
|
# let's disable them for now (cf https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92955, https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94335)
|
||||||
# beware these flags didn't exist for GCC < 7
|
# beware these flags didn't exist for GCC < 7
|
||||||
@@ -552,7 +552,7 @@ endif()
|
|||||||
|
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
OUTPUT ${CMAKE_BINARY_DIR}/version_pm3.c
|
OUTPUT ${CMAKE_BINARY_DIR}/version_pm3.c
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy ${PM3_ROOT}/common/default_version_pm3.c ${CMAKE_BINARY_DIR}/version_pm3.c
|
COMMAND sh ${PM3_ROOT}/tools/mkversion.sh ${CMAKE_BINARY_DIR}/version_pm3.c || ${CMAKE_COMMAND} -E copy ${PM3_ROOT}/common/default_version_pm3.c ${CMAKE_BINARY_DIR}/version_pm3.c
|
||||||
DEPENDS ${PM3_ROOT}/common/default_version_pm3.c
|
DEPENDS ${PM3_ROOT}/common/default_version_pm3.c
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -883,7 +883,7 @@ if ((NOT SKIPQT EQUAL 1) AND Qt6_FOUND)
|
|||||||
target_include_directories(proxmark3 PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
|
target_include_directories(proxmark3 PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
target_compile_options(proxmark3 PUBLIC -Wall -Wno-missing-braces -O3)
|
target_compile_options(proxmark3 PUBLIC -Wall -Werror -Wno-missing-braces -O3)
|
||||||
if (EMBED_READLINE)
|
if (EMBED_READLINE)
|
||||||
if (NOT SKIPREADLINE EQUAL 1)
|
if (NOT SKIPREADLINE EQUAL 1)
|
||||||
add_dependencies(proxmark3 ncurses readline)
|
add_dependencies(proxmark3 ncurses readline)
|
||||||
|
|||||||
+1
-1
@@ -1195,7 +1195,7 @@ src/pm3_pywrap.c: pm3.i
|
|||||||
# version_pm3.c should be checked on every compilation
|
# version_pm3.c should be checked on every compilation
|
||||||
src/version_pm3.c: default_version_pm3.c .FORCE
|
src/version_pm3.c: default_version_pm3.c .FORCE
|
||||||
$(info [=] CHECK $@)
|
$(info [=] CHECK $@)
|
||||||
$(Q)$(CP) $< $@
|
$(Q)$(SH) ../tools/mkversion.sh $@ || $(CP) $< $@
|
||||||
|
|
||||||
# easy printing of MAKE VARIABLES
|
# easy printing of MAKE VARIABLES
|
||||||
print-%: ; @echo $* = $($*)
|
print-%: ; @echo $* = $($*)
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ target_link_libraries(pm3rrg_rdv4_amiibo PRIVATE
|
|||||||
m
|
m
|
||||||
pm3rrg_rdv4_mbedtls)
|
pm3rrg_rdv4_mbedtls)
|
||||||
|
|
||||||
target_compile_options(pm3rrg_rdv4_amiibo PRIVATE -Wall -Wno-missing-braces -O3)
|
target_compile_options(pm3rrg_rdv4_amiibo PRIVATE -Wall -Werror -Wno-missing-braces -O3)
|
||||||
set_property(TARGET pm3rrg_rdv4_amiibo PROPERTY POSITION_INDEPENDENT_CODE ON)
|
set_property(TARGET pm3rrg_rdv4_amiibo PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||||
|
|
||||||
target_include_directories(pm3rrg_rdv4_amiibo PRIVATE amiitool
|
target_include_directories(pm3rrg_rdv4_amiibo PRIVATE amiitool
|
||||||
|
|||||||
@@ -9,5 +9,5 @@ target_include_directories(pm3rrg_rdv4_cliparser PRIVATE
|
|||||||
../../include
|
../../include
|
||||||
../src)
|
../src)
|
||||||
target_include_directories(pm3rrg_rdv4_cliparser INTERFACE cliparser)
|
target_include_directories(pm3rrg_rdv4_cliparser INTERFACE cliparser)
|
||||||
target_compile_options(pm3rrg_rdv4_cliparser PRIVATE -Wall -O3)
|
target_compile_options(pm3rrg_rdv4_cliparser PRIVATE -Wall -Werror -O3)
|
||||||
set_property(TARGET pm3rrg_rdv4_cliparser PROPERTY POSITION_INDEPENDENT_CODE ON)
|
set_property(TARGET pm3rrg_rdv4_cliparser PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||||
@@ -2,7 +2,7 @@ add_library(pm3rrg_rdv4_hardnested_nosimd OBJECT
|
|||||||
hardnested/hardnested_bf_core.c
|
hardnested/hardnested_bf_core.c
|
||||||
hardnested/hardnested_bitarray_core.c)
|
hardnested/hardnested_bitarray_core.c)
|
||||||
|
|
||||||
target_compile_options(pm3rrg_rdv4_hardnested_nosimd PRIVATE -Wall -O3)
|
target_compile_options(pm3rrg_rdv4_hardnested_nosimd PRIVATE -Wall -Werror -O3)
|
||||||
set_property(TARGET pm3rrg_rdv4_hardnested_nosimd PROPERTY POSITION_INDEPENDENT_CODE ON)
|
set_property(TARGET pm3rrg_rdv4_hardnested_nosimd PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||||
|
|
||||||
target_include_directories(pm3rrg_rdv4_hardnested_nosimd PRIVATE
|
target_include_directories(pm3rrg_rdv4_hardnested_nosimd PRIVATE
|
||||||
@@ -32,7 +32,7 @@ if ("${CMAKE_SYSTEM_PROCESSOR}" IN_LIST X86_CPUS)
|
|||||||
hardnested/hardnested_bf_core.c
|
hardnested/hardnested_bf_core.c
|
||||||
hardnested/hardnested_bitarray_core.c)
|
hardnested/hardnested_bitarray_core.c)
|
||||||
|
|
||||||
target_compile_options(pm3rrg_rdv4_hardnested_mmx PRIVATE -Wall -O3)
|
target_compile_options(pm3rrg_rdv4_hardnested_mmx PRIVATE -Wall -Werror -O3)
|
||||||
target_compile_options(pm3rrg_rdv4_hardnested_mmx BEFORE PRIVATE
|
target_compile_options(pm3rrg_rdv4_hardnested_mmx BEFORE PRIVATE
|
||||||
-mmmx -mno-sse2 -mno-avx -mno-avx2 -mno-avx512f)
|
-mmmx -mno-sse2 -mno-avx -mno-avx2 -mno-avx512f)
|
||||||
set_property(TARGET pm3rrg_rdv4_hardnested_mmx PROPERTY POSITION_INDEPENDENT_CODE ON)
|
set_property(TARGET pm3rrg_rdv4_hardnested_mmx PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||||
@@ -47,7 +47,7 @@ if ("${CMAKE_SYSTEM_PROCESSOR}" IN_LIST X86_CPUS)
|
|||||||
hardnested/hardnested_bf_core.c
|
hardnested/hardnested_bf_core.c
|
||||||
hardnested/hardnested_bitarray_core.c)
|
hardnested/hardnested_bitarray_core.c)
|
||||||
|
|
||||||
target_compile_options(pm3rrg_rdv4_hardnested_sse2 PRIVATE -Wall -O3)
|
target_compile_options(pm3rrg_rdv4_hardnested_sse2 PRIVATE -Wall -Werror -O3)
|
||||||
target_compile_options(pm3rrg_rdv4_hardnested_sse2 BEFORE PRIVATE
|
target_compile_options(pm3rrg_rdv4_hardnested_sse2 BEFORE PRIVATE
|
||||||
-mmmx -msse2 -mno-avx -mno-avx2 -mno-avx512f)
|
-mmmx -msse2 -mno-avx -mno-avx2 -mno-avx512f)
|
||||||
set_property(TARGET pm3rrg_rdv4_hardnested_sse2 PROPERTY POSITION_INDEPENDENT_CODE ON)
|
set_property(TARGET pm3rrg_rdv4_hardnested_sse2 PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||||
@@ -62,7 +62,7 @@ if ("${CMAKE_SYSTEM_PROCESSOR}" IN_LIST X86_CPUS)
|
|||||||
hardnested/hardnested_bf_core.c
|
hardnested/hardnested_bf_core.c
|
||||||
hardnested/hardnested_bitarray_core.c)
|
hardnested/hardnested_bitarray_core.c)
|
||||||
|
|
||||||
target_compile_options(pm3rrg_rdv4_hardnested_avx PRIVATE -Wall -O3)
|
target_compile_options(pm3rrg_rdv4_hardnested_avx PRIVATE -Wall -Werror -O3)
|
||||||
target_compile_options(pm3rrg_rdv4_hardnested_avx BEFORE PRIVATE
|
target_compile_options(pm3rrg_rdv4_hardnested_avx BEFORE PRIVATE
|
||||||
-mmmx -msse2 -mavx -mno-avx2 -mno-avx512f)
|
-mmmx -msse2 -mavx -mno-avx2 -mno-avx512f)
|
||||||
set_property(TARGET pm3rrg_rdv4_hardnested_avx PROPERTY POSITION_INDEPENDENT_CODE ON)
|
set_property(TARGET pm3rrg_rdv4_hardnested_avx PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||||
@@ -77,7 +77,7 @@ if ("${CMAKE_SYSTEM_PROCESSOR}" IN_LIST X86_CPUS)
|
|||||||
hardnested/hardnested_bf_core.c
|
hardnested/hardnested_bf_core.c
|
||||||
hardnested/hardnested_bitarray_core.c)
|
hardnested/hardnested_bitarray_core.c)
|
||||||
|
|
||||||
target_compile_options(pm3rrg_rdv4_hardnested_avx2 PRIVATE -Wall -O3)
|
target_compile_options(pm3rrg_rdv4_hardnested_avx2 PRIVATE -Wall -Werror -O3)
|
||||||
target_compile_options(pm3rrg_rdv4_hardnested_avx2 BEFORE PRIVATE
|
target_compile_options(pm3rrg_rdv4_hardnested_avx2 BEFORE PRIVATE
|
||||||
-mmmx -msse2 -mavx -mavx2 -mno-avx512f)
|
-mmmx -msse2 -mavx -mavx2 -mno-avx512f)
|
||||||
set_property(TARGET pm3rrg_rdv4_hardnested_avx2 PROPERTY POSITION_INDEPENDENT_CODE ON)
|
set_property(TARGET pm3rrg_rdv4_hardnested_avx2 PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||||
@@ -92,7 +92,7 @@ if ("${CMAKE_SYSTEM_PROCESSOR}" IN_LIST X86_CPUS)
|
|||||||
hardnested/hardnested_bf_core.c
|
hardnested/hardnested_bf_core.c
|
||||||
hardnested/hardnested_bitarray_core.c)
|
hardnested/hardnested_bitarray_core.c)
|
||||||
|
|
||||||
target_compile_options(pm3rrg_rdv4_hardnested_avx512 PRIVATE -Wall -O3)
|
target_compile_options(pm3rrg_rdv4_hardnested_avx512 PRIVATE -Wall -Werror -O3)
|
||||||
target_compile_options(pm3rrg_rdv4_hardnested_avx512 BEFORE PRIVATE
|
target_compile_options(pm3rrg_rdv4_hardnested_avx512 BEFORE PRIVATE
|
||||||
-mmmx -msse2 -mavx -mavx2 -mavx512f)
|
-mmmx -msse2 -mavx -mavx2 -mavx512f)
|
||||||
set_property(TARGET pm3rrg_rdv4_hardnested_avx512 PROPERTY POSITION_INDEPENDENT_CODE ON)
|
set_property(TARGET pm3rrg_rdv4_hardnested_avx512 PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||||
@@ -116,7 +116,7 @@ elseif ("${CMAKE_SYSTEM_PROCESSOR}" IN_LIST ARM64_CPUS)
|
|||||||
hardnested/hardnested_bf_core.c
|
hardnested/hardnested_bf_core.c
|
||||||
hardnested/hardnested_bitarray_core.c)
|
hardnested/hardnested_bitarray_core.c)
|
||||||
|
|
||||||
target_compile_options(pm3rrg_rdv4_hardnested_neon PRIVATE -Wall -O3)
|
target_compile_options(pm3rrg_rdv4_hardnested_neon PRIVATE -Wall -Werror -O3)
|
||||||
set_property(TARGET pm3rrg_rdv4_hardnested_neon PROPERTY POSITION_INDEPENDENT_CODE ON)
|
set_property(TARGET pm3rrg_rdv4_hardnested_neon PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||||
|
|
||||||
target_include_directories(pm3rrg_rdv4_hardnested_neon PRIVATE
|
target_include_directories(pm3rrg_rdv4_hardnested_neon PRIVATE
|
||||||
@@ -134,7 +134,7 @@ elseif ("${CMAKE_SYSTEM_PROCESSOR}" IN_LIST ARM32_CPUS)
|
|||||||
hardnested/hardnested_bf_core.c
|
hardnested/hardnested_bf_core.c
|
||||||
hardnested/hardnested_bitarray_core.c)
|
hardnested/hardnested_bitarray_core.c)
|
||||||
|
|
||||||
target_compile_options(pm3rrg_rdv4_hardnested_neon PRIVATE -Wall -O3)
|
target_compile_options(pm3rrg_rdv4_hardnested_neon PRIVATE -Wall -Werror -O3)
|
||||||
target_compile_options(pm3rrg_rdv4_hardnested_neon BEFORE PRIVATE
|
target_compile_options(pm3rrg_rdv4_hardnested_neon BEFORE PRIVATE
|
||||||
-mfpu=neon)
|
-mfpu=neon)
|
||||||
set_property(TARGET pm3rrg_rdv4_hardnested_neon PROPERTY POSITION_INDEPENDENT_CODE ON)
|
set_property(TARGET pm3rrg_rdv4_hardnested_neon PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||||
@@ -155,7 +155,7 @@ add_library(pm3rrg_rdv4_hardnested STATIC
|
|||||||
hardnested/hardnested_bruteforce.c
|
hardnested/hardnested_bruteforce.c
|
||||||
$<TARGET_OBJECTS:pm3rrg_rdv4_hardnested_nosimd>
|
$<TARGET_OBJECTS:pm3rrg_rdv4_hardnested_nosimd>
|
||||||
${SIMD_TARGETS})
|
${SIMD_TARGETS})
|
||||||
target_compile_options(pm3rrg_rdv4_hardnested PRIVATE -Wall -O3)
|
target_compile_options(pm3rrg_rdv4_hardnested PRIVATE -Wall -Werror -O3)
|
||||||
set_property(TARGET pm3rrg_rdv4_hardnested PROPERTY POSITION_INDEPENDENT_CODE ON)
|
set_property(TARGET pm3rrg_rdv4_hardnested PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||||
target_include_directories(pm3rrg_rdv4_hardnested PRIVATE
|
target_include_directories(pm3rrg_rdv4_hardnested PRIVATE
|
||||||
../../common
|
../../common
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
# Proxmark3-specific Makefile for ID48LIB library
|
# Proxmark3-specific Makefile for ID48LIB library
|
||||||
MYSRCPATHS =
|
MYSRCPATHS =
|
||||||
MYINCLUDES = -I../public
|
MYINCLUDES = -I../public
|
||||||
MYCFLAGS = -Wpedantic -Wall -O3 -Wno-unknown-pragmas -Wno-inline -Wno-unused-function
|
MYCFLAGS = -Wpedantic -Wall -Werror -O3 -Wno-unknown-pragmas -Wno-inline -Wno-unused-function
|
||||||
MYDEFS = -DID48_NO_STDIO
|
MYDEFS = -DID48_NO_STDIO
|
||||||
MYSRCS = \
|
MYSRCS = \
|
||||||
id48_data.c \
|
id48_data.c \
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ add_library(pm3rrg_rdv4_id48 STATIC
|
|||||||
id48/src/id48_generator.c
|
id48/src/id48_generator.c
|
||||||
id48/src/id48_recover.c
|
id48/src/id48_recover.c
|
||||||
)
|
)
|
||||||
target_compile_options( pm3rrg_rdv4_id48 PRIVATE -Wpedantic -Wall -O3 -Wno-unknown-pragmas -Wno-inline -Wno-unused-function -Wno-missing-braces -DID48_NO_STDIO)
|
target_compile_options( pm3rrg_rdv4_id48 PRIVATE -Wpedantic -Wall -Werror -O3 -Wno-unknown-pragmas -Wno-inline -Wno-unused-function -Wno-missing-braces -DID48_NO_STDIO)
|
||||||
target_include_directories(pm3rrg_rdv4_id48 PRIVATE id48/public)
|
target_include_directories(pm3rrg_rdv4_id48 PRIVATE id48/public)
|
||||||
target_include_directories(pm3rrg_rdv4_id48 INTERFACE id48/public)
|
target_include_directories(pm3rrg_rdv4_id48 INTERFACE id48/public)
|
||||||
set_property(TARGET pm3rrg_rdv4_id48 PROPERTY POSITION_INDEPENDENT_CODE ON)
|
set_property(TARGET pm3rrg_rdv4_id48 PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||||
@@ -14,5 +14,5 @@ add_library(pm3rrg_rdv4_jansson STATIC
|
|||||||
|
|
||||||
target_compile_definitions(pm3rrg_rdv4_jansson PRIVATE HAVE_STDINT_H)
|
target_compile_definitions(pm3rrg_rdv4_jansson PRIVATE HAVE_STDINT_H)
|
||||||
target_include_directories(pm3rrg_rdv4_jansson INTERFACE jansson)
|
target_include_directories(pm3rrg_rdv4_jansson INTERFACE jansson)
|
||||||
target_compile_options(pm3rrg_rdv4_jansson PRIVATE -Wall -Wno-unused-function -O3)
|
target_compile_options(pm3rrg_rdv4_jansson PRIVATE -Wall -Werror -Wno-unused-function -O3)
|
||||||
set_property(TARGET pm3rrg_rdv4_jansson PROPERTY POSITION_INDEPENDENT_CODE ON)
|
set_property(TARGET pm3rrg_rdv4_jansson PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||||
@@ -52,5 +52,5 @@ if (NOT MINGW)
|
|||||||
endif (NOT MINGW)
|
endif (NOT MINGW)
|
||||||
|
|
||||||
target_include_directories(pm3rrg_rdv4_lua INTERFACE liblua)
|
target_include_directories(pm3rrg_rdv4_lua INTERFACE liblua)
|
||||||
target_compile_options(pm3rrg_rdv4_lua PRIVATE -Wall -Wno-missing-braces -Wno-deprecated-declarations -O3)
|
target_compile_options(pm3rrg_rdv4_lua PRIVATE -Wall -Werror -Wno-missing-braces -Wno-deprecated-declarations -O3)
|
||||||
set_property(TARGET pm3rrg_rdv4_lua PROPERTY POSITION_INDEPENDENT_CODE ON)
|
set_property(TARGET pm3rrg_rdv4_lua PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||||
@@ -49,5 +49,5 @@ add_library(pm3rrg_rdv4_mbedtls STATIC
|
|||||||
|
|
||||||
target_include_directories(pm3rrg_rdv4_mbedtls PRIVATE ../../common)
|
target_include_directories(pm3rrg_rdv4_mbedtls PRIVATE ../../common)
|
||||||
target_include_directories(pm3rrg_rdv4_mbedtls INTERFACE ../../common/mbedtls)
|
target_include_directories(pm3rrg_rdv4_mbedtls INTERFACE ../../common/mbedtls)
|
||||||
target_compile_options(pm3rrg_rdv4_mbedtls PRIVATE -Wall -O3)
|
target_compile_options(pm3rrg_rdv4_mbedtls PRIVATE -Wall -Werror -O3)
|
||||||
set_property(TARGET pm3rrg_rdv4_mbedtls PROPERTY POSITION_INDEPENDENT_CODE ON)
|
set_property(TARGET pm3rrg_rdv4_mbedtls PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||||
@@ -5,5 +5,5 @@ add_library(pm3rrg_rdv4_mqtt STATIC
|
|||||||
|
|
||||||
target_compile_definitions(pm3rrg_rdv4_mqtt PRIVATE WAI_PM3_TUNED)
|
target_compile_definitions(pm3rrg_rdv4_mqtt PRIVATE WAI_PM3_TUNED)
|
||||||
target_include_directories(pm3rrg_rdv4_mqtt INTERFACE mqtt)
|
target_include_directories(pm3rrg_rdv4_mqtt INTERFACE mqtt)
|
||||||
target_compile_options(pm3rrg_rdv4_mqtt PRIVATE -Wall -O3)
|
target_compile_options(pm3rrg_rdv4_mqtt PRIVATE -Wall -Werror -O3)
|
||||||
set_property(TARGET pm3rrg_rdv4_mqtt PROPERTY POSITION_INDEPENDENT_CODE ON)
|
set_property(TARGET pm3rrg_rdv4_mqtt PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||||
@@ -13,5 +13,5 @@ target_include_directories(pm3rrg_rdv4_reveng PRIVATE
|
|||||||
../src
|
../src
|
||||||
../../include)
|
../../include)
|
||||||
target_include_directories(pm3rrg_rdv4_reveng INTERFACE reveng)
|
target_include_directories(pm3rrg_rdv4_reveng INTERFACE reveng)
|
||||||
target_compile_options(pm3rrg_rdv4_reveng PRIVATE -Wall -O3)
|
target_compile_options(pm3rrg_rdv4_reveng PRIVATE -Wall -Werror -O3)
|
||||||
set_property(TARGET pm3rrg_rdv4_reveng PROPERTY POSITION_INDEPENDENT_CODE ON)
|
set_property(TARGET pm3rrg_rdv4_reveng PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||||
@@ -11,5 +11,5 @@ add_library(pm3rrg_rdv4_tinycbor STATIC
|
|||||||
|
|
||||||
target_include_directories(pm3rrg_rdv4_tinycbor INTERFACE tinycbor)
|
target_include_directories(pm3rrg_rdv4_tinycbor INTERFACE tinycbor)
|
||||||
# Strange errors on Mingw when compiling with -O3
|
# Strange errors on Mingw when compiling with -O3
|
||||||
target_compile_options(pm3rrg_rdv4_tinycbor PRIVATE -Wall -O2)
|
target_compile_options(pm3rrg_rdv4_tinycbor PRIVATE -Wall -Werror -O2)
|
||||||
set_property(TARGET pm3rrg_rdv4_tinycbor PROPERTY POSITION_INDEPENDENT_CODE ON)
|
set_property(TARGET pm3rrg_rdv4_tinycbor PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||||
@@ -2,5 +2,5 @@ add_library(pm3rrg_rdv4_whereami STATIC whereami/whereami.c)
|
|||||||
|
|
||||||
target_compile_definitions(pm3rrg_rdv4_whereami PRIVATE WAI_PM3_TUNED)
|
target_compile_definitions(pm3rrg_rdv4_whereami PRIVATE WAI_PM3_TUNED)
|
||||||
target_include_directories(pm3rrg_rdv4_whereami INTERFACE whereami)
|
target_include_directories(pm3rrg_rdv4_whereami INTERFACE whereami)
|
||||||
target_compile_options(pm3rrg_rdv4_whereami PRIVATE -Wall -O3)
|
target_compile_options(pm3rrg_rdv4_whereami PRIVATE -Wall -Werror -O3)
|
||||||
set_property(TARGET pm3rrg_rdv4_whereami PROPERTY POSITION_INDEPENDENT_CODE ON)
|
set_property(TARGET pm3rrg_rdv4_whereami PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||||
@@ -222,7 +222,7 @@ endif (NOT SKIPWHEREAMISYSTEM EQUAL 1)
|
|||||||
# These must be set BEFORE add_subdirectory(deps): CMake copies the
|
# These must be set BEFORE add_subdirectory(deps): CMake copies the
|
||||||
# current variable scope into a subdirectory at that point, so flags set
|
# current variable scope into a subdirectory at that point, so flags set
|
||||||
# further down never reach the bundled deps and jansson fails the
|
# further down never reach the bundled deps and jansson fails the
|
||||||
#=stringop-overflow false positive on its own.
|
# -Werror=stringop-overflow false positive on its own.
|
||||||
# GCC 10 has issues with false positives on stringop-overflow,
|
# GCC 10 has issues with false positives on stringop-overflow,
|
||||||
# let's disable them for now (cf https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92955, https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94335)
|
# let's disable them for now (cf https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92955, https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94335)
|
||||||
# beware these flags didn't exist for GCC < 7
|
# beware these flags didn't exist for GCC < 7
|
||||||
@@ -462,7 +462,7 @@ set (TARGET_SOURCES
|
|||||||
|
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
OUTPUT ${CMAKE_BINARY_DIR}/version_pm3.c
|
OUTPUT ${CMAKE_BINARY_DIR}/version_pm3.c
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy ${PM3_ROOT}/common/default_version_pm3.c ${CMAKE_BINARY_DIR}/version_pm3.c
|
COMMAND sh ${PM3_ROOT}/tools/mkversion.sh ${CMAKE_BINARY_DIR}/version_pm3.c || ${CMAKE_COMMAND} -E copy ${PM3_ROOT}/common/default_version_pm3.c ${CMAKE_BINARY_DIR}/version_pm3.c
|
||||||
DEPENDS ${PM3_ROOT}/common/default_version_pm3.c
|
DEPENDS ${PM3_ROOT}/common/default_version_pm3.c
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -717,7 +717,7 @@ add_library(pm3rrg_rdv4_static STATIC
|
|||||||
set(PM3_LIBRARY_TARGETS pm3rrg_rdv4 pm3rrg_rdv4_static)
|
set(PM3_LIBRARY_TARGETS pm3rrg_rdv4 pm3rrg_rdv4_static)
|
||||||
foreach (target IN LISTS PM3_LIBRARY_TARGETS)
|
foreach (target IN LISTS PM3_LIBRARY_TARGETS)
|
||||||
target_compile_definitions(${target} PRIVATE LIBPM3)
|
target_compile_definitions(${target} PRIVATE LIBPM3)
|
||||||
target_compile_options(${target} PUBLIC -Wall -O3)
|
target_compile_options(${target} PUBLIC -Wall -Werror -O3)
|
||||||
target_include_directories(${target} PRIVATE
|
target_include_directories(${target} PRIVATE
|
||||||
${PM3_ROOT}/common
|
${PM3_ROOT}/common
|
||||||
${PM3_ROOT}/common_fpga
|
${PM3_ROOT}/common_fpga
|
||||||
|
|||||||
@@ -47,8 +47,8 @@ static int mainret = PM3_SUCCESS;
|
|||||||
|
|
||||||
#ifndef LIBPM3
|
#ifndef LIBPM3
|
||||||
#define BANNERMSG1 ""
|
#define BANNERMSG1 ""
|
||||||
#define BANNERMSG2
|
#define BANNERMSG2 ""
|
||||||
#define BANNERMSG3 " Release... v4.23346 - Frosty Lemon"
|
#define BANNERMSG3 ""
|
||||||
|
|
||||||
typedef enum LogoMode { UTF8, ANSI, ASCII, UTF8_PM5, ANSI_PM5, ASCII_PM5 } LogoMode;
|
typedef enum LogoMode { UTF8, ANSI, ASCII, UTF8_PM5, ANSI_PM5, ASCII_PM5 } LogoMode;
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,20 @@
|
|||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
// 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.
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
/* Generated file, do not edit */
|
/* This is the default version_pm3.c file that Makefile.common falls back to if sh is not available */
|
||||||
#ifndef ON_DEVICE
|
#ifndef ON_DEVICE
|
||||||
#define SECTVERSINFO
|
#define SECTVERSINFO
|
||||||
#else
|
#else
|
||||||
@@ -8,10 +23,10 @@
|
|||||||
|
|
||||||
const struct version_information_t SECTVERSINFO g_version_information = {
|
const struct version_information_t SECTVERSINFO g_version_information = {
|
||||||
VERSION_INFORMATION_MAGIC,
|
VERSION_INFORMATION_MAGIC,
|
||||||
1,
|
1, /* version 1 */
|
||||||
1,
|
0, /* version information not present */
|
||||||
2,
|
2, /* cleanliness couldn't be determined */
|
||||||
"Iceman/master/v4.23346",
|
"Iceman/master/unknown",
|
||||||
"2026-09-18 00:22:18",
|
"1970-01-01 00:00:00",
|
||||||
"9ce8a4b6c"
|
"no sha256"
|
||||||
};
|
};
|
||||||
@@ -52,7 +52,7 @@ VPATH += ../common_arm/rssi ../common_arm/rgb ../common_arm/sys ../common_arm/ti
|
|||||||
|
|
||||||
INCLUDES = ../include/proxmark3_arm.h ../include/at91sam7s512.h ../include/config_gpio.h ../include/pm3_cmd.h
|
INCLUDES = ../include/proxmark3_arm.h ../include/at91sam7s512.h ../include/config_gpio.h ../include/pm3_cmd.h
|
||||||
|
|
||||||
DEFCFLAGS = -Wall -Os -pedantic -fstrict-aliasing -pipe
|
DEFCFLAGS = -Wall -Werror -Os -pedantic -fstrict-aliasing -pipe
|
||||||
|
|
||||||
# Some more warnings we want as errors:
|
# Some more warnings we want as errors:
|
||||||
DEFCFLAGS += -Wbad-function-cast -Wchar-subscripts -Wundef -Wunused -Wuninitialized -Wpointer-arith -Wformat -Wformat-security -Winit-self -Wmissing-include-dirs -Wnested-externs -Wempty-body -Wignored-qualifiers -Wmissing-field-initializers -Wtype-limits
|
DEFCFLAGS += -Wbad-function-cast -Wchar-subscripts -Wundef -Wunused -Wuninitialized -Wpointer-arith -Wformat -Wformat-security -Winit-self -Wmissing-include-dirs -Wnested-externs -Wempty-body -Wignored-qualifiers -Wmissing-field-initializers -Wtype-limits
|
||||||
|
|||||||
Reference in new issue
Block a user