Refactor project
This commit is contained in:
parent
56ded46af5
commit
81b8cd5c94
28 changed files with 25 additions and 4 deletions
|
|
@ -1,123 +0,0 @@
|
|||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <strings.h>
|
||||
|
||||
#include "libmineziper.h"
|
||||
#include "libmineziper_huffman_tree.h"
|
||||
#include "libmineziper_zip.h"
|
||||
|
||||
#define BUF_SIZE 0xfffff
|
||||
|
||||
void main(int argc, char** argv)
|
||||
{
|
||||
if (argc != 2)
|
||||
{
|
||||
printf("NEED ONE FILE TO PROCESS\n");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
FILE* stream = fopen(argv[1], "r");
|
||||
if (stream == NULL)
|
||||
{
|
||||
fprintf(stderr, "Cannot open file for writing\n");
|
||||
return;
|
||||
}
|
||||
|
||||
char buf[BUF_SIZE + 1];
|
||||
int read_size = fread(buf, 1, BUF_SIZE, stream);
|
||||
buf[BUF_SIZE] = '\0';
|
||||
|
||||
zip zip = init_zip(buf, read_size);
|
||||
|
||||
for (int k = 0; k < zip.eocd->number_of_entries; k++)
|
||||
{
|
||||
printf("BLOC %d:\n", k);
|
||||
|
||||
LFH* lfh = (LFH*) (zip.start + zip.lfh_off[k]);
|
||||
|
||||
unsigned int uncompressed_size = lfh->uncompressed_size;
|
||||
printf("UNCOMPRESSED SIZE: 0x%x\n", uncompressed_size);
|
||||
|
||||
if (lfh->compressed_size == 0)
|
||||
{
|
||||
printf("Empty bloc\n");
|
||||
}
|
||||
else
|
||||
{
|
||||
if (lfh->compression_method == COMP_DEFLATE)
|
||||
{
|
||||
char* data = ((char*) lfh) + sizeof(LFH) + lfh->filename_length +
|
||||
lfh->extraf_length;
|
||||
|
||||
bitstream bs = init_bitstream(data, 0 /*TODO WWEUWIEUWIEUWI*/, 0);
|
||||
|
||||
ISH deflate_header = {.raw = get_bits(&bs, 3)};
|
||||
printf(
|
||||
"DEFLATE BLOC:\nLast bloc bit: %d\nBloc type: %d\n",
|
||||
deflate_header.last_block,
|
||||
deflate_header.block_type);
|
||||
|
||||
if (deflate_header.block_type == 1)
|
||||
{
|
||||
char* decoded_data = malloc(uncompressed_size);
|
||||
|
||||
decode_type1_block_vuln(&bs, decoded_data);
|
||||
// decode_type1_block_v1(&bs, uncompressed_size, decoded_data);
|
||||
|
||||
char* path = "/tmp/minezipper_data";
|
||||
FILE* tmp_file = fopen(path, "w");
|
||||
fwrite(decoded_data, 1, uncompressed_size, tmp_file);
|
||||
fclose(tmp_file);
|
||||
|
||||
printf("Unzipped in %s\n", path);
|
||||
|
||||
free(decoded_data);
|
||||
}
|
||||
|
||||
else if (deflate_header.block_type == 2)
|
||||
{
|
||||
// handle_type2(data);
|
||||
}
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
printf("Compression method not recognized\n");
|
||||
}
|
||||
}
|
||||
|
||||
printf("\n");
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
void handle_type2(char* data)
|
||||
{
|
||||
DHCH* dynamic_huffman_code_header = data;
|
||||
data += sizeof(DHCH);
|
||||
|
||||
printf(
|
||||
"Dynamic header:\n# of bit length codes: %d\n# of dist codes: "
|
||||
"%d\n# of litteral codes: %d\n",
|
||||
get_number_bit_length_code(dynamic_huffman_code_header),
|
||||
get_number_dist_code(dynamic_huffman_code_header),
|
||||
get_number_litteral_code(dynamic_huffman_code_header));
|
||||
|
||||
#define CODE_LENGTH 19
|
||||
// read 19 codes defining bit lengths
|
||||
HN code_length[CODE_LENGTH];
|
||||
const unsigned char code_length_order[CODE_LENGTH] = {
|
||||
16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
|
||||
|
||||
for (size_t i = 0; i < CODE_LENGTH; i++)
|
||||
{
|
||||
memcpy(&code_length[code_length_order[i]].len, data, 3);
|
||||
data += 3;
|
||||
}
|
||||
|
||||
for (size_t i = 0; i < CODE_LENGTH; i++)
|
||||
{
|
||||
printf("For length %d: %d\n", i, code_length[i].len);
|
||||
}
|
||||
}
|
||||
*/
|
||||
Loading…
Add table
Add a link
Reference in a new issue