mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-03-03 19:43:09 +08:00
fix build failure on linux machines with fwd decl
This commit is contained in:
parent
280b3301ee
commit
982bef6705
7 changed files with 10 additions and 7 deletions
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -15,20 +15,20 @@ def parse_and_split_file(filename):
|
|||
with open(filename, 'rb') as f: # Read as binary to handle non-text files
|
||||
data = f.read(100) # Read first 100 bytes which should contain all information
|
||||
|
||||
decoded_data = list(data.decode(errors='ignore'))
|
||||
decoded_data = bytearray(data)
|
||||
|
||||
for i in range(len(decoded_data) - 3):
|
||||
# subsequent two bytes after marker are null and the length
|
||||
next_byte = ord(decoded_data[i+1])
|
||||
data_length = ord(decoded_data[i+2])
|
||||
next_byte = decoded_data[i+1]
|
||||
data_length = decoded_data[i+2] - 1 # Don't overwrite terminating char
|
||||
|
||||
if decoded_data[i] == split_chars[0] and next_byte == 0x0:
|
||||
if decoded_data[i] == ord(split_chars[0]) and next_byte == 0x0:
|
||||
start = i+3
|
||||
extracted_data.append(''.join(decoded_data[start:start+data_length]))
|
||||
extracted_data.append(decoded_data[start:start+data_length])
|
||||
|
||||
# time, date
|
||||
if split_chars[0] == 'c' or split_chars[0] == 'd':
|
||||
decoded_data[start:start+data_length] = 'F' * data_length
|
||||
decoded_data[start:start+data_length] = bytes('F', encoding='ascii') * data_length
|
||||
|
||||
split_chars.pop(0)
|
||||
|
||||
|
@ -36,7 +36,6 @@ def parse_and_split_file(filename):
|
|||
break
|
||||
|
||||
print("Extracted data from bitfile: {}".format(extracted_data))
|
||||
decoded_data = ''.join(decoded_data).encode()
|
||||
|
||||
with open(filename, 'r+b') as f: # Write back modified bytes
|
||||
f.seek(0)
|
||||
|
|
|
@ -23,6 +23,8 @@
|
|||
#include "fpga.h"
|
||||
#include "lz4hc.h"
|
||||
|
||||
int fileno(FILE *);
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(a,b) ((a) < (b) ? (a) : (b))
|
||||
#endif
|
||||
|
@ -356,6 +358,8 @@ static int FpgaGatherVersion(FILE *infile, char *infile_name, char *dst, int len
|
|||
for (uint16_t i = 0; i < FPGA_BITSTREAM_FIXED_HEADER_SIZE; i++) {
|
||||
if (fgetc(infile) != bitparse_fixed_header[i]) {
|
||||
fprintf(stderr, "Invalid FPGA file. Aborting...\n\n");
|
||||
fprintf(stderr, "File: %s\n", infile_name);
|
||||
|
||||
return (EXIT_FAILURE);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue