From 0579b8f63cbb92e28353713d583120d92cc707cc Mon Sep 17 00:00:00 2001 From: Nate Glaser Date: Fri, 7 Jan 2022 19:07:29 -0500 Subject: [PATCH] Made requested changes -- I think --- armsrc/Standalone/Makefile.hal | 17 +++++++++++++- armsrc/Standalone/Makefile.inc | 22 ++++++++++++++++--- .../{hf_15693sniff.c => hf_15sniff.c} | 17 ++++++++++---- .../4_Advanced-compilation-parameters.md | 2 +- 4 files changed, 49 insertions(+), 9 deletions(-) rename armsrc/Standalone/{hf_15693sniff.c => hf_15sniff.c} (86%) diff --git a/armsrc/Standalone/Makefile.hal b/armsrc/Standalone/Makefile.hal index b7fc6e11b..c18bef124 100644 --- a/armsrc/Standalone/Makefile.hal +++ b/armsrc/Standalone/Makefile.hal @@ -1,3 +1,18 @@ +#----------------------------------------------------------------------------- +# 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. +#----------------------------------------------------------------------------- # Default standalone if no standalone specified DEFAULT_STANDALONE=LF_SAMYRUN HELP_EXAMPLE_STANDALONE=LF_SAMYRUN @@ -47,7 +62,7 @@ define KNOWN_STANDALONE_DEFINITIONS | HF_14ASNIFF | 14a sniff to flashmem | | (RDV4 only) | | +----------------------------------------------------------+ -| HF_15693SNIFF | 15693 sniff to flashmem | +| HF_15SNIFF | 15693 sniff to flashmem | | (RDV4 only) | | +----------------------------------------------------------+ | HF_AVEFUL | Mifare ultralight read/simulation | diff --git a/armsrc/Standalone/Makefile.inc b/armsrc/Standalone/Makefile.inc index c65533a57..6f8e3c994 100644 --- a/armsrc/Standalone/Makefile.inc +++ b/armsrc/Standalone/Makefile.inc @@ -1,4 +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. +#----------------------------------------------------------------------------- # Generic standalone Mode injection of source code +#----------------------------------------------------------------------------- SRC_STANDALONE = placeholder.c # WITH_STANDALONE_LF_SKELETON @@ -41,9 +57,9 @@ endif ifneq (,$(findstring WITH_STANDALONE_HF_14ASNIFF,$(APP_CFLAGS))) SRC_STANDALONE = hf_14asniff.c endif -# WITH_STANDALONE_HF_15693SNIFF -ifneq (,$(findstring WITH_STANDALONE_HF_15693SNIFF,$(APP_CFLAGS))) - SRC_STANDALONE = hf_15693sniff.c +# WITH_STANDALONE_HF_15SNIFF +ifneq (,$(findstring WITH_STANDALONE_HF_15SNIFF,$(APP_CFLAGS))) + SRC_STANDALONE = hf_15sniff.c endif # WITH_STANDALONE_HF_AVEFUL ifneq (,$(findstring WITH_STANDALONE_HF_AVEFUL,$(APP_CFLAGS))) diff --git a/armsrc/Standalone/hf_15693sniff.c b/armsrc/Standalone/hf_15sniff.c similarity index 86% rename from armsrc/Standalone/hf_15693sniff.c rename to armsrc/Standalone/hf_15sniff.c index 35e22c966..45d837859 100644 --- a/armsrc/Standalone/hf_15693sniff.c +++ b/armsrc/Standalone/hf_15sniff.c @@ -1,9 +1,18 @@ //----------------------------------------------------------------------------- -// Copyright 2021 Nathan Glaser +// Copyright (C) Nathan Glaser, 2021 +// Copyright (C) Proxmark3 contributors. See AUTHORS.md for details. // -// This code is licensed to you under the terms of the GNU GPL, version 2 or, -// at your option, any later version. See the LICENSE.txt file for the text of -// the license. +// 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. //----------------------------------------------------------------------------- // main code for standalone HF/iso15693 Sniff to flash //----------------------------------------------------------------------------- diff --git a/doc/md/Use_of_Proxmark/4_Advanced-compilation-parameters.md b/doc/md/Use_of_Proxmark/4_Advanced-compilation-parameters.md index 1d2127926..5813caf48 100644 --- a/doc/md/Use_of_Proxmark/4_Advanced-compilation-parameters.md +++ b/doc/md/Use_of_Proxmark/4_Advanced-compilation-parameters.md @@ -113,7 +113,7 @@ Here are the supported values you can assign to `STANDALONE` in `Makefile.platfo | LF_SKELETON | standalone mode skeleton - Iceman1001 | LF_THAREXDE | LF EM4x50 simulator/read standalone mode - tharexde | HF_14ASNIFF | 14a sniff storing to flashmem - Micolous -| HF_15693SNIFF | 15693 sniff storing to flashmem - Glaser +| HF_15SNIFF | 15693 sniff storing to flashmem - Glaser | HF_AVEFUL | MIFARE Ultralight read/simulation - Ave Ozkal | HF_BOG | 14a sniff with ULC/ULEV1/NTAG auth storing in flashmem - Bogito | HF_CRAFTBYTE | UID stealer - Emulates scanned 14a UID - Anze Jensterle