Compare commits
No commits in common. "48dd44663829f0dbad0bd71d93876f99ba78055f" and "186ea1f272dc30270bf55fea4b3f1fa32cf18910" have entirely different histories.
48dd446638
...
186ea1f272
18 changed files with 66 additions and 481 deletions
3
.vscode/settings.json
vendored
3
.vscode/settings.json
vendored
|
|
@ -13,8 +13,7 @@
|
|||
"array": "c",
|
||||
"md2.h": "c",
|
||||
"io.h": "c",
|
||||
"md2_0.h": "c",
|
||||
"md2_common.h": "c"
|
||||
"md2_0.h": "c"
|
||||
},
|
||||
"editor.formatOnSave": true,
|
||||
"C_Cpp.default.includePath": [
|
||||
|
|
|
|||
5
.vscode/tasks.json
vendored
5
.vscode/tasks.json
vendored
|
|
@ -9,11 +9,8 @@
|
|||
"-g",
|
||||
"${fileDirname}/*.c",
|
||||
"${fileDirname}/md2_impls/*.c",
|
||||
"${fileDirname}/md2_impls/md2_reference/*.c",
|
||||
"-o",
|
||||
"${fileDirname}/../md2",
|
||||
"-D",
|
||||
"MD2_DETAILED_BENCHMARK"
|
||||
"${fileDirname}/../md2"
|
||||
],
|
||||
"options": {
|
||||
"cwd": "${fileDirname}"
|
||||
|
|
|
|||
|
|
@ -1,20 +1,12 @@
|
|||
|
||||
|
||||
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_1.c src/md2_impls/md2_2.c src/md2_impls/md2_3.c src/md2_impls/md2_reference/md2_reference.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_1.c src/md2_impls/md2_2.c src/md2_impls/md2_3.c
|
||||
OBJ = ${subst src,build,${SRC:.c=.o}}
|
||||
CC = gcc
|
||||
DETAILED_BENCHMARK ?= 0
|
||||
CFLAGS = -Ilib -std=c11 -Wall -Wextra -O3
|
||||
ifeq ($(DETAILED_BENCHMARK), true)
|
||||
CFLAGS += -DMD2_DETAILED_BENCHMARK
|
||||
endif
|
||||
CFLAGS = -Ilib -ggdb -std=c11 -g -Wall -Wextra -no-pie -O3
|
||||
LDFLAGS = -pthread
|
||||
TESTFILES = t/1 t/2 t/5 t/10 t/20 t/50 t/100 t/1000 t/2000 t/5000 t/10000
|
||||
TESTFILES = t/10000 t/1 t/10 t/100 t/1000 #t/2000 t/5000 t/10000
|
||||
TESTFILES_SIZES = ${subst t/,,${TESTFILES}}
|
||||
BLUE=\033[1;36m
|
||||
RED=\033[1;31m
|
||||
GREEN=\033[1;32m
|
||||
NC=\033[0m
|
||||
|
||||
all: md2
|
||||
|
||||
|
|
@ -26,77 +18,45 @@ help:
|
|||
@echo
|
||||
@echo Available targets:
|
||||
@echo - all: build everything
|
||||
@echo " When DETAILED_BENCHMARK=true is passed, the detailed benchmarks are enabled."
|
||||
@echo " This will decrease the overall performance of the program."
|
||||
@echo - clean: clean distfiles
|
||||
@echo - help: show this help
|
||||
@echo - benchmarks: run benchmarks
|
||||
@echo - valgrind-check: run checks with valgrind
|
||||
@echo - benchmarks: run benchmarks (only works on linux!)
|
||||
|
||||
build/%.o: src/%.c
|
||||
@mkdir -p build/md2_impls/md2_reference
|
||||
@mkdir -p build/md2_impls
|
||||
${CC} -c ${CFLAGS} -o $@ $<
|
||||
|
||||
md2: ${OBJ}
|
||||
${CC} -o $@ $(OBJ) ${LDFLAGS}
|
||||
|
||||
t/%:
|
||||
@mkdir -p t
|
||||
@echo
|
||||
@echo -e "${BLUE}=== Generating ${subst t/,,$@}MB of random data... ===${NC}"
|
||||
@echo "=== Generating ${subst t/,,$@}MB of random data... ==="
|
||||
dd if=/dev/random of=$@ bs=1M count=${subst t/,,$@} status=progress
|
||||
@echo -e "${BLUE}=== done ===${NC}"
|
||||
@echo "=== done ==="
|
||||
@echo
|
||||
|
||||
benchmarks.csv: md2 ${TESTFILES}
|
||||
@rm -f $@
|
||||
@echo -n "Implementierung" > $@
|
||||
@for t in $(TESTFILES_SIZES); do \
|
||||
echo -n ";$$t" >> $@; \
|
||||
done
|
||||
@echo "" >> $@
|
||||
|
||||
@for i in 0 1 2 3 4; do \
|
||||
@for i in 0 1 2 3; do \
|
||||
echo ;\
|
||||
echo -e "${BLUE}=== Testing implementation $$i ===${NC}";\
|
||||
echo -n "Implementierung-$$i" >> $@; \
|
||||
echo "=== Testing implementation $$i ===";\
|
||||
for t in $(TESTFILES_SIZES); do \
|
||||
echo -n "- with $${t}MB ... "; \
|
||||
if ! rr=$$(./md2 t/$${t} -B1 -V$${i}); then \
|
||||
echo; \
|
||||
echo -e "${RED}ERROR -> SKIPPED!${NC}"; \
|
||||
echo -n ";0" >> $@; \
|
||||
echo "SKIPPED!"; \
|
||||
echo "$${i};$${t};0" >> $@; \
|
||||
else \
|
||||
r=$$(echo $$rr | xargs | sed -e 's/.*took \(.*\) seconds.*/\1/'); \
|
||||
echo "$${r}s"; \
|
||||
echo -n ";$${r}" >> $@; \
|
||||
echo "$${i};$${t};$${r}" >> $@; \
|
||||
fi; \
|
||||
done; \
|
||||
echo "" >> $@; \
|
||||
echo -e "${BLUE}=== done ===${NC}";\
|
||||
echo "=== done ===";\
|
||||
echo;\
|
||||
done
|
||||
|
||||
|
||||
benchmarks: benchmarks.csv
|
||||
|
||||
valgrind-check: md2 t/3
|
||||
|
||||
@for i in 0 1 2 3 4; do \
|
||||
echo; \
|
||||
echo -e "${BLUE}=== Testing implementation $$i ===${NC}";\
|
||||
if ! valgrind --error-exitcode=1 --leak-check=full --tool=memcheck -s ./md2 t/3 -V$$i -B1; then \
|
||||
echo -e "${RED}ERROR found! (see above)${NC}"; \
|
||||
exit 1; \
|
||||
fi; \
|
||||
echo -e "${BLUE}=== done ===${NC}";\
|
||||
echo; \
|
||||
done
|
||||
|
||||
@if ! valgrind -s ./md2 -T; then \
|
||||
echo -e "${RED}ERROR found! (see above)${NC}"; \
|
||||
exit 1;\
|
||||
fi
|
||||
|
||||
@echo -e "${GREEN}=== all implementations PASSED valgrind ===${NC}"
|
||||
|
||||
.PHONY: all clean help benchmarks lint
|
||||
.PHONY: all clean help benchmarks
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
Implementierung;1;2;5;10;20;50;100
|
||||
Implementierung-0;0.092604;0.172133;0.422083;0.845732;1.687540;4.232703;8.501036
|
||||
Implementierung-1;0.084314;0.167799;0.431772;0.843568;1.708024;5.208127;10.147011
|
||||
Implementierung-2;0.097700;0.203661;0.567091;1.062895;2.141933;5.440520;10.342529
|
||||
Implementierung-3;0.099547;0.206932;0.546978;1.017148;2.077730;5.067994;9.962873
|
||||
Implementierung-4;0.117680;0.239349;0.616783;1.200482;2.356915;5.856234;11.647842
|
||||
|
|
|
@ -36,8 +36,6 @@ struct configuration {
|
|||
enum argumentParseResult parseArguments(int argc, char** argv,
|
||||
struct configuration* c);
|
||||
|
||||
double current_time();
|
||||
|
||||
/**
|
||||
* @brief Run an md2_hash_func with benchmark timing
|
||||
*
|
||||
|
|
|
|||
|
|
@ -8,6 +8,15 @@
|
|||
#include <string.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
#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);
|
||||
|
||||
|
|
|
|||
|
|
@ -10,6 +10,13 @@
|
|||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
|
||||
/**
|
||||
* @brief Diese Implementierung benutzt Threads zum Berechnen des Hashs
|
||||
*
|
||||
* @param len
|
||||
* @param buf
|
||||
* @param out
|
||||
*/
|
||||
void md2_hash_3(size_t len, const uint8_t buf[len], uint8_t out[16]);
|
||||
|
||||
#endif // MD2_3_H
|
||||
|
|
@ -9,42 +9,6 @@
|
|||
#include <string.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
#include "../helper.h"
|
||||
|
||||
#ifdef MD2_DETAILED_BENCHMARK
|
||||
#define md2_process_detailed_benchmark_step_if_defined(step) \
|
||||
md2_process_detailed_benchmark_step(step);
|
||||
|
||||
#define md2_print_detailed_benchmark_result_if_defined \
|
||||
md2_print_detailed_benchmark_result();
|
||||
#else
|
||||
#define md2_process_detailed_benchmark_step_if_defined(step)
|
||||
#define md2_print_detailed_benchmark_result_if_defined
|
||||
#endif // MD2_DETAILED_BENCHMARK
|
||||
|
||||
#define CHECKSUM_START_MARK \
|
||||
md2_process_detailed_benchmark_step_if_defined(CHECKSUM_START)
|
||||
#define CHECKSUM_END_MARK \
|
||||
md2_process_detailed_benchmark_step_if_defined(CHECKSUM_END)
|
||||
#define FIRST_LOOP_START_MARK \
|
||||
md2_process_detailed_benchmark_step_if_defined(FIRST_LOOP_START)
|
||||
#define FIRST_LOOP_END_MARK \
|
||||
md2_process_detailed_benchmark_step_if_defined(FIRST_LOOP_END)
|
||||
#define SECOND_LOOP_START_MARK \
|
||||
md2_process_detailed_benchmark_step_if_defined(SECOND_LOOP_START)
|
||||
#define SECOND_LOOP_END_MARK \
|
||||
md2_process_detailed_benchmark_step_if_defined(SECOND_LOOP_END)
|
||||
#define END_MARK md2_print_detailed_benchmark_result_if_defined
|
||||
|
||||
enum md2_detailed_benchmark_step {
|
||||
CHECKSUM_START = 0,
|
||||
CHECKSUM_END,
|
||||
FIRST_LOOP_START,
|
||||
FIRST_LOOP_END,
|
||||
SECOND_LOOP_START,
|
||||
SECOND_LOOP_END
|
||||
};
|
||||
|
||||
/**
|
||||
* @brief Some digits of pi
|
||||
*
|
||||
|
|
@ -59,8 +23,4 @@ extern unsigned char MD2_PI_SUBST[256];
|
|||
*/
|
||||
void md2_print_buf(size_t len, uint8_t buf[len]);
|
||||
|
||||
void md2_process_detailed_benchmark_step(enum md2_detailed_benchmark_step step);
|
||||
|
||||
void md2_print_detailed_benchmark_result();
|
||||
|
||||
#endif // MD2_COMMON_H
|
||||
|
|
@ -1,54 +0,0 @@
|
|||
#ifndef MD2_REF_H
|
||||
#define MD2_REF_H
|
||||
|
||||
/***********************************************************
|
||||
* WICHTIG:
|
||||
* Diese Implementierung wurde nicht von uns geschrieben,
|
||||
* sondern zu vergleichszwechen von der Referenz übernommen.
|
||||
* Quelle: https://datatracker.ietf.org/doc/html/rfc1319
|
||||
**********************************************************/
|
||||
|
||||
#ifndef PROTOTYPES
|
||||
#define PROTOTYPES 0
|
||||
#endif
|
||||
|
||||
/* POINTER defines a generic pointer type */
|
||||
typedef unsigned char *POINTER;
|
||||
|
||||
/* UINT2 defines a two byte word */
|
||||
typedef unsigned short int UINT2;
|
||||
|
||||
/* UINT4 defines a four byte word */
|
||||
typedef unsigned long int UINT4;
|
||||
|
||||
/* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
|
||||
If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it
|
||||
returns an empty list.
|
||||
*/
|
||||
#if PROTOTYPES
|
||||
#define PROTO_LIST(list) list
|
||||
#else
|
||||
#define PROTO_LIST(list) ()
|
||||
#endif
|
||||
|
||||
typedef struct {
|
||||
unsigned char state[16]; /* state */
|
||||
unsigned char checksum[16]; /* checksum */
|
||||
unsigned int count; /* number of bytes, modulo 16 */
|
||||
unsigned char buffer[16]; /* input buffer */
|
||||
} MD2_CTX;
|
||||
|
||||
void MD2Init PROTO_LIST((MD2_CTX *));
|
||||
void MD2Update PROTO_LIST((MD2_CTX *, unsigned char *, unsigned int));
|
||||
void MD2Final PROTO_LIST((unsigned char[16], MD2_CTX *));
|
||||
|
||||
#include <stdbool.h>
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
void md2_hash_ref(size_t len, const uint8_t buf[len], uint8_t out[16]);
|
||||
|
||||
#endif // MD2_REF_H
|
||||
|
|
@ -23,20 +23,7 @@ void help(char *progname) {
|
|||
-V, --version <version> use a specific implementation\n\
|
||||
-B, --benchmark [repetitons] benchmark the execution and optionally repeat it\n\
|
||||
-T, --test run self-test. If set, no file is needed\n\
|
||||
-h, --help print this help page\n\
|
||||
\n\
|
||||
<version> is an integer between 0 and 4.\n\
|
||||
0: naive implementation\n\
|
||||
1: optimized implementation\n\
|
||||
2: memory efficient implementation\n\
|
||||
3: threaded implementation\n\
|
||||
4: reference implementation\n"
|
||||
#ifdef MD2_DETAILED_BENCHMARK
|
||||
"\n\
|
||||
\n\033[1;33mWARNING: Detailed benchmarking is enabled. This will show detailed benchmaring results\n\
|
||||
after each hash calculation but will decrease the overall performance.\033[0m"
|
||||
#endif // MD2_DETAILED_BENCHMARK
|
||||
"\n",
|
||||
-h, --help print this help page\n",
|
||||
progname);
|
||||
}
|
||||
|
||||
|
|
@ -108,7 +95,7 @@ enum argumentParseResult parseArguments(int argc, char **argv,
|
|||
return RESULT_OK;
|
||||
}
|
||||
|
||||
double current_time() {
|
||||
double current_time(void) {
|
||||
struct timespec t;
|
||||
clock_gettime(CLOCK_MONOTONIC, &t);
|
||||
return t.tv_sec + t.tv_nsec * 1e-9;
|
||||
|
|
|
|||
|
|
@ -35,8 +35,7 @@ uint8_t* read_file(const char* path, size_t* size) {
|
|||
|
||||
struct sysinfo info;
|
||||
int r = sysinfo(&info);
|
||||
|
||||
if (r != 0 || info.freeram < (unsigned long)(statOfFile.st_size * 2)) {
|
||||
if (r != 0 || info.freeram < (unsigned long)statOfFile.st_size * 2) {
|
||||
errno = ENOMEM;
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -47,9 +46,10 @@ uint8_t* read_file(const char* path, size_t* size) {
|
|||
return NULL;
|
||||
}
|
||||
|
||||
size_t bytes_read = fread(data, 1, statOfFile.st_size, f);
|
||||
|
||||
if (bytes_read == 0 || ferror(f)) {
|
||||
size_t bytesRead =
|
||||
fread(data, statOfFile.st_blksize, statOfFile.st_blocks, f);
|
||||
// size_t bytesRead = fread(data, sizeof(uint8_t), statOfFile.st_size, f);
|
||||
if (bytesRead != 0 && !feof(f)) {
|
||||
fclose(f);
|
||||
if (errno == 0) errno = EIO;
|
||||
return NULL;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
#include "../lib/md2_impls/md2_1.h"
|
||||
#include "../lib/md2_impls/md2_2.h"
|
||||
#include "../lib/md2_impls/md2_3.h"
|
||||
#include "../lib/md2_impls/md2_reference/md2_reference.h"
|
||||
|
||||
md2_hash_func md2_hash;
|
||||
md2_checksum_func md2_checksum;
|
||||
|
|
@ -41,11 +40,6 @@ bool md2_choose_implementation(int i) {
|
|||
md2_checksum = NULL;
|
||||
return true;
|
||||
|
||||
case 4:
|
||||
md2_hash = md2_hash_ref;
|
||||
md2_checksum = NULL;
|
||||
return true;
|
||||
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,9 +40,7 @@ void md2_hash_0(size_t len, const uint8_t buf[len], uint8_t out[16]) {
|
|||
// printBuf(len + 16, newBuf);
|
||||
|
||||
// === step 2 ===
|
||||
CHECKSUM_START_MARK
|
||||
md2_checksum_0(len, newBuf);
|
||||
CHECKSUM_END_MARK
|
||||
|
||||
// printf("buf with cecksum: ");
|
||||
// printBuf(len + 16, newBuf);
|
||||
|
|
@ -53,32 +51,28 @@ void md2_hash_0(size_t len, const uint8_t buf[len], uint8_t out[16]) {
|
|||
return;
|
||||
}
|
||||
|
||||
|
||||
// === step 4 ===
|
||||
// <= because we need to hash the last block too
|
||||
for (size_t i = 0; i <= (len + 16) / 16 - 1; i++) {
|
||||
FIRST_LOOP_START_MARK
|
||||
for (int j = 0; j < 16; j++) {
|
||||
messageDigestBuf[16 + j] = newBuf[i * 16 + j];
|
||||
messageDigestBuf[32 + j] =
|
||||
(messageDigestBuf[16 + j] ^ messageDigestBuf[j]);
|
||||
}
|
||||
FIRST_LOOP_END_MARK
|
||||
|
||||
u_int8_t t = 0;
|
||||
|
||||
SECOND_LOOP_START_MARK
|
||||
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) % 256;
|
||||
}
|
||||
SECOND_LOOP_END_MARK
|
||||
}
|
||||
// printf("messageDigestBuf: \n");
|
||||
// printBuf(16, messageDigestBuf);
|
||||
|
||||
END_MARK
|
||||
memcpy(out, messageDigestBuf, 16);
|
||||
|
||||
free(messageDigestBuf);
|
||||
|
|
|
|||
|
|
@ -1,14 +1,17 @@
|
|||
#include "../../lib/md2_impls/md2_1.h"
|
||||
|
||||
#include "../../lib/md2_impls/md2_common.h"
|
||||
#include <immintrin.h>
|
||||
|
||||
#include "../../lib/md2_impls/md2_common.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];
|
||||
|
|
@ -36,17 +39,18 @@ static uint8_t PADDING[17][16] = {
|
|||
{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]) {
|
||||
void md2_hash_1(size_t len, const uint8_t buf[len], uint8_t out[16])
|
||||
{
|
||||
// === step 1 ===
|
||||
int paddingNeeded = 16 - (len & 15);
|
||||
len += paddingNeeded;
|
||||
|
||||
uint8_t *newBuf = aligned_alloc(16, sizeof(uint8_t) * (len + 16));
|
||||
uint8_t* newBuf = aligned_alloc(16, sizeof(uint8_t)*(len + 16));
|
||||
if (newBuf == NULL) {
|
||||
return;
|
||||
}
|
||||
|
||||
for (size_t i = 0; i < 16; i++) {
|
||||
for(size_t i = 0; i < 16; i++) {
|
||||
newBuf[len + i] = 0;
|
||||
}
|
||||
|
||||
|
|
@ -55,9 +59,7 @@ void md2_hash_1(size_t len, const uint8_t buf[len], uint8_t out[16]) {
|
|||
memcpy(newBuf + len - paddingNeeded, PADDING + paddingNeeded, paddingNeeded);
|
||||
|
||||
// === step 2 ===
|
||||
CHECKSUM_START_MARK
|
||||
md2_checksum_1(len, newBuf);
|
||||
CHECKSUM_END_MARK
|
||||
|
||||
// === step 3 ===
|
||||
uint8_t *messageDigestBuf = aligned_alloc(16, sizeof(uint8_t) * 48);
|
||||
|
|
@ -72,28 +74,27 @@ void md2_hash_1(size_t len, const uint8_t buf[len], uint8_t out[16]) {
|
|||
// === step 4 ===
|
||||
__m128i vx;
|
||||
__m128i vy;
|
||||
for (size_t i = 0; i <= (len + 16) / 16 - 1; i++) {
|
||||
FIRST_LOOP_START_MARK
|
||||
vx = _mm_load_si128((__m128i *)(newBuf + i * 16));
|
||||
_mm_store_si128((__m128i *)(messageDigestBuf + 16), vx);
|
||||
vy = _mm_load_si128((__m128i *)(messageDigestBuf));
|
||||
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);
|
||||
FIRST_LOOP_END_MARK
|
||||
_mm_store_si128((__m128i*) (messageDigestBuf + 32), vy);
|
||||
|
||||
|
||||
u_int8_t t = 0;
|
||||
|
||||
SECOND_LOOP_START_MARK
|
||||
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) & 255;
|
||||
}
|
||||
SECOND_LOOP_END_MARK
|
||||
}
|
||||
|
||||
END_MARK
|
||||
memcpy(out, messageDigestBuf, 16);
|
||||
|
||||
free(messageDigestBuf);
|
||||
|
|
|
|||
|
|
@ -3,23 +3,19 @@
|
|||
#include "../../lib/md2_impls/md2_common.h"
|
||||
|
||||
void process_block_hash(uint8_t block[16], uint8_t messageDigestBuf[48]) {
|
||||
FIRST_LOOP_START_MARK
|
||||
for (int j = 0; j < 16; j++) {
|
||||
messageDigestBuf[16 + j] = block[j];
|
||||
messageDigestBuf[32 + j] = (messageDigestBuf[16 + j] ^ messageDigestBuf[j]);
|
||||
}
|
||||
FIRST_LOOP_END_MARK
|
||||
|
||||
u_int8_t t = 0;
|
||||
|
||||
SECOND_LOOP_START_MARK
|
||||
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) % 256;
|
||||
}
|
||||
SECOND_LOOP_END_MARK
|
||||
}
|
||||
|
||||
void process_block_checksum(uint8_t block[16], uint8_t checksum[16],
|
||||
|
|
@ -78,24 +74,21 @@ void md2_hash_2(size_t len, const uint8_t buf[len], uint8_t out[16]) {
|
|||
return;
|
||||
}
|
||||
|
||||
CHECKSUM_START_MARK
|
||||
process_block_checksum(data, checksum, &l);
|
||||
CHECKSUM_END_MARK
|
||||
process_block_hash(data, messageDigestBuf);
|
||||
|
||||
bytes_left_to_read -= bytes_left_to_process;
|
||||
};
|
||||
|
||||
fclose(file);
|
||||
|
||||
apply_padding(bytes_left_to_process % 16, data);
|
||||
process_block_checksum(data, checksum, &l);
|
||||
process_block_hash(data, messageDigestBuf);
|
||||
|
||||
process_block_hash(checksum, messageDigestBuf);
|
||||
|
||||
END_MARK
|
||||
memcpy(out, messageDigestBuf, 16);
|
||||
|
||||
fclose(file);
|
||||
free(data);
|
||||
free(messageDigestBuf);
|
||||
free(checksum);
|
||||
|
|
|
|||
|
|
@ -10,24 +10,20 @@ struct thread_args {
|
|||
void process_nothread_hash(size_t len, const uint8_t buf[len],
|
||||
uint8_t messageDigestBuf[48]) {
|
||||
for (size_t i = 0; i < (len + 16) / 16 - 1; i++) {
|
||||
FIRST_LOOP_START_MARK
|
||||
for (int j = 0; j < 16; j++) {
|
||||
messageDigestBuf[16 + j] = buf[i * 16 + j];
|
||||
messageDigestBuf[32 + j] =
|
||||
(messageDigestBuf[16 + j] ^ messageDigestBuf[j]);
|
||||
}
|
||||
FIRST_LOOP_END_MARK
|
||||
|
||||
u_int8_t t = 0;
|
||||
|
||||
SECOND_LOOP_START_MARK
|
||||
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) % 256;
|
||||
}
|
||||
SECOND_LOOP_END_MARK
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -52,7 +48,7 @@ void* process_checksum(void* threasdArgs) {
|
|||
}
|
||||
|
||||
uint8_t l = 0;
|
||||
CHECKSUM_START_MARK
|
||||
|
||||
for (size_t i = 0; i < args->len / 16; i++) {
|
||||
for (int j = 0; j < 16; j++) {
|
||||
u_int8_t c = args->buf[i * 16 + j];
|
||||
|
|
@ -60,7 +56,6 @@ void* process_checksum(void* threasdArgs) {
|
|||
l = checksum[j] ^= MD2_PI_SUBST[c ^ l];
|
||||
}
|
||||
}
|
||||
CHECKSUM_END_MARK
|
||||
pthread_exit(checksum);
|
||||
}
|
||||
|
||||
|
|
@ -112,11 +107,8 @@ void md2_hash_3(size_t len, const uint8_t buf[len], uint8_t out[16]) {
|
|||
}
|
||||
|
||||
process_nothread_hash(16, checksum, messageDigestBuf);
|
||||
|
||||
END_MARK
|
||||
memcpy(out, messageDigestBuf, 16);
|
||||
|
||||
free(messageDigestBuf);
|
||||
free(checksum);
|
||||
free(newBuf);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,35 +26,4 @@ void md2_print_buf(size_t len, uint8_t buf[len]) {
|
|||
printf("'%02x',", buf[i]);
|
||||
}
|
||||
printf("\n");
|
||||
}
|
||||
|
||||
static double detailed_benchmark_timestamps[6] = {0, 0, 0, 0, 0, 0};
|
||||
static double detailed_benchmark_times[3] = {0, 0, 0};
|
||||
|
||||
void md2_process_detailed_benchmark_step(
|
||||
enum md2_detailed_benchmark_step step) {
|
||||
switch (step) {
|
||||
case CHECKSUM_START:
|
||||
case FIRST_LOOP_START:
|
||||
case SECOND_LOOP_START:
|
||||
detailed_benchmark_timestamps[step] = current_time();
|
||||
return;
|
||||
|
||||
case CHECKSUM_END:
|
||||
case FIRST_LOOP_END:
|
||||
case SECOND_LOOP_END:
|
||||
detailed_benchmark_timestamps[step] = current_time();
|
||||
detailed_benchmark_times[step / 2] +=
|
||||
detailed_benchmark_timestamps[step] -
|
||||
detailed_benchmark_timestamps[step - 1];
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
void md2_print_detailed_benchmark_result() {
|
||||
printf("Detailed benchmarking results:\n");
|
||||
printf(" Checksum: %f\n", detailed_benchmark_times[0]);
|
||||
printf(" First loop: %f\n", detailed_benchmark_times[1]);
|
||||
printf(" Second loop: %f\n", detailed_benchmark_times[2]);
|
||||
printf("\n");
|
||||
}
|
||||
|
|
@ -1,215 +0,0 @@
|
|||
/* MD2C.C - RSA Data Security, Inc., MD2 message-digest algorithm
|
||||
*/
|
||||
|
||||
/***********************************************************
|
||||
* WICHTIG:
|
||||
* Diese Implementierung wurde nicht von uns geschrieben,
|
||||
* sondern zu vergleichszwechen von der Referenz übernommen.
|
||||
* Quelle: https://datatracker.ietf.org/doc/html/rfc1319
|
||||
**********************************************************/
|
||||
|
||||
/* Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All
|
||||
rights reserved.
|
||||
|
||||
License to copy and use this software is granted for
|
||||
non-commercial Internet Privacy-Enhanced Mail provided that it is
|
||||
identified as the "RSA Data Security, Inc. MD2 Message Digest
|
||||
Algorithm" in all material mentioning or referencing this software
|
||||
or this function.
|
||||
|
||||
RSA Data Security, Inc. makes no representations concerning either
|
||||
the merchantability of this software or the suitability of this
|
||||
software for any particular purpose. It is provided "as is"
|
||||
without express or implied warranty of any kind.
|
||||
|
||||
These notices must be retained in any copies of any part of this
|
||||
documentation and/or software.
|
||||
*/
|
||||
|
||||
#include "../../../lib/md2_impls/md2_reference/md2_reference.h"
|
||||
|
||||
static void MD2Transform PROTO_LIST((unsigned char[16], unsigned char[16],
|
||||
unsigned char[16]));
|
||||
static void MD2_memcpy PROTO_LIST((POINTER, POINTER, unsigned int));
|
||||
static void MD2_memset PROTO_LIST((POINTER, int, unsigned int));
|
||||
|
||||
/* Permutation of 0..255 constructed from the digits of pi. It gives a
|
||||
"random" nonlinear byte substitution operation.
|
||||
*/
|
||||
static unsigned char PI_SUBST[256] = {
|
||||
41, 46, 67, 201, 162, 216, 124, 1, 61, 54, 84, 161, 236, 240, 6,
|
||||
19, 98, 167, 5, 243, 192, 199, 115, 140, 152, 147, 43, 217, 188, 76,
|
||||
130, 202, 30, 155, 87, 60, 253, 212, 224, 22, 103, 66, 111, 24, 138,
|
||||
23, 229, 18, 190, 78, 196, 214, 218, 158, 222, 73, 160, 251, 245, 142,
|
||||
187, 47, 238, 122, 169, 104, 121, 145, 21, 178, 7, 63, 148, 194, 16,
|
||||
137, 11, 34, 95, 33, 128, 127, 93, 154, 90, 144, 50, 39, 53, 62,
|
||||
204, 231, 191, 247, 151, 3, 255, 25, 48, 179, 72, 165, 181, 209, 215,
|
||||
94, 146, 42, 172, 86, 170, 198, 79, 184, 56, 210, 150, 164, 125, 182,
|
||||
118, 252, 107, 226, 156, 116, 4, 241, 69, 157, 112, 89, 100, 113, 135,
|
||||
32, 134, 91, 207, 101, 230, 45, 168, 2, 27, 96, 37, 173, 174, 176,
|
||||
185, 246, 28, 70, 97, 105, 52, 64, 126, 15, 85, 71, 163, 35, 221,
|
||||
81, 175, 58, 195, 92, 249, 206, 186, 197, 234, 38, 44, 83, 13, 110,
|
||||
133, 40, 132, 9, 211, 223, 205, 244, 65, 129, 77, 82, 106, 220, 55,
|
||||
200, 108, 193, 171, 250, 36, 225, 123, 8, 12, 189, 177, 74, 120, 136,
|
||||
149, 139, 227, 99, 232, 109, 233, 203, 213, 254, 59, 0, 29, 57, 242,
|
||||
239, 183, 14, 102, 88, 208, 228, 166, 119, 114, 248, 235, 117, 75, 10,
|
||||
49, 68, 80, 180, 143, 237, 31, 26, 219, 153, 141, 51, 159, 17, 131,
|
||||
20};
|
||||
|
||||
static unsigned char *PADDING[] = {
|
||||
(unsigned char *)"",
|
||||
(unsigned char *)"\001",
|
||||
(unsigned char *)"\002\002",
|
||||
(unsigned char *)"\003\003\003",
|
||||
(unsigned char *)"\004\004\004\004",
|
||||
(unsigned char *)"\005\005\005\005\005",
|
||||
(unsigned char *)"\006\006\006\006\006\006",
|
||||
(unsigned char *)"\007\007\007\007\007\007\007",
|
||||
(unsigned char *)"\010\010\010\010\010\010\010\010",
|
||||
(unsigned char *)"\011\011\011\011\011\011\011\011\011",
|
||||
(unsigned char *)"\012\012\012\012\012\012\012\012\012\012",
|
||||
(unsigned char *)"\013\013\013\013\013\013\013\013\013\013\013",
|
||||
(unsigned char *)"\014\014\014\014\014\014\014\014\014\014\014\014",
|
||||
(unsigned char *)"\015\015\015\015\015\015\015\015\015\015\015\015\015",
|
||||
(unsigned char *)"\016\016\016\016\016\016\016\016\016\016\016\016\016\016",
|
||||
(unsigned char
|
||||
*)"\017\017\017\017\017\017\017\017\017\017\017\017\017\017\017",
|
||||
(unsigned char
|
||||
*)"\020\020\020\020\020\020\020\020\020\020\020\020\020\020\020\020"};
|
||||
|
||||
void md2_hash_ref(size_t len, const uint8_t buf[len], uint8_t out[16]) {
|
||||
MD2_CTX context;
|
||||
|
||||
MD2Init(&context);
|
||||
MD2Update(&context, buf, len);
|
||||
MD2Final(out, &context);
|
||||
}
|
||||
|
||||
/* MD2 initialization. Begins an MD2 operation, writing a new context.
|
||||
*/
|
||||
void MD2Init(context) MD2_CTX *context; /* context */
|
||||
{
|
||||
context->count = 0;
|
||||
MD2_memset((POINTER)context->state, 0, sizeof(context->state));
|
||||
MD2_memset((POINTER)context->checksum, 0, sizeof(context->checksum));
|
||||
}
|
||||
|
||||
/* MD2 block update operation. Continues an MD2 message-digest
|
||||
operation, processing another message block, and updating the
|
||||
context.
|
||||
*/
|
||||
void MD2Update(context, input, inputLen) MD2_CTX *context; /* context */
|
||||
unsigned char *input; /* input block */
|
||||
unsigned int inputLen; /* length of input block */
|
||||
{
|
||||
unsigned int i, index, partLen;
|
||||
|
||||
/* Update number of bytes mod 16 */
|
||||
index = context->count;
|
||||
context->count = (index + inputLen) & 0xf;
|
||||
|
||||
partLen = 16 - index;
|
||||
|
||||
/* Transform as many times as possible.
|
||||
*/
|
||||
if (inputLen >= partLen) {
|
||||
MD2_memcpy((POINTER)&context->buffer[index], (POINTER)input, partLen);
|
||||
MD2Transform(context->state, context->checksum, context->buffer);
|
||||
|
||||
for (i = partLen; i + 15 < inputLen; i += 16)
|
||||
MD2Transform(context->state, context->checksum, &input[i]);
|
||||
|
||||
index = 0;
|
||||
} else
|
||||
i = 0;
|
||||
|
||||
/* Buffer remaining input */
|
||||
MD2_memcpy((POINTER)&context->buffer[index], (POINTER)&input[i],
|
||||
inputLen - i);
|
||||
}
|
||||
|
||||
/* MD2 finalization. Ends an MD2 message-digest operation, writing the
|
||||
message digest and zeroizing the context.
|
||||
*/
|
||||
void MD2Final(digest, context)
|
||||
|
||||
unsigned char digest[16]; /* message digest */
|
||||
MD2_CTX *context; /* context */
|
||||
{
|
||||
unsigned int index, padLen;
|
||||
|
||||
/* Pad out to multiple of 16.
|
||||
*/
|
||||
index = context->count;
|
||||
padLen = 16 - index;
|
||||
MD2Update(context, PADDING[padLen], padLen);
|
||||
|
||||
/* Extend with checksum */
|
||||
MD2Update(context, context->checksum, 16);
|
||||
|
||||
/* Store state in digest */
|
||||
MD2_memcpy((POINTER)digest, (POINTER)context->state, 16);
|
||||
|
||||
/* Zeroize sensitive information.
|
||||
*/
|
||||
MD2_memset((POINTER)context, 0, sizeof(*context));
|
||||
}
|
||||
|
||||
/* MD2 basic transformation. Transforms state and updates checksum
|
||||
based on block.
|
||||
*/
|
||||
static void MD2Transform(state, checksum, block) unsigned char state[16];
|
||||
unsigned char checksum[16];
|
||||
unsigned char block[16];
|
||||
{
|
||||
unsigned int i, j, t;
|
||||
unsigned char x[48];
|
||||
|
||||
/* Form encryption block from state, block, state ^ block.
|
||||
*/
|
||||
MD2_memcpy((POINTER)x, (POINTER)state, 16);
|
||||
MD2_memcpy((POINTER)x + 16, (POINTER)block, 16);
|
||||
for (i = 0; i < 16; i++) x[i + 32] = state[i] ^ block[i];
|
||||
|
||||
/* Encrypt block (18 rounds).
|
||||
*/
|
||||
t = 0;
|
||||
for (i = 0; i < 18; i++) {
|
||||
for (j = 0; j < 48; j++) t = x[j] ^= PI_SUBST[t];
|
||||
t = (t + i) & 0xff;
|
||||
}
|
||||
|
||||
/* Save new state */
|
||||
MD2_memcpy((POINTER)state, (POINTER)x, 16);
|
||||
|
||||
/* Update checksum.
|
||||
*/
|
||||
t = checksum[15];
|
||||
for (i = 0; i < 16; i++) t = checksum[i] ^= PI_SUBST[block[i] ^ t];
|
||||
|
||||
/* Zeroize sensitive information.
|
||||
*/
|
||||
MD2_memset((POINTER)x, 0, sizeof(x));
|
||||
}
|
||||
|
||||
/* Note: Replace "for loop" with standard memcpy if possible.
|
||||
*/
|
||||
static void MD2_memcpy(output, input, len) POINTER output;
|
||||
POINTER input;
|
||||
unsigned int len;
|
||||
{
|
||||
unsigned int i;
|
||||
|
||||
for (i = 0; i < len; i++) output[i] = input[i];
|
||||
}
|
||||
|
||||
/* Note: Replace "for loop" with standard memset if possible.
|
||||
*/
|
||||
static void MD2_memset(output, value, len) POINTER output;
|
||||
int value;
|
||||
unsigned int len;
|
||||
{
|
||||
unsigned int i;
|
||||
|
||||
for (i = 0; i < len; i++) ((char *)output)[i] = (char)value;
|
||||
}
|
||||
Loading…
Reference in a new issue