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

feat: add data transfer between threads

Browse source
This commit is contained in:
Thomas Florian 2022-07-19 22:27:56 +02:00
parent b8670dfe62
commit 0ee32c8a84
3 changed files with 80 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Implementierung/Makefile
View file

@ -4,7 +4,7 @@ SRC = src/main.c src/helper.c src/io.c src/md2.c src/md2_impls/md2_common.c src/
OBJ = ${subst src,build,${SRC:.c=.o}} OBJ = ${subst src,build,${SRC:.c=.o}}
CC = gcc CC = gcc
CFLAGS = -Ilib -ggdb -std=c11 -g -Wall -Wextra -no-pie -O3 CFLAGS = -Ilib -ggdb -std=c11 -g -Wall -Wextra -no-pie -O3
LDFLAGS = LDFLAGS = -pthread
all: md2 all: md2

3
Implementierung/lib/md2_impls/md2_3.h
View file

@ -1,6 +1,7 @@
#ifndef MD2_3_H #ifndef MD2_3_H
#define MD2_3_H #define MD2_3_H
#include <pthread.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
@ -8,7 +9,7 @@
#include <string.h> #include <string.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <unistd.h> #include <unistd.h>q
/** /**
* @brief This implementation loads the file in bits and not at once * @brief This implementation loads the file in bits and not at once

133
Implementierung/src/md2_impls/md2_3.c
View file

@ -2,7 +2,20 @@
#include "../../lib/md2_impls/md2_common.h" #include "../../lib/md2_impls/md2_common.h"
void process_hash(size_t len, uint8_t buf[len], uint8_t messageDigestBuf[48]) { struct arg_hash {
size_t len;
const uint8_t* buf;
uint8_t messageDigestBuf[48];
};
struct arg_checksum {
size_t len;
uint8_t* buf;
uint8_t checksum[16];
};
void process_nothread_hash(size_t len, uint8_t buf[len],
uint8_t messageDigestBuf[48]) {
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++) { for (int j = 0; j < 16; j++) {
messageDigestBuf[16 + j] = buf[i * 16 + j]; messageDigestBuf[16 + j] = buf[i * 16 + j];
@ -21,30 +34,43 @@ void process_hash(size_t len, uint8_t buf[len], uint8_t messageDigestBuf[48]) {
} }
} }
void process_checksum(size_t len, uint8_t buf[len], uint8_t checksum[16]) { void* process_hash(void* args) {
uint8_t l = 0; struct arg_hash* arg = (struct arg_hash*)args;
printf("process_hash: %zu\n", arg->len);
for (size_t i = 0; i < len / 16; i++) { for (size_t i = 0; i < (arg->len + 16) / 16 - 1; i++) {
for (int j = 0; j < 16; j++) { for (int j = 0; j < 16; j++) {
u_int8_t c = buf[i * 16 + j]; arg->messageDigestBuf[16 + j] = arg->buf[i * 16 + j];
// reference is wrong. It says: Set C[j] to S[c xor L]. But it should be: arg->messageDigestBuf[32 + j] =
l = checksum[j] ^= MD2_PI_SUBST[c ^ l]; (arg->messageDigestBuf[16 + j] ^ arg->messageDigestBuf[j]);
}
u_int8_t t = 0;
for (int j = 0; j < 18; j++) {
for (int k = 0; k < 48; k++) {
t = arg->messageDigestBuf[k] =
arg->messageDigestBuf[k] ^ MD2_PI_SUBST[t];
}
t = (t + j) % 256;
} }
} }
md2_print_buf(48, arg->messageDigestBuf);
pthread_exit(NULL);
} }
// DUPLICATE CODE FROM md2_2.c void* process_checksum(void* args) {
// int apply_padding(size_t len, uint8_t buf[len]) { struct arg_checksum* arg = (struct arg_checksum*)args;
// int paddingNeeded = 16 - (len % 16); uint8_t l = 0;
// uint8_t originalPadding = paddingNeeded;
// len += paddingNeeded;
// while (paddingNeeded > 0) { for (size_t i = 0; i < arg->len / 16; i++) {
// buf[len - paddingNeeded] = originalPadding; for (int j = 0; j < 16; j++) {
// paddingNeeded--; u_int8_t c = arg->buf[i * 16 + j];
// } // reference is wrong. It says: Set C[j] to S[c xor L]. But it should be:
// return len; l = arg->checksum[j] ^= MD2_PI_SUBST[c ^ l];
// } }
}
pthread_exit(&arg->checksum);
}
// unused! // unused!
void md2_checksum_3(size_t _, uint8_t* __) {} void md2_checksum_3(size_t _, uint8_t* __) {}
@ -79,48 +105,41 @@ void md2_hash_3(size_t len, const uint8_t buf[len], uint8_t out[16]) {
return; return;
} }
int hashPipe[2]; pthread_t thread_1, thread_2;
int checksumPipe[2];
if (pipe(hashPipe) == -1 || pipe(checksumPipe) == -1) { struct arg_hash arg_1 = {len, newBuf, messageDigestBuf};
return; struct arg_checksum arg_2 = {len, newBuf, checksum};
if (pthread_create(&thread_1, NULL, process_hash, (void*)&arg_1) != 0) {
printf("Error creating thread 1\n");
exit(EXIT_FAILURE);
}
if (pthread_create(&thread_2, NULL, process_checksum, (void*)&arg_2) != 0) {
printf("Error creating thread 2\n");
exit(EXIT_FAILURE);
} }
pid_t pid_1, pid_2; if (pthread_join(thread_1, NULL) != 0) {
(pid_1 = fork()) && (pid_2 = fork()); printf("Error joining thread 1\n");
exit(EXIT_FAILURE);
if (pid_1 == 0) {
// Child 1 process
close(hashPipe[0]);
process_hash(len, newBuf, messageDigestBuf);
write(hashPipe[1], messageDigestBuf, 48);
exit(0);
} else if (pid_2 == 0) {
// Child 2 process
close(checksumPipe[0]);
process_checksum(len, newBuf, checksum);
write(checksumPipe[1], checksum, 16);
exit(0);
} else {
// int status;
// Parent process
close(hashPipe[1]);
close(checksumPipe[1]);
waitpid(pid_1, NULL, 0);
waitpid(pid_2, NULL, 0);
read(hashPipe[0], messageDigestBuf, 48);
read(checksumPipe[0], checksum, 16);
process_hash(16, checksum, messageDigestBuf);
memcpy(out, messageDigestBuf, 16);
// free(data);
free(messageDigestBuf);
free(checksum);
} }
if (pthread_join(thread_2, NULL) != 0) {
printf("Error joining thread 2\n");
exit(EXIT_FAILURE);
}
md2_print_buf(48, arg_1.messageDigestBuf);
// md2_print_buf(16, checksum);
// struct arg_hash arg_last = {16, checksum, messageDigestBuf};
process_nothread_hash(16, arg_2.checksum, arg_1.messageDigestBuf);
// md2_print_buf(16, messageDigestBuf);
memcpy(out, arg_1.messageDigestBuf, 16);
// free(data);
free(messageDigestBuf);
free(checksum);
// process_block_checksum(data, checksum, &l); // process_block_checksum(data, checksum, &l);
// process_block_hash(data, messageDigestBuf); // process_block_hash(data, messageDigestBuf);