github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-12 16:22:59 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

some @iceman1001 s coverty scan fixes

Browse source 
great work!
This commit is contained in:
marshmellow42 2016-01-08 18:26:56 -05:00
parent 3975d477e1
commit c4c3af7c16
7 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
armsrc/BigBuf.c
View file

@ -184,7 +184,7 @@ bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_
traceLen += iLen; traceLen += iLen;
// parity bytes // parity bytes
if (iLen != 0) { if (num_paritybytes != 0) {
if (parity != NULL) { if (parity != NULL) {
memcpy(trace + traceLen, parity, num_paritybytes); memcpy(trace + traceLen, parity, num_paritybytes);
} else { } else {

2
armsrc/des.c
View file

@ -274,7 +274,7 @@ uint32_t des_f(uint32_t r, uint8_t* kr){
uint64_t data; uint64_t data;
uint8_t *sbp; /* sboxpointer */ uint8_t *sbp; /* sboxpointer */
permute((uint8_t*)e_permtab, (uint8_t*)&r, (uint8_t*)&data); permute((uint8_t*)e_permtab, (uint8_t*)&r, (uint8_t*)&data);
for(i=0; i<7; ++i) for(i=0; i<6; ++i)
((uint8_t*)&data)[i] ^= kr[i]; ((uint8_t*)&data)[i] ^= kr[i];
/* Sbox substitution */ /* Sbox substitution */

1
client/cmdhfepa.c
View file

@ -58,6 +58,7 @@ int CmdHFEPACollectPACENonces(const char *Cmd)
} }
// print nonce // print nonce
PrintAndLog("Length: %d, Nonce: %s", nonce_length, nonce); PrintAndLog("Length: %d, Nonce: %s", nonce_length, nonce);
free(nonce);
} }
if (i < n - 1) { if (i < n - 1) {
sleep(d); sleep(d);

2
client/cmdhficlass.c
View file

@ -406,7 +406,7 @@ int CmdHFiClassDecrypt(const char *Cmd) {
fclose(f); fclose(f);
saveFile(outfilename,"bin", decrypted, blocknum*8); saveFile(outfilename,"bin", decrypted, blocknum*8);
free(decrypted);
return 0; return 0;
} }

2
client/loclass/cipherutils.c
View file

@ -171,6 +171,7 @@ void printarr(char * name, uint8_t* arr, int len)
} }
cx += snprintf(output+cx,outsize-cx,"};"); cx += snprintf(output+cx,outsize-cx,"};");
prnlog(output); prnlog(output);
free(output);
} }
void printvar(char * name, uint8_t* arr, int len) void printvar(char * name, uint8_t* arr, int len)
@ -188,6 +189,7 @@ void printvar(char * name, uint8_t* arr, int len)
} }
prnlog(output); prnlog(output);
free(output);
} }
void printarr_human_readable(char * title, uint8_t* arr, int len) void printarr_human_readable(char * title, uint8_t* arr, int len)

10
client/util.c
View file

@ -497,3 +497,13 @@ void xor(unsigned char *dst, unsigned char *src, size_t len) {
int32_t le24toh (uint8_t data[3]) { int32_t le24toh (uint8_t data[3]) {
return (data[2] << 16) | (data[1] << 8) | data[0]; return (data[2] << 16) | (data[1] << 8) | data[0];
} }
// RotateLeft - Ultralight, Desfire, works on byte level
// 00-01-02 >> 01-02-00
void rol(uint8_t *data, const size_t len){
uint8_t first = data[0];
for (size_t i = 0; i < len-1; i++) {
data[i] = data[i+1];
}
data[len-1] = first;
}

4
client/util.h
View file

@ -17,6 +17,9 @@
#include <time.h> #include <time.h>
#include "data.h" #include "data.h"
#ifndef ROTR
# define ROTR(x,n) (((uintmax_t)(x) >> (n)) | ((uintmax_t)(x) << ((sizeof(x) * 8) - (n))))
#endif
#ifndef MIN #ifndef MIN
# define MIN(a, b) (((a) < (b)) ? (a) : (b)) # define MIN(a, b) (((a) < (b)) ? (a) : (b))
#endif #endif
@ -68,3 +71,4 @@ void wiegand_add_parity(uint8_t *target, uint8_t *source, uint8_t length);
void xor(unsigned char *dst, unsigned char *src, size_t len); void xor(unsigned char *dst, unsigned char *src, size_t len);
int32_t le24toh(uint8_t data[3]); int32_t le24toh(uint8_t data[3]);
void rol(uint8_t *data, const size_t len);