Skip to content

Commit aceed28

Browse files
iceman1001iceman1001
committed
Release v4.18589 - Aurora
1 parent efcfd3e commit aceed28

19 files changed

+36
-51
lines changed

‎Makefile.defs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ ifeq ($(DEBUG),1)
112112
DEFCFLAGS = -g -O0 -fstrict-aliasing -pipe
113113
DEFLDFLAGS =
114114
else
115-
DEFCXXFLAGS = -Wall -Werror -O3 -pipe
116-
DEFCFLAGS = -Wall -Werror -O3 -fstrict-aliasing -pipe
115+
DEFCXXFLAGS = -Wall -O3 -pipe
116+
DEFCFLAGS = -Wall -O3 -fstrict-aliasing -pipe
117117
DEFLDFLAGS =
118118
endif
119119

‎armsrc/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ showinfo:
185185
# version_pm3.c should be checked on every time fullimage.stage1.elf should be remade
186186
version_pm3.c: default_version_pm3.c $(OBJDIR)/fpga_version_info.o $(OBJDIR)/fpga_all.o $(THUMBOBJ) $(ARMOBJ) .FORCE
187187
$(info [-] CHECK $@)
188-
$(Q)$(SH) ../tools/mkversion.sh $@ || $(CP) $< $@
188+
$(Q)$(CP) $< $@
189189

190190
fpga_version_info.c: $(FPGA_BITSTREAMS) $(FPGA_COMPRESSOR)
191191
$(info [-] GEN $@)

‎bootrom/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ OBJS = $(OBJDIR)/bootrom.s19
5656
# version_pm3.c should be checked on every compilation
5757
version_pm3.c: default_version_pm3.c .FORCE
5858
$(info [=] CHECK $@)
59-
$(Q)$(SH) ../tools/mkversion.sh $@ || $(CP) $< $@
59+
$(Q)$(CP) $< $@
6060

6161
all: showinfo $(OBJS)
6262

‎client/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ set (TARGET_SOURCES
426426

427427
add_custom_command(
428428
OUTPUT ${CMAKE_BINARY_DIR}/version_pm3.c
429-
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
429+
COMMAND ${CMAKE_COMMAND} -E copy ${PM3_ROOT}/common/default_version_pm3.c ${CMAKE_BINARY_DIR}/version_pm3.c
430430
DEPENDS ${PM3_ROOT}/common/default_version_pm3.c
431431
)
432432

@@ -684,7 +684,7 @@ add_executable(proxmark3
684684
${ADDITIONAL_SRC}
685685
)
686686

687-
target_compile_options(proxmark3 PUBLIC -Wall -Werror -O3)
687+
target_compile_options(proxmark3 PUBLIC -Wall -O3)
688688
if (EMBED_READLINE)
689689
if (NOT SKIPREADLINE EQUAL 1)
690690
add_dependencies(proxmark3 ncurses readline)

‎client/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ endif
446446

447447
PM3CFLAGS += -DHAVE_SNPRINTF
448448

449-
CXXFLAGS ?= -Wall -Werror
449+
CXXFLAGS ?= -Wall
450450
CXXFLAGS += $(MYDEFS) $(MYCXXFLAGS) $(MYINCLUDES)
451451

452452
PM3CXXFLAGS = $(CXXFLAGS)
@@ -977,7 +977,7 @@ src/pm3_pywrap.c: pm3.i
977977
# version_pm3.c should be checked on every compilation
978978
src/version_pm3.c: default_version_pm3.c .FORCE
979979
$(info [=] CHECK $@)
980-
$(Q)$(SH) ../tools/mkversion.sh $@ || $(CP) $< $@
980+
$(Q)$(CP) $< $@
981981

982982
# easy printing of MAKE VARIABLES
983983
print-%: ; @echo $* = $($*)

‎client/deps/amiibo.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ target_link_libraries(pm3rrg_rdv4_amiibo PRIVATE
1919
m
2020
pm3rrg_rdv4_mbedtls)
2121

22-
target_compile_options(pm3rrg_rdv4_amiibo PRIVATE -Wall -Werror -O3)
22+
target_compile_options(pm3rrg_rdv4_amiibo PRIVATE -Wall -O3)
2323
set_property(TARGET pm3rrg_rdv4_amiibo PROPERTY POSITION_INDEPENDENT_CODE ON)
2424

2525
target_include_directories(pm3rrg_rdv4_amiibo PRIVATE amiitool

‎client/deps/cliparser.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ target_include_directories(pm3rrg_rdv4_cliparser PRIVATE
99
../../include
1010
../src)
1111
target_include_directories(pm3rrg_rdv4_cliparser INTERFACE cliparser)
12-
target_compile_options(pm3rrg_rdv4_cliparser PRIVATE -Wall -Werror -O3)
12+
target_compile_options(pm3rrg_rdv4_cliparser PRIVATE -Wall -O3)
1313
set_property(TARGET pm3rrg_rdv4_cliparser PROPERTY POSITION_INDEPENDENT_CODE ON)

‎client/deps/hardnested.cmake

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ add_library(pm3rrg_rdv4_hardnested_nosimd OBJECT
22
hardnested/hardnested_bf_core.c
33
hardnested/hardnested_bitarray_core.c)
44

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

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

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

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

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

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

95-
target_compile_options(pm3rrg_rdv4_hardnested_avx512 PRIVATE -Wall -Werror -O3)
95+
target_compile_options(pm3rrg_rdv4_hardnested_avx512 PRIVATE -Wall -O3)
9696
target_compile_options(pm3rrg_rdv4_hardnested_avx512 BEFORE PRIVATE
9797
-mmmx -msse2 -mavx -mavx2 -mavx512f)
9898
set_property(TARGET pm3rrg_rdv4_hardnested_avx512 PROPERTY POSITION_INDEPENDENT_CODE ON)
@@ -116,7 +116,7 @@ elseif ("${CMAKE_SYSTEM_PROCESSOR}" IN_LIST ARM64_CPUS)
116116
hardnested/hardnested_bf_core.c
117117
hardnested/hardnested_bitarray_core.c)
118118

119-
target_compile_options(pm3rrg_rdv4_hardnested_neon PRIVATE -Wall -Werror -O3)
119+
target_compile_options(pm3rrg_rdv4_hardnested_neon PRIVATE -Wall -O3)
120120
set_property(TARGET pm3rrg_rdv4_hardnested_neon PROPERTY POSITION_INDEPENDENT_CODE ON)
121121

122122
target_include_directories(pm3rrg_rdv4_hardnested_neon PRIVATE
@@ -134,7 +134,7 @@ elseif ("${CMAKE_SYSTEM_PROCESSOR}" IN_LIST ARM32_CPUS)
134134
hardnested/hardnested_bf_core.c
135135
hardnested/hardnested_bitarray_core.c)
136136

137-
target_compile_options(pm3rrg_rdv4_hardnested_neon PRIVATE -Wall -Werror -O3)
137+
target_compile_options(pm3rrg_rdv4_hardnested_neon PRIVATE -Wall -O3)
138138
target_compile_options(pm3rrg_rdv4_hardnested_neon BEFORE PRIVATE
139139
-mfpu=neon)
140140
set_property(TARGET pm3rrg_rdv4_hardnested_neon PROPERTY POSITION_INDEPENDENT_CODE ON)
@@ -155,7 +155,7 @@ add_library(pm3rrg_rdv4_hardnested STATIC
155155
hardnested/hardnested_bruteforce.c
156156
$<TARGET_OBJECTS:pm3rrg_rdv4_hardnested_nosimd>
157157
${SIMD_TARGETS})
158-
target_compile_options(pm3rrg_rdv4_hardnested PRIVATE -Wall -Werror -O3)
158+
target_compile_options(pm3rrg_rdv4_hardnested PRIVATE -Wall -O3)
159159
set_property(TARGET pm3rrg_rdv4_hardnested PROPERTY POSITION_INDEPENDENT_CODE ON)
160160
target_include_directories(pm3rrg_rdv4_hardnested PRIVATE
161161
../../common

‎client/deps/id48lib.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ add_library(pm3rrg_rdv4_id48 STATIC
33
id48/id48_generator.c
44
id48/id48_recover.c
55
)
6-
target_compile_options( pm3rrg_rdv4_id48 PRIVATE -Wpedantic -Wall -Werror -O3 -Wno-unknown-pragmas -Wno-inline -Wno-unused-function -DID48_NO_STDIO)
6+
target_compile_options( pm3rrg_rdv4_id48 PRIVATE -Wpedantic -Wall -O3 -Wno-unknown-pragmas -Wno-inline -Wno-unused-function -DID48_NO_STDIO)
77
target_include_directories(pm3rrg_rdv4_id48 PRIVATE id48)
88
target_include_directories(pm3rrg_rdv4_id48 INTERFACE id48)
99
set_property(TARGET pm3rrg_rdv4_id48 PROPERTY POSITION_INDEPENDENT_CODE ON)

‎client/deps/jansson.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ add_library(pm3rrg_rdv4_jansson STATIC
1414

1515
target_compile_definitions(pm3rrg_rdv4_jansson PRIVATE HAVE_STDINT_H)
1616
target_include_directories(pm3rrg_rdv4_jansson INTERFACE jansson)
17-
target_compile_options(pm3rrg_rdv4_jansson PRIVATE -Wall -Werror -Wno-unused-function -O3)
17+
target_compile_options(pm3rrg_rdv4_jansson PRIVATE -Wall -Wno-unused-function -O3)
1818
set_property(TARGET pm3rrg_rdv4_jansson PROPERTY POSITION_INDEPENDENT_CODE ON)

‎client/deps/lua.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,5 @@ if (NOT MINGW)
5252
endif (NOT MINGW)
5353

5454
target_include_directories(pm3rrg_rdv4_lua INTERFACE liblua)
55-
target_compile_options(pm3rrg_rdv4_lua PRIVATE -Wall -Werror -O3)
55+
target_compile_options(pm3rrg_rdv4_lua PRIVATE -Wall -O3)
5656
set_property(TARGET pm3rrg_rdv4_lua PROPERTY POSITION_INDEPENDENT_CODE ON)

‎client/deps/mbedtls.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,5 @@ add_library(pm3rrg_rdv4_mbedtls STATIC
4848

4949
target_include_directories(pm3rrg_rdv4_mbedtls PRIVATE ../../common)
5050
target_include_directories(pm3rrg_rdv4_mbedtls INTERFACE ../../common/mbedtls)
51-
target_compile_options(pm3rrg_rdv4_mbedtls PRIVATE -Wall -Werror -O3)
51+
target_compile_options(pm3rrg_rdv4_mbedtls PRIVATE -Wall -O3)
5252
set_property(TARGET pm3rrg_rdv4_mbedtls PROPERTY POSITION_INDEPENDENT_CODE ON)

‎client/deps/reveng.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ target_include_directories(pm3rrg_rdv4_reveng PRIVATE
1313
../src
1414
../../include)
1515
target_include_directories(pm3rrg_rdv4_reveng INTERFACE reveng)
16-
target_compile_options(pm3rrg_rdv4_reveng PRIVATE -Wall -Werror -O3)
16+
target_compile_options(pm3rrg_rdv4_reveng PRIVATE -Wall -O3)
1717
set_property(TARGET pm3rrg_rdv4_reveng PROPERTY POSITION_INDEPENDENT_CODE ON)

‎client/deps/tinycbor.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ add_library(pm3rrg_rdv4_tinycbor STATIC
1111

1212
target_include_directories(pm3rrg_rdv4_tinycbor INTERFACE tinycbor)
1313
# Strange errors on Mingw when compiling with -O3
14-
target_compile_options(pm3rrg_rdv4_tinycbor PRIVATE -Wall -Werror -O2)
14+
target_compile_options(pm3rrg_rdv4_tinycbor PRIVATE -Wall -O2)
1515
set_property(TARGET pm3rrg_rdv4_tinycbor PROPERTY POSITION_INDEPENDENT_CODE ON)

‎client/deps/whereami.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ add_library(pm3rrg_rdv4_whereami STATIC whereami/whereami.c)
22

33
target_compile_definitions(pm3rrg_rdv4_whereami PRIVATE WAI_PM3_TUNED)
44
target_include_directories(pm3rrg_rdv4_whereami INTERFACE whereami)
5-
target_compile_options(pm3rrg_rdv4_whereami PRIVATE -Wall -Werror -O3)
5+
target_compile_options(pm3rrg_rdv4_whereami PRIVATE -Wall -O3)
66
set_property(TARGET pm3rrg_rdv4_whereami PROPERTY POSITION_INDEPENDENT_CODE ON)

‎client/experimental_lib/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ set (TARGET_SOURCES
427427

428428
add_custom_command(
429429
OUTPUT ${CMAKE_BINARY_DIR}/version_pm3.c
430-
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
430+
COMMAND ${CMAKE_COMMAND} -E copy ${PM3_ROOT}/common/default_version_pm3.c ${CMAKE_BINARY_DIR}/version_pm3.c
431431
DEPENDS ${PM3_ROOT}/common/default_version_pm3.c
432432
)
433433

‎client/src/proxmark3.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ static int mainret = PM3_ESOFT;
4949
#ifndef LIBPM3
5050
#define BANNERMSG1 ""
5151
#define BANNERMSG2 " [ :coffee: ]"
52-
#define BANNERMSG3 ""
52+
#define BANNERMSG3 "Release v4.18589 - Aurora"
5353

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

‎common/default_version_pm3.c

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,5 @@
1-
//-----------------------------------------------------------------------------
2-
// Copyright (C) Proxmark3 contributors. See AUTHORS.md for details.
3-
//
4-
// This program is free software: you can redistribute it and/or modify
5-
// it under the terms of the GNU General Public License as published by
6-
// the Free Software Foundation, either version 3 of the License, or
7-
// (at your option) any later version.
8-
//
9-
// This program is distributed in the hope that it will be useful,
10-
// but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
// GNU General Public License for more details.
13-
//
14-
// See LICENSE.txt for the text of the license.
15-
//-----------------------------------------------------------------------------
161
#include "common.h"
17-
/* This is the default version_pm3.c file that Makefile.common falls back to if sh is not available */
2+
/* Generated file, do not edit */
183
#ifndef ON_DEVICE
194
#define SECTVERSINFO
205
#else
@@ -23,10 +8,10 @@
238

249
const struct version_information_t SECTVERSINFO g_version_information = {
2510
VERSION_INFORMATION_MAGIC,
26-
1, /* version 1 */
27-
0, /* version information not present */
28-
2, /* cleanliness couldn't be determined */
29-
"Iceman/master/unknown",
30-
"1970-01-01 00:00:00",
31-
"no sha256"
11+
1,
12+
1,
13+
2,
14+
"Iceman/master/v4.18589",
15+
"2024-05-28 10:36:31",
16+
"669923317"
3217
};

‎common_arm/Makefile.common

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ VPATH = . ../common_arm ../common ../common/crapto1 ../common/mbedtls ../common/
4949
INCLUDES = ../include/proxmark3_arm.h ../include/at91sam7s512.h ../include/config_gpio.h ../include/pm3_cmd.h
5050

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

5454
# Some more warnings we want as errors:
5555
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

0 commit comments

Comments
 (0)