Release v4.9237 - Ice Coffee ☕

2024-09-20 15:26:13 +08:00 · 2020-05-21 21:55:15 +02:00 · 2020-05-21 21:55:15 +02:00 · 833bc4d9a3
parent a19ba257af
commit 833bc4d9a3
20 changed files with 30 additions and 29 deletions
--- a/Makefile.defs
+++ b/Makefile.defs
@ -47,7 +47,7 @@ else
    RANLIB= ranlib
 endif

-DEFCFLAGS = -Wall -Werror -O3 -fstrict-aliasing -pipe
+DEFCFLAGS = -Wall -O3 -fstrict-aliasing -pipe
 # Some more warnings we want as errors:
 DEFCFLAGS += -Wbad-function-cast -Wredundant-decls -Wmissing-prototypes -Wchar-subscripts -Wshadow -Wundef -Wwrite-strings -Wunused -Wuninitialized -Wpointer-arith -Winline -Wformat -Wformat-security -Winit-self -Wmissing-include-dirs -Wnested-externs -Wmissing-declarations -Wempty-body -Wignored-qualifiers -Wmissing-field-initializers -Wtype-limits -Wold-style-definition
 # Some more warnings we need first to eliminate, so temporarely tolerated:
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@ -229,7 +229,7 @@ add_executable(
        ${ADDITIONAL_SRC}
 )

-target_compile_options(proxmark3 PUBLIC -Wall -Werror -O3)
+target_compile_options(proxmark3 PUBLIC -Wall -O3)

 if (MINGW)
    # Mingw uses by default Microsoft printf, we want the GNU printf (e.g. for %z)
--- a/client/Makefile
+++ b/client/Makefile
@ -75,7 +75,7 @@ ifneq (,$(findstring MINGW,$(platform)))
    PM3CFLAGS += -D_ISOC99_SOURCE
    PM3CFLAGS += -mno-ms-bitfields -fexec-charset=cp850
 endif
-CXXFLAGS ?= -Wall -Werror -O3
+CXXFLAGS ?= -Wall -O3
 PM3CXXFLAGS = $(CXXFLAGS) -I../include

 LUAPLATFORM = generic
--- a/client/deps/amiibo.cmake
+++ b/client/deps/amiibo.cmake
@ -13,5 +13,5 @@ add_library(pm3rrg_rdv4_amiibo STATIC

 target_include_directories(pm3rrg_rdv4_amiibo PRIVATE ../../include ../../common)
 target_include_directories(pm3rrg_rdv4_amiibo INTERFACE amiitool)
-target_compile_options(pm3rrg_rdv4_amiibo PRIVATE -Wall -Werror -O3)
+target_compile_options(pm3rrg_rdv4_amiibo PRIVATE -Wall -O3)
 set_property(TARGET pm3rrg_rdv4_amiibo PROPERTY POSITION_INDEPENDENT_CODE ON)
--- a/client/deps/cliparser.cmake
+++ b/client/deps/cliparser.cmake
@ -8,5 +8,5 @@ target_include_directories(pm3rrg_rdv4_cliparser PRIVATE
        ../../include
        ../src)
 target_include_directories(pm3rrg_rdv4_cliparser INTERFACE cliparser)
-target_compile_options(pm3rrg_rdv4_cliparser PRIVATE -Wall -Werror -O3)
+target_compile_options(pm3rrg_rdv4_cliparser PRIVATE -Wall -O3)
 set_property(TARGET pm3rrg_rdv4_cliparser PROPERTY POSITION_INDEPENDENT_CODE ON)
--- a/client/deps/hardnested.cmake
+++ b/client/deps/hardnested.cmake
@ -2,7 +2,7 @@ add_library(pm3rrg_rdv4_hardnested_nosimd OBJECT
        hardnested/hardnested_bf_core.c
        hardnested/hardnested_bitarray_core.c)

-target_compile_options(pm3rrg_rdv4_hardnested_nosimd PRIVATE -Wall -Werror -O3)
+target_compile_options(pm3rrg_rdv4_hardnested_nosimd PRIVATE -Wall -O3)
 set_property(TARGET pm3rrg_rdv4_hardnested_nosimd PROPERTY POSITION_INDEPENDENT_CODE ON)

 target_include_directories(pm3rrg_rdv4_hardnested_nosimd PRIVATE
@ -27,7 +27,7 @@ if ("${CMAKE_SYSTEM_PROCESSOR}" IN_LIST X86_CPUS)
            hardnested/hardnested_bf_core.c
            hardnested/hardnested_bitarray_core.c)

-    target_compile_options(pm3rrg_rdv4_hardnested_mmx PRIVATE -Wall -Werror -O3)
+    target_compile_options(pm3rrg_rdv4_hardnested_mmx PRIVATE -Wall -O3)
    target_compile_options(pm3rrg_rdv4_hardnested_mmx BEFORE PRIVATE
            -mmmx -mno-sse2 -mno-avx -mno-avx2 -mno-avx512f)
    set_property(TARGET pm3rrg_rdv4_hardnested_mmx PROPERTY POSITION_INDEPENDENT_CODE ON)
@ -41,7 +41,7 @@ if ("${CMAKE_SYSTEM_PROCESSOR}" IN_LIST X86_CPUS)
            hardnested/hardnested_bf_core.c
            hardnested/hardnested_bitarray_core.c)

-    target_compile_options(pm3rrg_rdv4_hardnested_sse2 PRIVATE -Wall -Werror -O3)
+    target_compile_options(pm3rrg_rdv4_hardnested_sse2 PRIVATE -Wall -O3)
    target_compile_options(pm3rrg_rdv4_hardnested_sse2 BEFORE PRIVATE
            -mmmx -msse2 -mno-avx -mno-avx2 -mno-avx512f)
    set_property(TARGET pm3rrg_rdv4_hardnested_sse2 PROPERTY POSITION_INDEPENDENT_CODE ON)
@ -55,7 +55,7 @@ if ("${CMAKE_SYSTEM_PROCESSOR}" IN_LIST X86_CPUS)
            hardnested/hardnested_bf_core.c
            hardnested/hardnested_bitarray_core.c)

-    target_compile_options(pm3rrg_rdv4_hardnested_avx PRIVATE -Wall -Werror -O3)
+    target_compile_options(pm3rrg_rdv4_hardnested_avx PRIVATE -Wall -O3)
    target_compile_options(pm3rrg_rdv4_hardnested_avx BEFORE PRIVATE
            -mmmx -msse2 -mavx -mno-avx2 -mno-avx512f)
    set_property(TARGET pm3rrg_rdv4_hardnested_avx PROPERTY POSITION_INDEPENDENT_CODE ON)
@ -69,7 +69,7 @@ if ("${CMAKE_SYSTEM_PROCESSOR}" IN_LIST X86_CPUS)
            hardnested/hardnested_bf_core.c
            hardnested/hardnested_bitarray_core.c)

-    target_compile_options(pm3rrg_rdv4_hardnested_avx2 PRIVATE -Wall -Werror -O3)
+    target_compile_options(pm3rrg_rdv4_hardnested_avx2 PRIVATE -Wall -O3)
    target_compile_options(pm3rrg_rdv4_hardnested_avx2 BEFORE PRIVATE
            -mmmx -msse2 -mavx -mavx2 -mno-avx512f)
    set_property(TARGET pm3rrg_rdv4_hardnested_avx2 PROPERTY POSITION_INDEPENDENT_CODE ON)
@ -83,7 +83,7 @@ if ("${CMAKE_SYSTEM_PROCESSOR}" IN_LIST X86_CPUS)
            hardnested/hardnested_bf_core.c
            hardnested/hardnested_bitarray_core.c)

-    target_compile_options(pm3rrg_rdv4_hardnested_avx512 PRIVATE -Wall -Werror -O3)
+    target_compile_options(pm3rrg_rdv4_hardnested_avx512 PRIVATE -Wall -O3)
    target_compile_options(pm3rrg_rdv4_hardnested_avx512 BEFORE PRIVATE
            -mmmx -msse2 -mavx -mavx2 -mavx512f)
    set_property(TARGET pm3rrg_rdv4_hardnested_avx512 PROPERTY POSITION_INDEPENDENT_CODE ON)
--- a/client/deps/jansson.cmake
+++ b/client/deps/jansson.cmake
@ -15,5 +15,5 @@ add_library(pm3rrg_rdv4_jansson STATIC

 target_compile_definitions(pm3rrg_rdv4_jansson PRIVATE HAVE_STDINT_H)
 target_include_directories(pm3rrg_rdv4_jansson INTERFACE jansson)
-target_compile_options(pm3rrg_rdv4_jansson PRIVATE -Wall -Werror -Wno-unused-function -O3)
+target_compile_options(pm3rrg_rdv4_jansson PRIVATE -Wall -Wno-unused-function -O3)
 set_property(TARGET pm3rrg_rdv4_jansson PROPERTY POSITION_INDEPENDENT_CODE ON)
--- a/client/deps/lua.cmake
+++ b/client/deps/lua.cmake
@ -45,5 +45,5 @@ if (NOT MINGW)
 endif (NOT MINGW)

 target_include_directories(pm3rrg_rdv4_lua INTERFACE liblua)
-target_compile_options(pm3rrg_rdv4_lua PRIVATE -Wall -Werror -O3)
+target_compile_options(pm3rrg_rdv4_lua PRIVATE -Wall -O3)
 set_property(TARGET pm3rrg_rdv4_lua PROPERTY POSITION_INDEPENDENT_CODE ON)
--- a/client/deps/mbedtls.cmake
+++ b/client/deps/mbedtls.cmake
@ -45,5 +45,5 @@ add_library(pm3rrg_rdv4_mbedtls STATIC
        )

 target_include_directories(pm3rrg_rdv4_mbedtls PRIVATE ../../common)
-target_compile_options(pm3rrg_rdv4_mbedtls PRIVATE -Wall -Werror -O3)
+target_compile_options(pm3rrg_rdv4_mbedtls PRIVATE -Wall -O3)
 set_property(TARGET pm3rrg_rdv4_mbedtls PROPERTY POSITION_INDEPENDENT_CODE ON)
--- a/client/deps/reveng.cmake
+++ b/client/deps/reveng.cmake
@ -13,5 +13,5 @@ target_include_directories(pm3rrg_rdv4_reveng PRIVATE
        ../src
        ../../include)
 target_include_directories(pm3rrg_rdv4_reveng INTERFACE reveng)
-target_compile_options(pm3rrg_rdv4_reveng PRIVATE -Wall -Werror -O3)
+target_compile_options(pm3rrg_rdv4_reveng PRIVATE -Wall -O3)
 set_property(TARGET pm3rrg_rdv4_reveng PROPERTY POSITION_INDEPENDENT_CODE ON)
--- a/client/deps/tinycbor.cmake
+++ b/client/deps/tinycbor.cmake
@ -11,5 +11,5 @@ add_library(pm3rrg_rdv4_tinycbor STATIC

 target_include_directories(pm3rrg_rdv4_tinycbor INTERFACE tinycbor)
 # Strange errors on Mingw when compiling with -O3
-target_compile_options(pm3rrg_rdv4_tinycbor PRIVATE -Wall -Werror -O2)
+target_compile_options(pm3rrg_rdv4_tinycbor PRIVATE -Wall -O2)
 set_property(TARGET pm3rrg_rdv4_tinycbor PROPERTY POSITION_INDEPENDENT_CODE ON)
--- a/client/deps/whereami.cmake
+++ b/client/deps/whereami.cmake
@ -2,5 +2,5 @@ add_library(pm3rrg_rdv4_whereami STATIC whereami/whereami.c)

 target_compile_definitions(pm3rrg_rdv4_whereami PRIVATE WAI_PM3_TUNED)
 target_include_directories(pm3rrg_rdv4_whereami INTERFACE whereami)
-target_compile_options(pm3rrg_rdv4_whereami PRIVATE -Wall -Werror -O3)
+target_compile_options(pm3rrg_rdv4_whereami PRIVATE -Wall -O3)
 set_property(TARGET pm3rrg_rdv4_whereami PROPERTY POSITION_INDEPENDENT_CODE ON)
--- a/client/deps/zlib.cmake
+++ b/client/deps/zlib.cmake
@ -9,5 +9,5 @@ add_library(pm3rrg_rdv4_z STATIC
 )

 target_compile_definitions(pm3rrg_rdv4_z PRIVATE Z_SOLO NO_GZIP ZLIB_PM3_TUNED)
-target_compile_options(pm3rrg_rdv4_z PRIVATE -Wall -Werror -O3)
+target_compile_options(pm3rrg_rdv4_z PRIVATE -Wall -O3)
 set_property(TARGET pm3rrg_rdv4_z PROPERTY POSITION_INDEPENDENT_CODE ON)
--- a/client/src/proxmark3.c
+++ b/client/src/proxmark3.c
@ -34,7 +34,7 @@

 #define BANNERMSG1 "    :snowflake:  iceman@icesql.net"
 #define BANNERMSG2 "   https://github.com/rfidresearchgroup/proxmark3/"
-#define BANNERMSG3 "pre-release v4.0"
+#define BANNERMSG3 "Release v4.9237 - Ice Coffee :coffee:"

 typedef enum LogoMode { UTF8, ANSI, ASCII } LogoMode;

--- a/common/default_version.c
+++ b/common/default_version.c
@ -1,5 +1,5 @@
 #include "common.h"
-/* This is the default version.c file that Makefile.common falls back to if neither sh nor perl are available */
+/* Generated file, do not edit */
 #ifndef ON_DEVICE
 #define SECTVERSINFO
 #else
@ -8,8 +8,9 @@

 const struct version_information SECTVERSINFO version_information = {
    VERSION_INFORMATION_MAGIC,
-    1, /* version 1 */
-    0, /* version information not present */
-    2, /* cleanliness couldn't be determined */
-    /* Remaining fields: zero */
+    1,
+    1,
+    2,
+    "RRG/Iceman/master/v4.9237",
+    "2020-05-21 21:55:15",
 };
--- a/common_arm/Makefile.common
+++ b/common_arm/Makefile.common
@ -40,7 +40,7 @@ VPATH = . ../common_arm ../common ../common/crapto1 ../common/mbedtls ../common/
 INCLUDES = ../include/proxmark3_arm.h ../include/at91sam7s512.h ../include/config_gpio.h ../include/pm3_cmd.h

 ARMCFLAGS = -mthumb-interwork -fno-builtin
-DEFCFLAGS = -Wall -Werror -Os -pedantic -fstrict-aliasing -pipe
+DEFCFLAGS = -Wall -Os -pedantic -fstrict-aliasing -pipe

 # 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
--- a/tools/hitag2crack/crack2/Makefile
+++ b/tools/hitag2crack/crack2/Makefile
@ -1,4 +1,4 @@
-CFLAGS?=-Wall -Werror -O3
+CFLAGS?=-Wall -O3
 # Linux libs
 LIBS=-pthread -D_GNU_SOURCE
 # Mac libs
--- a/tools/hitag2crack/crack3/Makefile
+++ b/tools/hitag2crack/crack3/Makefile
@ -1,4 +1,4 @@
-CFLAGS?=-Wall -Werror -O3
+CFLAGS?=-Wall -O3
 LIBS=
 VPATH=../common
 INC=-I ../common
--- a/tools/hitag2crack/crack4/Makefile
+++ b/tools/hitag2crack/crack4/Makefile
@ -1,4 +1,4 @@
-CFLAGS?=-Wall -Werror -O3
+CFLAGS?=-Wall -O3
 LIBS=-lpthread
 VPATH=../common
 INC=-I ../common
--- a/tools/hitag2crack/crack5/Makefile
+++ b/tools/hitag2crack/crack5/Makefile
@ -1,4 +1,4 @@
-CFLAGS?=-Wall -Werror -O3
+CFLAGS?=-Wall -O3
 LIBS=-lpthread
 VPATH=../common
 INC=-I ../common