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

Compare commits

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

2 Commits
8c997087e9 ... fda4ee592d

Author SHA1 Message Date
finn fda4ee592d Feat: added Nullchecks for malloc/calloc 2022-07-18 21:28:38 +02:00
finn 88ee99b37c Feat: SIMD of for loop 2022-07-18 21:22:03 +02:00
4 changed files with 89 additions and 37 deletions
Show Stats Expand all files Collapse all files

4
Implementierung/src/io.c
View File

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

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

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

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

@ -1,12 +1,17 @@
#include "../../lib/md2_impls/md2_1.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;
for (size_t i = 0; i < len / 16; i++) {
for (int j = 0; j < 16; j++) {
for (size_t i = 0; i < len / 16; i++)
{
for (int j = 0; j < 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:
buf[len + j] ^= MD2_PI_SUBST[c ^ l];
@ -15,58 +20,82 @@ void md2_checksum_1(size_t len, uint8_t* buf) {
}
}
void md2_hash_1(size_t len, const uint8_t buf[len], uint8_t out[16]) {
static uint8_t PADDING[17][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 ===
int paddingNeeded = 16 - (len & 7);
uint8_t originalPadding = paddingNeeded;
int paddingNeeded = 16 - (len & 15);
len += paddingNeeded;
// printf("len: %d\n", len);
uint8_t* newBuf = aligned_alloc(16, sizeof(uint8_t)*(len + 16));
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);
// printBuf(len + 16, newBuf);
while (paddingNeeded > 0) {
newBuf[len - paddingNeeded] = originalPadding;
paddingNeeded--;
}
// printf("buf with padding: ");
// printBuf(len + 16, newBuf);
memcpy(newBuf + len - paddingNeeded, PADDING + paddingNeeded, paddingNeeded);
// === step 2 ===
md2_checksum_1(len, newBuf);
// printf("buf with cecksum: ");
// printBuf(len + 16, newBuf);
// === step 3 ===
uint8_t* messageDigestBuf = calloc(48, sizeof(uint8_t));
// TODO: add null check
uint8_t *messageDigestBuf = aligned_alloc(16, sizeof(uint8_t) * 48);
if (messageDigestBuf == NULL) {
printf("Failure: aligned_alloc returns NULL");
return -1;
}
for (size_t i = 0; i < 48; i++) {
messageDigestBuf[i] = 0;
}
// === step 4 ===
// <= because we need to hash the last block too
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];
messageDigestBuf[32 + j] =
(messageDigestBuf[16 + j] ^ messageDigestBuf[j]);
}
__m128i vx;
__m128i vy;
for (size_t i = 0; i <= (len + 16) / 16 - 1; i++)
{
vx = _mm_load_si128((__m128i*) (newBuf + i * 16));
_mm_store_si128((__m128i*) (messageDigestBuf + 16), vx);
vy = _mm_load_si128((__m128i*) (messageDigestBuf));
vy = _mm_xor_si128(vy, vx);
_mm_store_si128((__m128i*) (messageDigestBuf + 32), vy);
u_int8_t t = 0;
for (int j = 0; j < 18; j++) {
for (int k = 0; k < 48; k++) {
for (int j = 0; j < 18; j++)
{
for (int k = 0; k < 48; k++)
{
t = messageDigestBuf[k] = messageDigestBuf[k] ^ MD2_PI_SUBST[t];
}
t = (t + j) & 127;
t = (t + j) & 255;
}
}
// printf("messageDigestBuf: \n");
// printBuf(16, messageDigestBuf);
memcpy(out, messageDigestBuf, 16);

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

@ -50,12 +50,24 @@ void md2_hash_2(size_t len, const uint8_t buf[len], uint8_t out[16]) {
// === step 3 ===
uint8_t* messageDigestBuf = calloc(48, sizeof(uint8_t));
if (messageDigestBuf == NULL) {
printf("Failure: calloc returns NULL");
return -1;
}
// === step 4 ===
uint8_t l = 0;
uint8_t* checksum = calloc(16, sizeof(uint8_t));
if (checksum == NULL) {
printf("Failure: calloc returns NULL");
return -1;
}
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_process = 0;