github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-14 09:13:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix typo and gcc-7 warnings (#401)

Browse source 
* Fix typo in hf mf csave help
* Fix gcc 7 warning: '~' on an expression of type bool [-Wbool-operation], use logical ! not instead of ~
* Fix gcc 7 warning: ‘memset’ used with length equal to number of elements without multiplication by element size [-Wmemset-elt-size]
* Fix gcc 7 warning: warning: duplicate ‘const’ declaration specifier [-Wduplicate-decl-specifier]
This commit is contained in:
Fl0-0 2017-09-26 16:36:05 +02:00 • committed by pwpiwi
parent 1ece662f0f
commit a2d058f3aa
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
client/cmdhfmf.c
View file

@ -2193,13 +2193,13 @@ int CmdHF14AMfCSave(const char *Cmd) {
if (param_getchar(Cmd, 0) == 'h') { if (param_getchar(Cmd, 0) == 'h') {
PrintAndLog("It saves `magic Chinese` card dump into the file `filename.eml` or `cardID.eml`"); PrintAndLog("It saves `magic Chinese` card dump into the file `filename.eml` or `cardID.eml`");
PrintAndLog("or into emulator memory (option `e`). 4K card: (option `4`)"); PrintAndLog("or into emulator memory (option `e`). 4K card: (option `4`)");
PrintAndLog("Usage: hf mf esave [file name w/o `.eml`][e][4]"); PrintAndLog("Usage: hf mf csave [file name w/o `.eml`][e][4]");
PrintAndLog("Sample: hf mf esave "); PrintAndLog("Sample: hf mf csave ");
PrintAndLog(" hf mf esave filename"); PrintAndLog(" hf mf csave filename");
PrintAndLog(" hf mf esave e"); PrintAndLog(" hf mf csave e");
PrintAndLog(" hf mf esave 4"); PrintAndLog(" hf mf csave 4");
PrintAndLog(" hf mf esave filename 4"); PrintAndLog(" hf mf csave filename 4");
PrintAndLog(" hf mf esave e 4"); PrintAndLog(" hf mf csave e 4");
return 0; return 0;
} }

2
client/cmdlfem4x.c
View file

@ -606,7 +606,7 @@ int EM4x50Read(const char *Cmd, bool verbose)
char tmp2[20]; char tmp2[20];
int phaseoff; int phaseoff;
high = low = 0; high = low = 0;
memset(tmpbuff, 0, MAX_GRAPH_TRACE_LEN / 64); memset(tmpbuff, 0, sizeof(tmpbuff));
// get user entry if any // get user entry if any
sscanf(Cmd, "%i %i", &clk, &invert); sscanf(Cmd, "%i %i", &clk, &invert);

2
client/hardnested/hardnested_bf_core.c
View file

@ -342,7 +342,7 @@ const uint64_t CRACK_STATES_BITSLICED(uint32_t cuid, uint8_t *best_first_bytes,
// } // }
#endif #endif
// add the even state bits // add the even state bits
const bitslice_t const *restrict bitsliced_even_state = bitsliced_even_states[block_idx]; const bitslice_t *restrict bitsliced_even_state = bitsliced_even_states[block_idx];
for(uint32_t state_idx = 1; state_idx < STATE_SIZE; state_idx += 2) { for(uint32_t state_idx = 1; state_idx < STATE_SIZE; state_idx += 2) {
state_p[state_idx] = bitsliced_even_state[state_idx/2]; state_p[state_idx] = bitsliced_even_state[state_idx/2];
} }

4
client/loclass/cipher.c
View file

@ -114,9 +114,9 @@ uint8_t _select(bool x, bool y, uint8_t r)
bool r6 = r >> 1 & 0x1; bool r6 = r >> 1 & 0x1;
bool r7 = r & 0x1; bool r7 = r & 0x1;
bool z0 = (r0 & r2) ^ (r1 & ~r3) ^ (r2 | r4); bool z0 = (r0 & r2) ^ (r1 & !r3) ^ (r2 | r4);
bool z1 = (r0 | r2) ^ ( r5 | r7) ^ r1 ^ r6 ^ x ^ y; bool z1 = (r0 | r2) ^ ( r5 | r7) ^ r1 ^ r6 ^ x ^ y;
bool z2 = (r3 & ~r5) ^ (r4 & r6 ) ^ r7 ^ x; bool z2 = (r3 & !r5) ^ (r4 & r6 ) ^ r7 ^ x;
// The three bitz z0.. z1 are packed into a uint8_t: // The three bitz z0.. z1 are packed into a uint8_t:
// 00000ZZZ // 00000ZZZ