dorian/gra-projekt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: dorian:fda4ee592da04fc393cced62b622d7b9248475ba
Branches Tags
dorian:master
..
compare: dorian:8c997087e9d68caf443bd676a6ce5f687cf64976
Branches Tags
dorian:master

No commits in common. "fda4ee592da04fc393cced62b622d7b9248475ba" and "8c997087e9d68caf443bd676a6ce5f687cf64976" have entirely different histories.
fda4ee592d ... 8c997087e9

4 changed files with 37 additions and 89 deletions
Show stats Expand all files Collapse all files

4
Implementierung/src/io.c
View file

@ -34,10 +34,6 @@ uint8_t* read_file(const char* path, size_t* size) {
} }
uint8_t* data = malloc(statOfFile.st_size); uint8_t* data = malloc(statOfFile.st_size);
if (data == NULL) {
printf("Failure: malloc returns NULL");
return -1;
}
size_t bytesRead = size_t bytesRead =
fread(data, statOfFile.st_blksize, statOfFile.st_blocks, f); fread(data, statOfFile.st_blksize, statOfFile.st_blocks, f);

11
Implementierung/src/md2_impls/md2_0.c
View file

@ -25,10 +25,7 @@ void md2_hash_0(size_t len, const uint8_t buf[len], uint8_t out[16]) {
// +16 for the checksum // +16 for the checksum
uint8_t* newBuf = calloc(len + 16, sizeof(uint8_t)); uint8_t* newBuf = calloc(len + 16, sizeof(uint8_t));
if (newBuf == NULL) { // TODO: null check
printf("Failure: calloc returns NULL");
return -1;
}
memcpy(newBuf, buf, len - paddingNeeded); memcpy(newBuf, buf, len - paddingNeeded);
// printBuf(len + 16, newBuf); // printBuf(len + 16, newBuf);
@ -48,11 +45,7 @@ void md2_hash_0(size_t len, const uint8_t buf[len], uint8_t out[16]) {
// === step 3 === // === step 3 ===
uint8_t* messageDigestBuf = calloc(48, sizeof(uint8_t)); uint8_t* messageDigestBuf = calloc(48, sizeof(uint8_t));
if (messageDigestBuf == NULL) { // TODO: add null check
printf("Failure: calloc returns NULL");
return -1;
}
// === step 4 === // === step 4 ===
// <= because we need to hash the last block too // <= because we need to hash the last block too

99
Implementierung/src/md2_impls/md2_1.c
View file

@ -1,17 +1,12 @@
#include "../../lib/md2_impls/md2_1.h" #include "../../lib/md2_impls/md2_1.h"
#include "../../lib/md2_impls/md2_common.h" #include "../../lib/md2_impls/md2_common.h"
#include <immintrin.h>
void md2_checksum_1(size_t len, uint8_t* buf) {
void md2_checksum_1(size_t len, uint8_t *buf)
{
uint8_t l = 0; uint8_t l = 0;
for (size_t i = 0; i < len / 16; i++) for (size_t i = 0; i < len / 16; i++) {
{ for (int j = 0; j < 16; j++) {
for (int j = 0; j < 16; j++)
{
u_int8_t c = buf[i * 16 + j]; u_int8_t c = buf[i * 16 + j];
// reference is wrong. It says: Set C[j] to S[c xor L]. But it should be: // reference is wrong. It says: Set C[j] to S[c xor L]. But it should be:
buf[len + j] ^= MD2_PI_SUBST[c ^ l]; buf[len + j] ^= MD2_PI_SUBST[c ^ l];
@ -20,82 +15,58 @@ void md2_checksum_1(size_t len, uint8_t *buf)
} }
} }
static uint8_t PADDING[17][16] = { void md2_hash_1(size_t len, const uint8_t buf[len], uint8_t out[16]) {
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{3, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{4, 4, 4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{6, 6, 6, 6, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{8, 8, 8, 8, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0},
{9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0},
{10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 0, 0, 0, 0, 0, 0},
{11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 0, 0, 0, 0, 0},
{12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 0, 0, 0, 0},
{13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 0, 0, 0},
{14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, 0},
{15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 0},
{16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16}};
void md2_hash_1(size_t len, const uint8_t buf[len], uint8_t out[16])
{
// === step 1 === // === step 1 ===
int paddingNeeded = 16 - (len & 15); int paddingNeeded = 16 - (len & 7);
uint8_t originalPadding = paddingNeeded;
len += paddingNeeded; len += paddingNeeded;
uint8_t* newBuf = aligned_alloc(16, sizeof(uint8_t)*(len + 16)); // printf("len: %d\n", len);
if (newBuf == NULL) {
printf("Failure: aligned_alloc returns NULL");
return -1;
}
for(size_t i = 0; i < 16; i++) {
newBuf[len + i] = 0;
}
// +16 for the checksum
uint8_t* newBuf = calloc(len + 16, sizeof(uint8_t));
// TODO: null check
memcpy(newBuf, buf, len - paddingNeeded); memcpy(newBuf, buf, len - paddingNeeded);
memcpy(newBuf + len - paddingNeeded, PADDING + paddingNeeded, paddingNeeded); // printBuf(len + 16, newBuf);
while (paddingNeeded > 0) {
newBuf[len - paddingNeeded] = originalPadding;
paddingNeeded--;
}
// printf("buf with padding: ");
// printBuf(len + 16, newBuf);
// === step 2 === // === step 2 ===
md2_checksum_1(len, newBuf); md2_checksum_1(len, newBuf);
// === step 3 === // printf("buf with cecksum: ");
uint8_t *messageDigestBuf = aligned_alloc(16, sizeof(uint8_t) * 48); // printBuf(len + 16, newBuf);
if (messageDigestBuf == NULL) {
printf("Failure: aligned_alloc returns NULL");
return -1;
}
for (size_t i = 0; i < 48; i++) { // === step 3 ===
messageDigestBuf[i] = 0; uint8_t* messageDigestBuf = calloc(48, sizeof(uint8_t));
} // TODO: add null check
// === step 4 === // === step 4 ===
__m128i vx; // <= because we need to hash the last block too
__m128i vy; for (size_t i = 0; i <= (len + 16) / 16 - 1; i++) {
for (size_t i = 0; i <= (len + 16) / 16 - 1; i++) for (int j = 0; j < 16; j++) {
{ messageDigestBuf[16 + j] = newBuf[i * 16 + j];
vx = _mm_load_si128((__m128i*) (newBuf + i * 16)); messageDigestBuf[32 + j] =
_mm_store_si128((__m128i*) (messageDigestBuf + 16), vx); (messageDigestBuf[16 + j] ^ messageDigestBuf[j]);
vy = _mm_load_si128((__m128i*) (messageDigestBuf)); }
vy = _mm_xor_si128(vy, vx);
_mm_store_si128((__m128i*) (messageDigestBuf + 32), vy);
u_int8_t t = 0; u_int8_t t = 0;
for (int j = 0; j < 18; j++) for (int j = 0; j < 18; j++) {
{ for (int k = 0; k < 48; k++) {
for (int k = 0; k < 48; k++)
{
t = messageDigestBuf[k] = messageDigestBuf[k] ^ MD2_PI_SUBST[t]; t = messageDigestBuf[k] = messageDigestBuf[k] ^ MD2_PI_SUBST[t];
} }
t = (t + j) & 255; t = (t + j) & 127;
} }
} }
// printf("messageDigestBuf: \n");
// printBuf(16, messageDigestBuf);
memcpy(out, messageDigestBuf, 16); memcpy(out, messageDigestBuf, 16);

12
Implementierung/src/md2_impls/md2_2.c
View file

@ -50,24 +50,12 @@ void md2_hash_2(size_t len, const uint8_t buf[len], uint8_t out[16]) {
// === step 3 === // === step 3 ===
uint8_t* messageDigestBuf = calloc(48, sizeof(uint8_t)); uint8_t* messageDigestBuf = calloc(48, sizeof(uint8_t));
if (messageDigestBuf == NULL) {
printf("Failure: calloc returns NULL");
return -1;
}
// === step 4 === // === step 4 ===
uint8_t l = 0; uint8_t l = 0;
uint8_t* checksum = calloc(16, sizeof(uint8_t)); uint8_t* checksum = calloc(16, sizeof(uint8_t));
if (checksum == NULL) {
printf("Failure: calloc returns NULL");
return -1;
}
uint8_t* data = malloc(16); uint8_t* data = malloc(16);
if (data == NULL) {
printf("Failure: malloc returns NULL");
return -1;
}
size_t bytes_left_to_read = file_stat.st_size; size_t bytes_left_to_read = file_stat.st_size;
size_t bytes_left_to_process = 0; size_t bytes_left_to_process = 0;