From df9f09d9df351fa75f93ab855d993bc04d8412f8 Mon Sep 17 00:00:00 2001 From: finn Date: Fri, 15 Jul 2022 11:30:19 +0200 Subject: [PATCH 1/7] Implementation 1 created --- Implementierung/Makefile | 2 +- Implementierung/src/md2.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Implementierung/Makefile b/Implementierung/Makefile index 843d95b..228eb39 100644 --- a/Implementierung/Makefile +++ b/Implementierung/Makefile @@ -1,6 +1,6 @@ -SRC = src/main.c src/helper.c src/io.c src/md2.c src/md2_impls/md2_common.c src/md2_impls/md2_0.c src/md2_impls/md2_2.c +SRC = src/main.c src/helper.c src/io.c src/md2.c src/md2_impls/md2_common.c src/md2_impls/md2_0.c src/md2_impls/md2_2.c src/md2_impls/md2_1.c OBJ = ${subst src,build,${SRC:.c=.o}} CC = gcc CFLAGS = -Ilib -ggdb -std=c11 -g -Wall -Wextra -no-pie -O3 diff --git a/Implementierung/src/md2.c b/Implementierung/src/md2.c index da49453..de9b908 100644 --- a/Implementierung/src/md2.c +++ b/Implementierung/src/md2.c @@ -2,6 +2,7 @@ // include all implementations #include "../lib/md2_impls/md2_0.h" +#include "../lib/md2_impls/md2_1.h" #include "../lib/md2_impls/md2_2.h" md2_hash_func md2_hash; @@ -23,6 +24,11 @@ bool md2_choose_implementation(int i) { md2_checksum = md2_checksum_0; return true; + case 1: + md2_hash = md2_hash_1; + md2_checksum = md2_checksum_1; + return true; + case 2: md2_hash = md2_hash_2; md2_checksum = md2_checksum_2; From 8c997087e9d68caf443bd676a6ce5f687cf64976 Mon Sep 17 00:00:00 2001 From: finn Date: Fri, 15 Jul 2022 11:32:22 +0200 Subject: [PATCH 2/7] Implementation 1 created --- Implementierung/lib/md2_impls/md2_1.h | 23 ++++++++ Implementierung/src/md2_impls/md2_1.c | 75 +++++++++++++++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 Implementierung/lib/md2_impls/md2_1.h create mode 100644 Implementierung/src/md2_impls/md2_1.c diff --git a/Implementierung/lib/md2_impls/md2_1.h b/Implementierung/lib/md2_impls/md2_1.h new file mode 100644 index 0000000..8777277 --- /dev/null +++ b/Implementierung/lib/md2_impls/md2_1.h @@ -0,0 +1,23 @@ +#ifndef MD2_1_H +#define MD2_1_H + +#include +#include +#include +#include +#include +#include + +#include "../io.h" + +/** + * @brief This implementation optimizes small operations and uses SIMD + * + * @param _ unused + * @param filename name of the file to load + * @param out + */ +void md2_hash_1(size_t len, const uint8_t buf[len], uint8_t out[16]); +void md2_checksum_1(size_t len, uint8_t* buf); + +#endif // MD2_1_H \ No newline at end of file diff --git a/Implementierung/src/md2_impls/md2_1.c b/Implementierung/src/md2_impls/md2_1.c new file mode 100644 index 0000000..6e997ed --- /dev/null +++ b/Implementierung/src/md2_impls/md2_1.c @@ -0,0 +1,75 @@ +#include "../../lib/md2_impls/md2_1.h" + +#include "../../lib/md2_impls/md2_common.h" + +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++) { + 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]; + l = buf[len + j]; + } + } +} + +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; + len += paddingNeeded; + + // printf("len: %d\n", len); + + // +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); + + // === 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 + + // === 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]); + } + + u_int8_t t = 0; + + 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; + } + } + // printf("messageDigestBuf: \n"); + // printBuf(16, messageDigestBuf); + + memcpy(out, messageDigestBuf, 16); + + free(messageDigestBuf); + free(newBuf); +} \ No newline at end of file From 88ee99b37c8ad7e8dca8664fb10ca693fcd96a38 Mon Sep 17 00:00:00 2001 From: finn Date: Mon, 18 Jul 2022 21:22:03 +0200 Subject: [PATCH 3/7] Feat: SIMD of for loop --- Implementierung/src/md2_impls/md2_1.c | 100 ++++++++++++++++++++------ 1 file changed, 80 insertions(+), 20 deletions(-) diff --git a/Implementierung/src/md2_impls/md2_1.c b/Implementierung/src/md2_impls/md2_1.c index 6e997ed..d4e2943 100644 --- a/Implementierung/src/md2_impls/md2_1.c +++ b/Implementierung/src/md2_impls/md2_1.c @@ -1,12 +1,17 @@ #include "../../lib/md2_impls/md2_1.h" #include "../../lib/md2_impls/md2_common.h" +#include -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,27 +20,50 @@ 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); // +16 for the checksum - uint8_t* newBuf = calloc(len + 16, sizeof(uint8_t)); + uint8_t* newBuf = aligned_alloc(16, sizeof(uint8_t)*(len + 16)); + + for(size_t i = 0; i < 16; i++) { + newBuf[len + i] = 0; + } + + // uint8_t* newBuf = calloc(len + 16, sizeof(uint8_t)); // TODO: null check memcpy(newBuf, buf, len - paddingNeeded); - // printBuf(len + 16, newBuf); + //md2_print_buf(len + 16, newBuf); + + memcpy(newBuf + len - paddingNeeded, PADDING + paddingNeeded, paddingNeeded); - while (paddingNeeded > 0) { - newBuf[len - paddingNeeded] = originalPadding; - paddingNeeded--; - } // printf("buf with padding: "); - // printBuf(len + 16, newBuf); + //md2_print_buf(len + 16, newBuf); // === step 2 === md2_checksum_1(len, newBuf); @@ -44,25 +72,57 @@ void md2_hash_1(size_t len, const uint8_t buf[len], uint8_t out[16]) { // printBuf(len + 16, newBuf); // === step 3 === - uint8_t* messageDigestBuf = calloc(48, sizeof(uint8_t)); + uint8_t *messageDigestBuf = aligned_alloc(16, sizeof(uint8_t) * 48); // TODO: add null check + 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]; + __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); + + + /* + for (int j = 0; j < 16; j++) + { + //messageDigestBuf[16 + j] = newBuf[i * 16 + j]; messageDigestBuf[32 + j] = (messageDigestBuf[16 + j] ^ messageDigestBuf[j]); } + /* + vy = _mm_load_si128((__m128i*) (messageDigestBuf)); + _mm_xor_si128(vy, vx); + _mm_store_si128((__m128i*) messageDigestBuf, vy); + md2_print_buf(48, messageDigestBuf); + md2_print_buf(len + 16, newBuf); + /* + printf("newBuf: erstes Element:"); + printf(*(newBuf + i * 16)); + printf("mdb:"); + printf(*(messageDigestBuf + 16)); + */ + + 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"); From fda4ee592da04fc393cced62b622d7b9248475ba Mon Sep 17 00:00:00 2001 From: finn Date: Mon, 18 Jul 2022 21:28:38 +0200 Subject: [PATCH 4/7] Feat: added Nullchecks for malloc/calloc --- Implementierung/src/io.c | 4 ++ Implementierung/src/md2_impls/md2_0.c | 11 +++++- Implementierung/src/md2_impls/md2_1.c | 53 ++++++--------------------- Implementierung/src/md2_impls/md2_2.c | 12 ++++++ 4 files changed, 36 insertions(+), 44 deletions(-) diff --git a/Implementierung/src/io.c b/Implementierung/src/io.c index 339bd75..048aee7 100644 --- a/Implementierung/src/io.c +++ b/Implementierung/src/io.c @@ -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); diff --git a/Implementierung/src/md2_impls/md2_0.c b/Implementierung/src/md2_impls/md2_0.c index eeb4354..c344325 100644 --- a/Implementierung/src/md2_impls/md2_0.c +++ b/Implementierung/src/md2_impls/md2_0.c @@ -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 diff --git a/Implementierung/src/md2_impls/md2_1.c b/Implementierung/src/md2_impls/md2_1.c index d4e2943..ff2f1ff 100644 --- a/Implementierung/src/md2_impls/md2_1.c +++ b/Implementierung/src/md2_impls/md2_1.c @@ -45,74 +45,45 @@ void md2_hash_1(size_t len, const uint8_t buf[len], uint8_t out[16]) int paddingNeeded = 16 - (len & 15); len += paddingNeeded; - // printf("len: %d\n", len); - - // +16 for the checksum 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; } - - // uint8_t* newBuf = calloc(len + 16, sizeof(uint8_t)); - // TODO: null check + memcpy(newBuf, buf, len - paddingNeeded); - //md2_print_buf(len + 16, newBuf); - memcpy(newBuf + len - paddingNeeded, PADDING + paddingNeeded, paddingNeeded); - // printf("buf with padding: "); - //md2_print_buf(len + 16, newBuf); - // === step 2 === md2_checksum_1(len, newBuf); - // printf("buf with cecksum: "); - // printBuf(len + 16, newBuf); - // === step 3 === uint8_t *messageDigestBuf = aligned_alloc(16, sizeof(uint8_t) * 48); - // TODO: add null check + 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 __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); - - - /* - for (int j = 0; j < 16; j++) - { - //messageDigestBuf[16 + j] = newBuf[i * 16 + j]; - messageDigestBuf[32 + j] = - (messageDigestBuf[16 + j] ^ messageDigestBuf[j]); - } - /* - vy = _mm_load_si128((__m128i*) (messageDigestBuf)); - _mm_xor_si128(vy, vx); - _mm_store_si128((__m128i*) messageDigestBuf, vy); - md2_print_buf(48, messageDigestBuf); - md2_print_buf(len + 16, newBuf); - /* - printf("newBuf: erstes Element:"); - printf(*(newBuf + i * 16)); - printf("mdb:"); - printf(*(messageDigestBuf + 16)); - */ - - + u_int8_t t = 0; @@ -125,8 +96,6 @@ void md2_hash_1(size_t len, const uint8_t buf[len], uint8_t out[16]) t = (t + j) & 255; } } - // printf("messageDigestBuf: \n"); - // printBuf(16, messageDigestBuf); memcpy(out, messageDigestBuf, 16); diff --git a/Implementierung/src/md2_impls/md2_2.c b/Implementierung/src/md2_impls/md2_2.c index 1349c0f..b0955ba 100644 --- a/Implementierung/src/md2_impls/md2_2.c +++ b/Implementierung/src/md2_impls/md2_2.c @@ -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; From e516595eb288daadd597f8e7f03f3694d01ce636 Mon Sep 17 00:00:00 2001 From: finn Date: Wed, 20 Jul 2022 09:21:48 +0200 Subject: [PATCH 5/7] feat: return nullchecks updated --- Implementierung/src/io.c | 2 +- Implementierung/src/md2_impls/md2_0.c | 4 ++-- Implementierung/src/md2_impls/md2_1.c | 4 ++-- Implementierung/src/md2_impls/md2_2.c | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Implementierung/src/io.c b/Implementierung/src/io.c index 048aee7..942f235 100644 --- a/Implementierung/src/io.c +++ b/Implementierung/src/io.c @@ -36,7 +36,7 @@ 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; + return EXIT_FAILURE; } size_t bytesRead = diff --git a/Implementierung/src/md2_impls/md2_0.c b/Implementierung/src/md2_impls/md2_0.c index c344325..941b352 100644 --- a/Implementierung/src/md2_impls/md2_0.c +++ b/Implementierung/src/md2_impls/md2_0.c @@ -27,7 +27,7 @@ void md2_hash_0(size_t len, const uint8_t buf[len], uint8_t out[16]) { uint8_t* newBuf = calloc(len + 16, sizeof(uint8_t)); if (newBuf == NULL) { printf("Failure: calloc returns NULL"); - return -1; + return EXIT_FAILURE; } memcpy(newBuf, buf, len - paddingNeeded); @@ -50,7 +50,7 @@ void md2_hash_0(size_t len, const uint8_t buf[len], uint8_t out[16]) { uint8_t* messageDigestBuf = calloc(48, sizeof(uint8_t)); if (messageDigestBuf == NULL) { printf("Failure: calloc returns NULL"); - return -1; + return EXIT_FAILURE; } diff --git a/Implementierung/src/md2_impls/md2_1.c b/Implementierung/src/md2_impls/md2_1.c index ff2f1ff..d4fb80b 100644 --- a/Implementierung/src/md2_impls/md2_1.c +++ b/Implementierung/src/md2_impls/md2_1.c @@ -48,7 +48,7 @@ void md2_hash_1(size_t len, const uint8_t buf[len], uint8_t out[16]) uint8_t* newBuf = aligned_alloc(16, sizeof(uint8_t)*(len + 16)); if (newBuf == NULL) { printf("Failure: aligned_alloc returns NULL"); - return -1; + return EXIT_FAILURE; } for(size_t i = 0; i < 16; i++) { @@ -66,7 +66,7 @@ void md2_hash_1(size_t len, const uint8_t buf[len], uint8_t out[16]) uint8_t *messageDigestBuf = aligned_alloc(16, sizeof(uint8_t) * 48); if (messageDigestBuf == NULL) { printf("Failure: aligned_alloc returns NULL"); - return -1; + return EXIT_FAILURE; } for (size_t i = 0; i < 48; i++) { diff --git a/Implementierung/src/md2_impls/md2_2.c b/Implementierung/src/md2_impls/md2_2.c index b0955ba..5253ce7 100644 --- a/Implementierung/src/md2_impls/md2_2.c +++ b/Implementierung/src/md2_impls/md2_2.c @@ -52,7 +52,7 @@ void md2_hash_2(size_t len, const uint8_t buf[len], uint8_t out[16]) { uint8_t* messageDigestBuf = calloc(48, sizeof(uint8_t)); if (messageDigestBuf == NULL) { printf("Failure: calloc returns NULL"); - return -1; + return EXIT_FAILURE; } // === step 4 === @@ -60,13 +60,13 @@ void md2_hash_2(size_t len, const uint8_t buf[len], uint8_t out[16]) { uint8_t* checksum = calloc(16, sizeof(uint8_t)); if (checksum == NULL) { printf("Failure: calloc returns NULL"); - return -1; + return EXIT_FAILURE; } uint8_t* data = malloc(16); if (data == NULL) { printf("Failure: malloc returns NULL"); - return -1; + return EXIT_FAILURE; } size_t bytes_left_to_read = file_stat.st_size; size_t bytes_left_to_process = 0; From 558f5092818cf2e1d76f7b159234263fe8e794fa Mon Sep 17 00:00:00 2001 From: finn Date: Wed, 20 Jul 2022 12:11:16 +0200 Subject: [PATCH 6/7] feat: nullchecks updated --- Implementierung/src/io.c | 3 +-- Implementierung/src/main.c | 1 + Implementierung/src/md2_impls/md2_0.c | 6 ++---- Implementierung/src/md2_impls/md2_1.c | 6 ++---- Implementierung/src/md2_impls/md2_2.c | 3 +-- 5 files changed, 7 insertions(+), 12 deletions(-) diff --git a/Implementierung/src/io.c b/Implementierung/src/io.c index 942f235..3dbc7ff 100644 --- a/Implementierung/src/io.c +++ b/Implementierung/src/io.c @@ -35,8 +35,7 @@ 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 EXIT_FAILURE; + return; } size_t bytesRead = diff --git a/Implementierung/src/main.c b/Implementierung/src/main.c index 42b8e6f..f4e5fc8 100644 --- a/Implementierung/src/main.c +++ b/Implementierung/src/main.c @@ -1,4 +1,5 @@ #include +#include #include "../lib/helper.h" #include "../lib/io.h" diff --git a/Implementierung/src/md2_impls/md2_0.c b/Implementierung/src/md2_impls/md2_0.c index 941b352..93b7dee 100644 --- a/Implementierung/src/md2_impls/md2_0.c +++ b/Implementierung/src/md2_impls/md2_0.c @@ -26,8 +26,7 @@ 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)); if (newBuf == NULL) { - printf("Failure: calloc returns NULL"); - return EXIT_FAILURE; + return; } memcpy(newBuf, buf, len - paddingNeeded); @@ -49,8 +48,7 @@ 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)); if (messageDigestBuf == NULL) { - printf("Failure: calloc returns NULL"); - return EXIT_FAILURE; + return; } diff --git a/Implementierung/src/md2_impls/md2_1.c b/Implementierung/src/md2_impls/md2_1.c index d4fb80b..ac1d867 100644 --- a/Implementierung/src/md2_impls/md2_1.c +++ b/Implementierung/src/md2_impls/md2_1.c @@ -47,8 +47,7 @@ void md2_hash_1(size_t len, const uint8_t buf[len], uint8_t out[16]) uint8_t* newBuf = aligned_alloc(16, sizeof(uint8_t)*(len + 16)); if (newBuf == NULL) { - printf("Failure: aligned_alloc returns NULL"); - return EXIT_FAILURE; + return; } for(size_t i = 0; i < 16; i++) { @@ -65,8 +64,7 @@ void md2_hash_1(size_t len, const uint8_t buf[len], uint8_t out[16]) // === step 3 === uint8_t *messageDigestBuf = aligned_alloc(16, sizeof(uint8_t) * 48); if (messageDigestBuf == NULL) { - printf("Failure: aligned_alloc returns NULL"); - return EXIT_FAILURE; + return; } for (size_t i = 0; i < 48; i++) { diff --git a/Implementierung/src/md2_impls/md2_2.c b/Implementierung/src/md2_impls/md2_2.c index 5253ce7..279af73 100644 --- a/Implementierung/src/md2_impls/md2_2.c +++ b/Implementierung/src/md2_impls/md2_2.c @@ -51,8 +51,7 @@ 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 EXIT_FAILURE; + return; } // === step 4 === From c28c2d16d00488afb434d31e77debb2698292e46 Mon Sep 17 00:00:00 2001 From: finn Date: Wed, 20 Jul 2022 12:16:01 +0200 Subject: [PATCH 7/7] feat: md2_2 nullcheck updated --- Implementierung/src/md2_impls/md2_2.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Implementierung/src/md2_impls/md2_2.c b/Implementierung/src/md2_impls/md2_2.c index 279af73..90fd232 100644 --- a/Implementierung/src/md2_impls/md2_2.c +++ b/Implementierung/src/md2_impls/md2_2.c @@ -58,14 +58,12 @@ void md2_hash_2(size_t len, const uint8_t buf[len], uint8_t out[16]) { uint8_t l = 0; uint8_t* checksum = calloc(16, sizeof(uint8_t)); if (checksum == NULL) { - printf("Failure: calloc returns NULL"); - return EXIT_FAILURE; + return; } uint8_t* data = malloc(16); if (data == NULL) { - printf("Failure: malloc returns NULL"); - return EXIT_FAILURE; + return; } size_t bytes_left_to_read = file_stat.st_size; size_t bytes_left_to_process = 0;