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

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
marshmellow42 2015-06-27 22:54:55 -04:00
commit 3e553c0817
3 changed files with 22 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
armsrc/Makefile
View file

@ -70,11 +70,13 @@ FPGA_COMPRESSOR = ../client/fpga_compress
all: $(OBJS) all: $(OBJS)
.DELETE_ON_ERROR:
$(OBJDIR)/fpga_all.o: $(OBJDIR)/fpga_all.bit.z $(OBJDIR)/fpga_all.o: $(OBJDIR)/fpga_all.bit.z
$(OBJCOPY) -O elf32-littlearm -I binary -B arm --prefix-sections=fpga_all_bit $^ $@ $(OBJCOPY) -O elf32-littlearm -I binary -B arm --prefix-sections=fpga_all_bit $^ $@
$(OBJDIR)/fpga_all.bit.z: $(FPGA_BITSTREAMS) $(FPGA_COMPRESSOR) $(OBJDIR)/fpga_all.bit.z: $(FPGA_BITSTREAMS) $(FPGA_COMPRESSOR)
$(FPGA_COMPRESSOR) $(filter %.bit,$^) $@ $(FPGA_COMPRESSOR) $(filter %.bit,$^) $@
$(FPGA_COMPRESSOR): $(FPGA_COMPRESSOR):
make -C ../client $(notdir $(FPGA_COMPRESSOR)) make -C ../client $(notdir $(FPGA_COMPRESSOR))

1
armsrc/optimized_cipher.c
View file

@ -65,7 +65,6 @@
#include <string.h> #include <string.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
#include <time.h>
#define opt_T(s) (0x1 & ((s->t >> 15) ^ (s->t >> 14)^ (s->t >> 10)^ (s->t >> 8)^ (s->t >> 5)^ (s->t >> 4)^ (s->t >> 1)^ s->t)) #define opt_T(s) (0x1 & ((s->t >> 15) ^ (s->t >> 14)^ (s->t >> 10)^ (s->t >> 8)^ (s->t >> 5)^ (s->t >> 4)^ (s->t >> 1)^ s->t))

36
client/fpga_compress.c
View file

@ -85,6 +85,15 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile)
// read the input files. Interleave them into fpga_config[] // read the input files. Interleave them into fpga_config[]
i = 0; i = 0;
do { do {
if (i >= 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);
for(uint16_t j = 0; j < num_infiles; j++) {
fclose(infile[j]);
}
return(EXIT_FAILURE);
}
for(uint16_t j = 0; j < num_infiles; j++) { for(uint16_t j = 0; j < num_infiles; j++) {
for(uint16_t k = 0; k < FPGA_INTERLEAVE_SIZE; k++) { for(uint16_t k = 0; k < FPGA_INTERLEAVE_SIZE; k++) {
c = fgetc(infile[j]); c = fgetc(infile[j]);
@ -96,13 +105,6 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile)
} }
} }
if (i > num_infiles * FPGA_CONFIG_SIZE) {
fprintf(stderr, "Input files too big (total > %lu bytes). These are probably not PM3 FPGA config files.", num_infiles*FPGA_CONFIG_SIZE);
for(uint16_t j = 0; j < num_infiles; j++) {
fclose(infile[j]);
}
return -1;
}
} while (!all_feof(infile, num_infiles)); } while (!all_feof(infile, num_infiles));
// initialize zlib structures // initialize zlib structures
@ -148,7 +150,7 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile)
fclose(outfile); fclose(outfile);
free(infile); free(infile);
free(fpga_config); free(fpga_config);
return -1; return(EXIT_FAILURE);
} }
for (i = 0; i < compressed_fpga_stream.total_out; i++) { for (i = 0; i < compressed_fpga_stream.total_out; i++) {
@ -164,7 +166,7 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile)
free(infile); free(infile);
free(fpga_config); free(fpga_config);
return 0; return(EXIT_SUCCESS);
} }
@ -226,12 +228,12 @@ int zlib_decompress(FILE *infile, FILE *outfile)
} }
fclose(outfile); fclose(outfile);
fclose(infile); fclose(infile);
return 0; return(EXIT_SUCCESS);
} else { } else {
fprintf(stderr, "Error. Inflate() returned error %d, %s", ret, compressed_fpga_stream.msg); fprintf(stderr, "Error. Inflate() returned error %d, %s", ret, compressed_fpga_stream.msg);
fclose(outfile); fclose(outfile);
fclose(infile); fclose(infile);
return -1; return(EXIT_FAILURE);
} }
} }
@ -244,24 +246,24 @@ int main(int argc, char **argv)
if (argc == 1 || argc == 2) { if (argc == 1 || argc == 2) {
usage(); usage();
return -1; return(EXIT_FAILURE);
} }
if (!strcmp(argv[1], "-d")) { // Decompress if (!strcmp(argv[1], "-d")) { // Decompress
infiles = calloc(1, sizeof(FILE*)); infiles = calloc(1, sizeof(FILE*));
if (argc != 4) { if (argc != 4) {
usage(); usage();
return -1; return(EXIT_FAILURE);
} }
infiles[0] = fopen(argv[2], "rb"); infiles[0] = fopen(argv[2], "rb");
if (infiles[0] == NULL) { if (infiles[0] == NULL) {
fprintf(stderr, "Error. Cannot open input file %s", argv[2]); fprintf(stderr, "Error. Cannot open input file %s", argv[2]);
return -1; return(EXIT_FAILURE);
} }
outfile = fopen(argv[3], "wb"); outfile = fopen(argv[3], "wb");
if (outfile == NULL) { if (outfile == NULL) {
fprintf(stderr, "Error. Cannot open output file %s", argv[3]); fprintf(stderr, "Error. Cannot open output file %s", argv[3]);
return -1; return(EXIT_FAILURE);
} }
return zlib_decompress(infiles[0], outfile); return zlib_decompress(infiles[0], outfile);
@ -272,13 +274,13 @@ int main(int argc, char **argv)
infiles[i] = fopen(argv[i+1], "rb"); infiles[i] = fopen(argv[i+1], "rb");
if (infiles[i] == NULL) { if (infiles[i] == NULL) {
fprintf(stderr, "Error. Cannot open input file %s", argv[i+1]); fprintf(stderr, "Error. Cannot open input file %s", argv[i+1]);
return -1; return(EXIT_FAILURE);
} }
} }
outfile = fopen(argv[argc-1], "wb"); outfile = fopen(argv[argc-1], "wb");
if (outfile == NULL) { if (outfile == NULL) {
fprintf(stderr, "Error. Cannot open output file %s", argv[argc-1]); fprintf(stderr, "Error. Cannot open output file %s", argv[argc-1]);
return -1; return(EXIT_FAILURE);
} }
return zlib_compress(infiles, argc-2, outfile); return zlib_compress(infiles, argc-2, outfile);
} }