RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-19 13:48:16 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/iceman1001/proxmark3

Browse source
This commit is contained in:
iceman1001 2016-08-02 16:06:40 +02:00
commit e719470c46
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
client/cmdhflegic.c
View file

@ -527,8 +527,7 @@ int CmdLegicRfRawWrite(const char *Cmd) {
PrintAndLog("# changing the DCF is irreversible #"); PrintAndLog("# changing the DCF is irreversible #");
PrintAndLog("#####################################"); PrintAndLog("#####################################");
PrintAndLog("do youe really want to continue? y(es) n(o)"); PrintAndLog("do youe really want to continue? y(es) n(o)");
scanf(" %c", &answer); if (scanf(" %c", &answer) > 0 && (answer == 'y' || answer == 'Y')) {
if (answer == 'y' || answer == 'Y') {
SendCommand(&c); SendCommand(&c);
return 0; return 0;
} }

4
client/reveng/poly.c
View file

@ -140,7 +140,7 @@ filtop(FILE *input, unsigned long length, int flags, int bperhx) {
bmp_t accu = BMP_C(0); bmp_t accu = BMP_C(0);
bmp_t mask = bperhx == BMP_BIT ? ~BMP_C(0) : (BMP_C(1) << bperhx) - BMP_C(1); bmp_t mask = bperhx == BMP_BIT ? ~BMP_C(0) : (BMP_C(1) << bperhx) - BMP_C(1);
unsigned long iter = 0UL, idx; unsigned long iter = 0UL, idx;
int cmask = ~(~0 << CHAR_BIT), c; int cmask = (1 << CHAR_BIT) - 1, c;
int count = 0, ofs; int count = 0, ofs;
poly_t poly = PZERO; poly_t poly = PZERO;
if(bperhx == 0) return(poly); if(bperhx == 0) return(poly);
@ -205,7 +205,7 @@ strtop(const char *string, int flags, int bperhx) {
bmp_t accu; bmp_t accu;
bmp_t mask = bperhx == BMP_BIT ? ~BMP_C(0) : (BMP_C(1) << bperhx) - BMP_C(1); bmp_t mask = bperhx == BMP_BIT ? ~BMP_C(0) : (BMP_C(1) << bperhx) - BMP_C(1);
int pass, count, ofs; int pass, count, ofs;
int cmask = ~(~0 << CHAR_BIT), c; int cmask = (1 << CHAR_BIT) - 1 , c;
const char *s; const char *s;
poly_t poly = PZERO; poly_t poly = PZERO;

3
zlib/inflate.c
View file

@ -1523,7 +1523,8 @@ z_streamp strm;
{ {
struct inflate_state FAR *state; struct inflate_state FAR *state;
if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16; if (strm == Z_NULL || strm->state == Z_NULL)
return (long)(((unsigned long)0 - 1) << 16);
state = (struct inflate_state FAR *)strm->state; state = (struct inflate_state FAR *)strm->state;
return ((long)(state->back) << 16) + return ((long)(state->back) << 16) +
(state->mode == COPY ? state->length : (state->mode == COPY ? state->length :