github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 21:03:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: part of https://github.com/Proxmark/proxmark3/pull/723 (@Fl0-0)

Browse source 
CHG: remove some warnings when compiling on 32/64 bit systems.  Messy messy
This commit is contained in:
iceman1001 2018-11-28 23:53:31 +01:00
commit 91809c6d94
3 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/crypto/asn1dump.c
View file

@ -7,12 +7,14 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// asn.1 dumping // asn.1 dumping
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#define _POSIX_C_SOURCE 200809L // need for strnlen()
#include "asn1dump.h" #include "asn1dump.h"
#include <ctype.h> #include <ctype.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#include <string.h>
#include <jansson.h> #include <jansson.h>
#include <mbedtls/asn1.h> #include <mbedtls/asn1.h>
#include <mbedtls/oid.h> #include <mbedtls/oid.h>

9
client/fido/cbortools.c
View file

@ -203,8 +203,13 @@ int TinyCborPrintFIDOPackage(uint8_t cmdCode, bool isResponse, uint8_t *data, si
CborError err = dumprecursive(cmdCode, isResponse, &cb, false, 0); CborError err = dumprecursive(cmdCode, isResponse, &cb, false, 0);
if (err) { if (err) {
fprintf(stderr, "CBOR parsing failure at offset %d: %s\n", fprintf(stderr,
cb.ptr - data, cbor_error_string(err)); #if __WORDSIZE == 64
"CBOR parsing failure at offset %" PRId64 " : %s\n",
#else
"CBOR parsing failure at offset %" PRId32 " : %s\n",
#endif
cb.ptr - data, cbor_error_string(err));
return 1; return 1;
} }

9
client/fpga_compress.c
View file

@ -99,7 +99,14 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile, bool hardn
if (i >= num_infiles * (hardnested_mode ? HARDNESTED_TABLE_SIZE : FPGA_CONFIG_SIZE)) { if (i >= num_infiles * (hardnested_mode ? HARDNESTED_TABLE_SIZE : FPGA_CONFIG_SIZE)) {
if (hardnested_mode) { if (hardnested_mode) {
fprintf(stderr, "Input file too big (> %llu bytes). This is probably not a hardnested bitflip state table.\n", HARDNESTED_TABLE_SIZE); fprintf(stderr,
#if __WORDSIZE == 64
"Input file too big (> %" PRIu64 " bytes). This is probably not a hardnested bitflip state table.\n"
#else
"Input file too big (> %lu bytes). This is probably not a hardnested bitflip state table.\n"
#endif
, HARDNESTED_TABLE_SIZE);
} else { } else {
fprintf(stderr, "Input files too big (total > %lu bytes). These are probably not PM3 FPGA config files.\n", num_infiles * FPGA_CONFIG_SIZE); fprintf(stderr, "Input files too big (total > %lu bytes). These are probably not PM3 FPGA config files.\n", num_infiles * FPGA_CONFIG_SIZE);
} }