github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 05:13:46 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix coverity 267211 & 267206 logically dead code

Browse source
This commit is contained in:
Philippe Teuwen 2020-05-14 01:01:48 +02:00
commit 1c8c1d82ea
2 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

32
armsrc/hitag2.c
View file

@ -1397,21 +1397,23 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
uint8_t attempt_count = 0; uint8_t attempt_count = 0;
// Tag specific configuration settings (sof, timings, etc.) // Tag specific configuration settings (sof, timings, etc.)
if (htf < 10) { // TODO HTS
/* if (htf <= HTS_LAST_CMD) {
// hitagS settings // hitagS settings
t_wait_1 = 204; t_wait_1 = 204;
t_wait_2 = 128; t_wait_2 = 128;
flipped_bit = 0; flipped_bit = 0;
tag_size = 8; tag_size = 8;
DBG DbpString("Configured for hitagS reader"); DBG DbpString("Configured for hitagS reader");
} else if (htf < 20) { } else */
if (htf <= HT1_LAST_CMD) {
// hitag1 settings // hitag1 settings
t_wait_1 = 204; t_wait_1 = 204;
t_wait_2 = 128; t_wait_2 = 128;
tag_size = 256; tag_size = 256;
flipped_bit = 0; flipped_bit = 0;
DBG DbpString("Configured for hitag1 reader"); DBG DbpString("Configured for hitag1 reader");
} else if (htf < 30) { } else if (htf <= HT2_LAST_CMD) {
// hitag2 settings // hitag2 settings
t_wait_1 = HITAG_T_WAIT_1_MIN; t_wait_1 = HITAG_T_WAIT_1_MIN;
t_wait_2 = HITAG_T_WAIT_2_MIN; t_wait_2 = HITAG_T_WAIT_2_MIN;
@ -1721,28 +1723,32 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
lf_init(true, false); lf_init(true, false);
// Tag specific configuration settings (sof, timings, etc.) // Tag specific configuration settings (sof, timings, etc.)
if (htf < 10) { // TODO HTS
/* if (htf <= HTS_LAST_CMD) {
// hitagS settings // hitagS settings
t_wait_1 = 204; t_wait_1 = 204;
t_wait_2 = 128; t_wait_2 = 128;
/*tag_size = 256;*/ //tag_size = 256;
flipped_bit = 0; flipped_bit = 0;
tag_size = 8; tag_size = 8;
DbpString("Configured for hitagS writer"); DbpString("Configured for hitagS writer");
} else if (htf < 20) { } else */
// TODO HT1
/* if (htf <= HT1_LAST_CMD) {
// hitag1 settings // hitag1 settings
t_wait_1 = 204; t_wait_1 = 204;
t_wait_2 = 128; t_wait_2 = 128;
tag_size = 256; tag_size = 256;
flipped_bit = 0; flipped_bit = 0;
DbpString("Configured for hitag1 writer"); DbpString("Configured for hitag1 writer");
} else if (htf < 30) { } else */
// hitag2 settings // if (htf <= HT2_LAST_CMD) {
t_wait_1 = HITAG_T_WAIT_1_MIN; // hitag2 settings
t_wait_2 = HITAG_T_WAIT_2_MIN; t_wait_1 = HITAG_T_WAIT_1_MIN;
tag_size = 48; t_wait_2 = HITAG_T_WAIT_2_MIN;
DbpString("Configured for hitag2 writer"); tag_size = 48;
} DbpString("Configured for hitag2 writer");
// }
uint8_t tag_modulation; uint8_t tag_modulation;
size_t max_nrzs = (8 * HITAG_FRAME_LEN + 5) * 2; // up to 2 nrzs per bit size_t max_nrzs = (8 * HITAG_FRAME_LEN + 5) * 2; // up to 2 nrzs per bit

3
include/hitag.h
View file

@ -21,8 +21,10 @@ typedef enum {
RHTSF_KEY = 02, RHTSF_KEY = 02,
WHTSF_CHALLENGE = 03, WHTSF_CHALLENGE = 03,
WHTSF_KEY = 04, WHTSF_KEY = 04,
HTS_LAST_CMD = WHTSF_KEY,
RHT1F_PLAIN = 11, RHT1F_PLAIN = 11,
RHT1F_AUTHENTICATE = 12, RHT1F_AUTHENTICATE = 12,
HT1_LAST_CMD = RHT1F_AUTHENTICATE,
RHT2F_PASSWORD = 21, RHT2F_PASSWORD = 21,
RHT2F_AUTHENTICATE = 22, RHT2F_AUTHENTICATE = 22,
RHT2F_CRYPTO = 23, RHT2F_CRYPTO = 23,
@ -30,6 +32,7 @@ typedef enum {
RHT2F_TEST_AUTH_ATTEMPTS = 25, RHT2F_TEST_AUTH_ATTEMPTS = 25,
RHT2F_UID_ONLY = 26, RHT2F_UID_ONLY = 26,
WHT2F_PASSWORD = 27, WHT2F_PASSWORD = 27,
HT2_LAST_CMD = WHT2F_PASSWORD,
} hitag_function; } hitag_function;
typedef struct { typedef struct {